Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/main/resources/META-INF/rewrite/no-guava.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
38 changes: 38 additions & 0 deletions src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -63,6 +64,43 @@ Object foo(Object obj) {
);
}

@Test
void upgradeSpringfoxThatStillUsesGuavaOptional() {
rewriteRun(
//language=xml
pomXml(
"""
<project>
<groupId>com.example</groupId>
<artifactId>demo</artifactId>
<version>1.0.0</version>
<dependencies>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency>
</dependencies>
</project>
""",
"""
<project>
<groupId>com.example</groupId>
<artifactId>demo</artifactId>
<version>1.0.0</version>
<dependencies>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.10.5</version>
</dependency>
</dependencies>
</project>
"""
)
);
}

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/39#issuecomment-910673213")
@Test
void preferJavaUtilObjectsHashCode() {
Expand Down
Loading