Skip to content

SONARJAVA-5730 S1301 Should not raise on switch over small enums #5530

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

Draft
tomasz-tylenda-sonarsource wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

SONARJAVA-5730 S1301 Should not raise on switch over small enums #5530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions ...s-test-sources/default/src/test/java/checks/tests/SwitchAtLeastThreeCasesCheckSample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,33 @@ public void f(int variable) {
doSomethingElse();
}
}

public enum SmallEnum {
ONE,
TWO
}

public void switchOverSmallEnum1(SmallEnum smallEnum) {
switch (smallEnum) {
case ONE -> {
System.out.println("1");
}
case TWO -> {
System.out.println("2");
}
};
}

public int switchOverSmallEnum2(SmallEnum smallEnum) {
int ret = -1;
switch (smallEnum) {
case ONE:
ret = 1;
break;
case TWO:
ret = 2;
break;
};
return ret;
}
}
6 changes: 5 additions & 1 deletion java-checks/src/main/java/org/sonar/java/checks/SwitchAtLeastThreeCasesCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.sonar.check.Rule;
import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
import org.sonar.plugins.java.api.semantic.Symbol;
import org.sonar.plugins.java.api.tree.CaseGroupTree;
import org.sonar.plugins.java.api.tree.CaseLabelTree;
import org.sonar.plugins.java.api.tree.SwitchStatementTree;
Expand Down Expand Up @@ -46,7 +47,10 @@ public void visitNode(Tree tree) {
count += totalLabelCount(caseGroup);
}
if (count < 3) {
reportIssue(switchStatementTree.switchKeyword(), "Replace this \"switch\" statement by \"if\" statements to increase readability.");
Symbol.TypeSymbol typeSymbol = switchStatementTree.expression().symbolType().symbol();
if (!typeSymbol.isUnknown() && !typeSymbol.isEnum()) {
reportIssue(switchStatementTree.switchKeyword(), "Replace this \"switch\" statement by \"if\" statements to increase readability.");
}
}
}

Expand Down
Loading