Skip to content

Some compilation issues are occuring after running switch pattern matching recipe #775

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
merged 6 commits into from
Jun 23, 2025
Merged

Some compilation issues are occuring after running switch pattern matching recipe #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88cb2f8
Some compilation issues are occuring after running switch pattern mat…
Jenson3210 Jun 23, 2025
4e71ffb
no need for different template when working with block
Jenson3210 Jun 23, 2025
82e32ce
Overrule formatting bug upstream
Jenson3210 Jun 23, 2025
670325c
Apply formatter
timtebeek Jun 23, 2025
5b4b156
Use a visitor to detect return at any nesting depth
timtebeek Jun 23, 2025
b210fba
No need to set empty block prefix twice
timtebeek Jun 23, 2025
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
61 changes: 35 additions & 26 deletions src/main/java/org/openrewrite/java/migrate/lang/IfElseIfConstructToSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.openrewrite.java.migrate.lang.NullCheck.Matcher.nullCheck;
import static org.openrewrite.java.tree.J.Block.createEmptyBlock;
Expand Down Expand Up @@ -75,7 +76,9 @@ public J.Case visitCase(J.Case case_, ExecutionContext ctx) {
if (case_.getBody() instanceof J.Block &&
((J.Block) case_.getBody()).getStatements().isEmpty() &&
!((J.Block) case_.getBody()).getEnd().isEmpty()) {
return case_.withBody(((J.Block) case_.getBody()).withEnd(Space.EMPTY));
return case_.withBody(((J.Block) case_.getBody())
.withPrefix(Space.SINGLE_SPACE)
.withEnd(Space.EMPTY));
}
return case_.withBody(case_.getBody().withPrefix(Space.SINGLE_SPACE));
}
Expand All @@ -100,6 +103,11 @@ private static class SwitchCandidate {
private SwitchCandidate(J.If if_, Cursor cursor) {
this.if_ = if_;
this.cursor = cursor;
Cursor parent = cursor.getParent(2);
if (parent == null || parent.getValue() instanceof J.If.Else) {
potentialCandidate = false;
return;
}
J.If ifPart = if_;
while (potentialCandidate && ifPart != null) {
if (ifPart.getIfCondition().getTree() instanceof J.Binary) {
Expand Down Expand Up @@ -157,6 +165,11 @@ private boolean validatePotentialCandidate() {
if (patternMatchers.keySet().stream().anyMatch(instanceOf -> instanceOf.getPattern() == null)) {
return false;
}
// The blocks cannot do a return as that would lead to all blocks having to do a return,
// the block/expression difference in return for switch statements / expressions being different...
if (returns(nullCheckedStatement) || patternMatchers.values().stream().anyMatch(this::returns) || returns(else_)) {
return false;
}
// Do no harm -> If we do not know how to replace(yet), do not replace
if (patternMatchers.keySet().stream().anyMatch(instanceOf -> {
J clazz = instanceOf.getClazz();
Expand All @@ -173,6 +186,16 @@ private boolean validatePotentialCandidate() {
(hasLastElseBlock ? 1 : 0);
}

private boolean returns(@Nullable Statement statement) {
return statement != null && new JavaIsoVisitor<AtomicBoolean>() {
@Override
public J.Return visitReturn(J.Return return_, AtomicBoolean atomicBoolean) {
atomicBoolean.set(true);
return return_;
}
}.reduce(statement, new AtomicBoolean(false)).get();
}

public J.@Nullable Switch buildSwitchTemplate() {
Optional<Expression> switchOn = switchOn();
if (!this.potentialCandidate || !switchOn.isPresent()) {
Expand All @@ -183,36 +206,20 @@ private boolean validatePotentialCandidate() {
StringBuilder switchBody = new StringBuilder("switch (#{any()}) {\n");
int i = 1;
if (nullCheckedParameter != null) {
Statement statement = getStatement(Objects.requireNonNull(nullCheckedStatement));
if (statement instanceof J.Block) {
switchBody.append("case null -> #{}\n");
} else {
switchBody.append("case null -> #{any()};\n");
}
arguments[i++] = statement;
switchBody.append("case null -> #{any()};\n");
arguments[i++] = getStatement(Objects.requireNonNull(nullCheckedStatement));
}
for (Map.Entry<J.InstanceOf, Statement> entry : patternMatchers.entrySet()) {
J.InstanceOf instanceOf = entry.getKey();
Statement statement = getStatement(entry.getValue());
if (statement instanceof J.Block) {
switchBody.append("case #{}#{} -> #{}\n");
} else {
switchBody.append("case #{}#{} -> #{any()};\n");
}
switchBody.append("case #{}#{} -> #{any()};\n");
arguments[i++] = getClassName(instanceOf);
arguments[i++] = getPattern(instanceOf);
arguments[i++] = statement;
arguments[i++] = getStatement(entry.getValue());
}
switchBody.append("default -> #{any()};\n");
if (else_ != null) {
Statement statement = getStatement(else_);
if (statement instanceof J.Block) {
switchBody.append("default -> #{}\n");
} else {
switchBody.append("default -> #{any()};\n");
}
arguments[i] = statement;
arguments[i] = getStatement(else_);
} else {
switchBody.append("default -> #{}\n");
arguments[i] = createEmptyBlock();
}
switchBody.append("}\n");
Expand Down Expand Up @@ -243,11 +250,13 @@ private String getPattern(J.InstanceOf statement) {
}

private Statement getStatement(Statement statement) {
Statement toAdd = statement;
if (statement instanceof J.Block && ((J.Block) statement).getStatements().size() == 1) {
toAdd = ((J.Block) statement).getStatements().get(0);
Statement firstStatement = ((J.Block) statement).getStatements().get(0);
if (firstStatement instanceof Expression || firstStatement instanceof J.Throw) {
return firstStatement;
}
}
return toAdd;
return statement;
}
}
}
5 changes: 4 additions & 1 deletion src/main/java/org/openrewrite/java/migrate/lang/NullCheckAsSwitchCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ private boolean hasNullCase(J.Switch switch_) {

private J.Case createNullCase(J.Switch aSwitch, Statement whenNull) {
if (whenNull instanceof J.Block && ((J.Block) whenNull).getStatements().size() == 1) {
whenNull = ((J.Block) whenNull).getStatements().get(0);
Statement firstStatement = ((J.Block) whenNull).getStatements().get(0);
if (firstStatement instanceof Expression || firstStatement instanceof J.Throw) {
whenNull = firstStatement;
}
}
String semicolon = whenNull instanceof J.Block ? "" : ";";
J.Switch switchWithNullCase = JavaTemplate.apply(
Expand Down
Loading