From 5b7d511becd75d6e9c1ff1d4115db6da63b05ca6 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Thu, 8 Oct 2026 11:12:49 +0200 Subject: [PATCH] Move springfox-swagger2 upgrade out of the Java-version-gated NoGuavaJava11 HasJavaVersion never marks pom.xml or build.gradle, which carry no JavaVersion marker, so since NoGuavaJava11 gained its HasJavaVersion precondition the springfox upgrade could no longer edit build files. --- .../resources/META-INF/rewrite/no-guava.yml | 10 ++--- .../java/migrate/guava/NoGuavaTest.java | 38 +++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/main/resources/META-INF/rewrite/no-guava.yml b/src/main/resources/META-INF/rewrite/no-guava.yml index bd20eae66e..0653de1410 100644 --- a/src/main/resources/META-INF/rewrite/no-guava.yml +++ b/src/main/resources/META-INF/rewrite/no-guava.yml @@ -30,6 +30,11 @@ recipeList: - com.google.guava.InlineGuavaMethods - org.openrewrite.java.migrate.guava.NoGuavaJava11 - org.openrewrite.java.migrate.guava.NoGuavaJava21 + - org.openrewrite.java.dependencies.UpgradeDependencyVersion: + groupId: io.springfox + artifactId: springfox-swagger2 + newVersion: 2.10.x + overrideManagedVersion: true - org.openrewrite.java.migrate.guava.NoGuavaCreateTempDir - org.openrewrite.java.migrate.guava.NoGuavaDirectExecutor - org.openrewrite.java.migrate.guava.NoGuavaFunctionsCompose @@ -103,11 +108,6 @@ recipeList: - org.openrewrite.java.migrate.guava.NoGuavaImmutableMapCopyOf - org.openrewrite.java.migrate.guava.NoGuavaImmutableSetCopyOf - org.openrewrite.java.migrate.guava.PreferJavaUtilObjectsRequireNonNullElse - - org.openrewrite.java.dependencies.UpgradeDependencyVersion: - groupId: io.springfox - artifactId: springfox-swagger2 - newVersion: 2.10.x - overrideManagedVersion: true --- type: specs.openrewrite.org/v1beta/recipe name: org.openrewrite.java.migrate.guava.NoGuavaJava21 diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java index 0382ab3792..9b5ed2c0c7 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java @@ -25,6 +25,7 @@ import static org.openrewrite.java.Assertions.java; import static org.openrewrite.java.Assertions.javaVersion; +import static org.openrewrite.maven.Assertions.pomXml; class NoGuavaTest implements RewriteTest { @Override @@ -63,6 +64,43 @@ Object foo(Object obj) { ); } + @Test + void upgradeSpringfoxThatStillUsesGuavaOptional() { + rewriteRun( + //language=xml + pomXml( + """ + + com.example + demo + 1.0.0 + + + io.springfox + springfox-swagger2 + 2.9.2 + + + + """, + """ + + com.example + demo + 1.0.0 + + + io.springfox + springfox-swagger2 + 2.10.5 + + + + """ + ) + ); + } + @Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/39#issuecomment-910673213") @Test void preferJavaUtilObjectsHashCode() {