Skip to content

Commit 1d5c9c9

Browse files
committed
fix failing test of UpgradeJavaVersion
1 parent 2f7c51e commit 1d5c9c9

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/main/java/org/openrewrite/java/migrate/UpgradeJavaVersion.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,25 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
6464
return tree;
6565
}
6666
SourceFile source = (SourceFile) tree;
67+
68+
Optional<JavaVersion> maybeJavaVersion = source.getMarkers().findFirst(JavaVersion.class);
69+
if (maybeJavaVersion.isPresent() && maybeJavaVersion.get().getMajorVersion() >= version) {
70+
// No change if try to downgrade java version, or on same java version.
71+
return source;
72+
}
73+
6774
if (source instanceof G.CompilationUnit && new IsBuildGradle<ExecutionContext>().visit(source, ctx) != source) {
6875
source = (SourceFile) new UpdateJavaCompatibility(version, null, null).getVisitor().visitNonNull(source, ctx);
6976
} else if (source instanceof Xml.Document) {
7077
source = (SourceFile) new MavenUpdateJavaVersionVisitor().visitNonNull(source, ctx);
7178
}
7279

73-
Optional<JavaVersion> maybeJavaVersion = source.getMarkers().findFirst(JavaVersion.class);
7480
if (maybeJavaVersion.isPresent()) {
75-
JavaVersion javaVersion = maybeJavaVersion.get();
76-
if (javaVersion.getMajorVersion() < version) {
77-
source = source.withMarkers(source.getMarkers().setByType(updatedMarkers.computeIfAbsent(javaVersion,
78-
m -> m.withSourceCompatibility(newVersion).withTargetCompatibility(newVersion))));
79-
}
81+
source =
82+
source.withMarkers(source.getMarkers().setByType(updatedMarkers.computeIfAbsent(maybeJavaVersion.get(),
83+
m -> m.withSourceCompatibility(newVersion).withTargetCompatibility(newVersion))));
8084
}
85+
8186
return source;
8287
}
8388
};

0 commit comments

Comments
 (0)