Skip to content

SONARJAVA-6863 Remove continue statements #6046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romainbrenguier merged 2 commits into from
Aug 27, 2026
Merged

SONARJAVA-6863 Remove continue statements #6046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e963397
Replace "if" statement with pattern match guard
romainbrenguier Aug 27, 2026
11bd08e
Remove "continue" statements and revert unsupported "when" guard
romainbrenguier Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions java-checks/src/main/java/org/sonar/java/checks/HashCodeMismatchedFieldsCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,14 @@ private static EqualsAndHashCode find(ClassTree classTree) {
MethodTree hashCodeMethod = null;
List<MethodTree> otherMethods = new ArrayList<>();
for (Tree member : classTree.members()) {
if (!(member instanceof MethodTree methodTree) || methodTree.block() == null) {
continue;
}
if (MethodTreeUtils.isEqualsMethod(methodTree)) {
equalsMethod = methodTree;
} else if (MethodTreeUtils.isHashCodeMethod(methodTree)) {
hashCodeMethod = methodTree;
} else {
otherMethods.add(methodTree);
if (member instanceof MethodTree methodTree && methodTree.block() != null) {
if (MethodTreeUtils.isEqualsMethod(methodTree)) {
equalsMethod = methodTree;
} else if (MethodTreeUtils.isHashCodeMethod(methodTree)) {
hashCodeMethod = methodTree;
} else {
otherMethods.add(methodTree);
}
}
}
if (equalsMethod == null || hashCodeMethod == null) {
Expand All @@ -140,12 +139,11 @@ private static Map<Symbol.MethodSymbol, Map<Symbol, Tree>> collectHelperFields(S
Map<Symbol.MethodSymbol, Map<Symbol, Tree>> fieldsByHelper = new HashMap<>();
for (MethodTree helper : otherMethods) {
Symbol.MethodSymbol helperSymbol = helper.symbol();
if (helperSymbol.isUnknown() || !helper.parameters().isEmpty()) {
continue;
}
ReadAndAssignedFields helperFields = collectReadFields(helper, owner, Map.of(), Role.HELPER);
if (!helperFields.failed()) {
fieldsByHelper.put(helperSymbol, helperFields.readFields());
if (!helperSymbol.isUnknown() && helper.parameters().isEmpty()) {
ReadAndAssignedFields helperFields = collectReadFields(helper, owner, Map.of(), Role.HELPER);
if (!helperFields.failed()) {
fieldsByHelper.put(helperSymbol, helperFields.readFields());
}
}
}
return fieldsByHelper;
Expand Down
11 changes: 5 additions & 6 deletions ...src/main/java/org/sonar/java/checks/LocalVariablesShouldNotSpanSwitchCaseGroupsCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,11 @@ public void visitNode(Tree tree) {
List<CaseGroupTree> caseGroups = ((SwitchTree) tree).cases();
for (int index = 0; index < caseGroups.size(); index++) {
CaseGroupTree caseGroup = caseGroups.get(index);
if (!caseGroup.labels().get(0).isFallThrough()) {
continue;
}
for (StatementTree statement : caseGroup.body()) {
if (statement instanceof VariableTree variable) {
reportIfAccessedFromLaterGroup(variable, caseGroups, index + 1);
if (caseGroup.labels().get(0).isFallThrough()) {
for (StatementTree statement : caseGroup.body()) {
if (statement instanceof VariableTree variable) {
reportIfAccessedFromLaterGroup(variable, caseGroups, index + 1);
}
}
}
}
Expand Down
Loading