Skip to content

Fix IfElseIfConstructToSwitch null safety regression #1014

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
timtebeek merged 2 commits into from
Mar 18, 2026
Merged

Fix IfElseIfConstructToSwitch null safety regression #1014

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
e63972b
Fix IfElseIfConstructToSwitch null safety regression (issue #1013)
timtebeek Mar 18, 2026
1127076
Fix UpgradeToJava21Test expectation for case null, default
timtebeek Mar 18, 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
2 changes: 1 addition & 1 deletion 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 @@ -212,7 +212,7 @@ public J.Return visitReturn(J.Return return_, AtomicBoolean atomicBoolean) {
arguments[i++] = getPattern(instanceOf);
arguments[i++] = getStatement(entry.getValue());
}
switchBody.append("default -> #{any()};\n");
switchBody.append(nullCheckedParameter != null ? "default" : "case null, default").append(" -> #{any()};\n");
if (else_ != null) {
arguments[i] = getStatement(else_);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/openrewrite/java/migrate/UpgradeToJava21Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private static double convertToDouble(Object value) {
case String string -> Double.parseDouble(string);
case Integer integer -> integer.doubleValue();
case Long long1 -> long1.doubleValue();
default -> (double) value;
case null, default -> (double) value;
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/openrewrite/java/migrate/lang/IfElseIfConstructToSwitchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static String formatter(Object obj) {
String str = "String";
formatted = String.format("%s %s", str, s);
}
default -> formatted = "unknown";
case null, default -> formatted = "unknown";
}
return formatted;
}
Expand Down Expand Up @@ -331,7 +331,7 @@ static String formatter(Object obj) {
String str = "String";
formatted = String.format("%s %s", str, s);
}
default -> formatted = "unknown";
case null, default -> formatted = "unknown";
}
return formatted;
}
Expand Down Expand Up @@ -436,7 +436,7 @@ static String describe(Object obj) {
case Dog d -> result = "dog";
case Cat c -> result = "cat";
case Bird b -> result = "bird";
default -> result = "unknown";
case null, default -> result = "unknown";
}
return result;
}
Expand Down
Loading