Skip to content

Normalize version numbers in FindJavaVersion #969

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
Jan 19, 2026
Merged

Normalize version numbers in FindJavaVersion #969

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
3fae13c
Normalize version numbers in `FindJavaVersion`
timtebeek Jan 19, 2026
3543bff
Ensure both are updated in `UpgradeToJava17Test`
timtebeek Jan 19, 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
4 changes: 3 additions & 1 deletion src/main/java/org/openrewrite/java/migrate/search/FindJavaVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
cu.getMarkers().findFirst(JavaVersion.class)
.filter(seen::add)
.map(jv -> new JavaVersionTable.Row(jv.getSourceCompatibility(), jv.getTargetCompatibility()))
.map(jv -> new JavaVersionTable.Row(
Integer.toString(jv.getMajorVersion()),
Integer.toString(jv.getMajorReleaseVersion())))
.ifPresent(row -> table.insertRow(ctx, row));
return cu;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/openrewrite/java/migrate/table/JavaVersionTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ public JavaVersionTable(Recipe recipe) {
@Value
public static class Row {
@Column(displayName = "Source compatibility",
description = "The version of Java used to compile the source code")
description = "The major version of Java used to compile the source code")
String sourceVersion;

@Column(displayName = "Target compatibility",
description = "The version of Java the bytecode is compiled to run on")
description = "The major version of Java the bytecode is compiled to run on")
String targetVersion;
}
}
14 changes: 10 additions & 4 deletions src/test/java/org/openrewrite/java/migrate/UpgradeToJava17Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;

import java.util.Optional;
import java.util.regex.Pattern;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -148,10 +149,15 @@ public String test() {
}
}
""",
spec -> spec.afterRecipe(cu ->
assertThat(cu.getMarkers().findFirst(JavaVersion.class))
.map(JavaVersion::getSourceCompatibility)
.hasValue("17"))
spec -> spec.afterRecipe(cu -> {
Optional<JavaVersion> jv = cu.getMarkers().findFirst(JavaVersion.class);
assertThat(jv)
.map(JavaVersion::getSourceCompatibility)
.hasValue("17");
assertThat(jv)
.map(JavaVersion::getMajorVersion)
.hasValue(17);
})
)
)
),
Expand Down