diff --git a/build.gradle.kts b/build.gradle.kts index 62653bc3d8..491d130ea4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,8 @@ recipeDependencies { parserClasspath("javax.persistence:javax.persistence-api:2.2") parserClasspath("org.glassfish:javax.servlet:3.0") parserClasspath("javax.annotation:javax.annotation-api:1.3.2") + parserClasspath("com.google.guava:guava:33.4.8-jre") + parserClasspath("com.google.errorprone:error_prone_core:2.+") } val rewriteVersion = rewriteRecipe.rewriteVersion.get() @@ -59,7 +61,6 @@ dependencies { testImplementation("org.assertj:assertj-core:latest.release") testImplementation("com.google.errorprone:error_prone_annotations:latest.release") - testImplementation("com.google.guava:guava:33.4.8-jre") testImplementation("joda-time:joda-time:2.12.3") testImplementation("org.threeten:threeten-extra:1.8.0") @@ -89,3 +90,7 @@ tasks.withType(Javadoc::class.java) { tasks.test { maxHeapSize = "2g" // Set max heap size to 2GB or adjust as necessary } + +tasks.withType { + options.compilerArgs.add("-Arewrite.javaParserClasspathFrom=resources") +} diff --git a/src/main/resources/META-INF/rewrite/classpath.tsv.zip b/src/main/resources/META-INF/rewrite/classpath.tsv.zip index a7d5cc0f9c..2af024265c 100644 Binary files a/src/main/resources/META-INF/rewrite/classpath.tsv.zip and b/src/main/resources/META-INF/rewrite/classpath.tsv.zip differ diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReferenceTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReferenceTest.java index b1519b7b89..7ab306cbc3 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReferenceTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReferenceTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -28,7 +29,7 @@ class NoGuavaAtomicsNewReferenceTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaAtomicsNewReference()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDirTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDirTest.java index db05f862f0..1cc873ee69 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDirTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDirTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaCreateTempDirTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaCreateTempDir()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutorTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutorTest.java index dba84aacbe..413b40604e 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutorTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutorTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -28,7 +29,7 @@ class NoGuavaDirectExecutorTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaDirectExecutor()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java index e7a9d2d807..aaa3797bd6 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java @@ -16,6 +16,7 @@ package org.openrewrite.java.migrate.guava; import org.junit.jupiter.api.Test; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Issue; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; @@ -29,7 +30,7 @@ class NoGuavaImmutableListOfTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaImmutableListOf()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @Test diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOfTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOfTest.java index 98cf52676f..e4ab5dbd12 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOfTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOfTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Issue; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; @@ -30,7 +31,7 @@ class NoGuavaImmutableMapOfTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaImmutableMapOf()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @Test diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOfTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOfTest.java index c21d7d6baf..12b11ba88b 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOfTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOfTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Issue; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; @@ -29,7 +30,7 @@ class NoGuavaImmutableSetOfTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaImmutableSetOf()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaJava21Test.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaJava21Test.java index 8eed3f18d9..49692c1684 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaJava21Test.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaJava21Test.java @@ -16,6 +16,7 @@ package org.openrewrite.java.migrate.guava; import org.junit.jupiter.api.Test; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Issue; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; @@ -28,7 +29,7 @@ class NoGuavaJava21Test implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipeFromResource("/META-INF/rewrite/no-guava.yml", "org.openrewrite.java.migrate.guava.NoGuava") - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @Test diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayListTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayListTest.java index 5fb3925115..6718e459b1 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayListTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayListTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaListsNewArrayListTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaListsNewArrayList()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayListTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayListTest.java index adb1230cbb..318da0bd75 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayListTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayListTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaListsNewCopyOnWriteArrayListTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaListsNewCopyOnWriteArrayList()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedListTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedListTest.java index 05d7e82167..a98878cd07 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedListTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedListTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaListsNewLinkedListTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaListsNewLinkedList()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMapTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMapTest.java index a270acc8db..7960a87341 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMapTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMapTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -30,7 +31,7 @@ class NoGuavaMapsNewHashMapTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaMapsNewHashMap()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMapTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMapTest.java index 3fc265a45f..3e9386e5cb 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMapTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMapTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -30,7 +31,7 @@ class NoGuavaMapsNewLinkedHashMapTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaMapsNewLinkedHashMap()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMapTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMapTest.java index 8b02e138c0..cd1746f46e 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMapTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMapTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -30,7 +31,7 @@ class NoGuavaMapsNewTreeMapTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaMapsNewTreeMap()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsListTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsListTest.java index f465b9f73c..829300aee0 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsListTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsListTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaPrimitiveAsListTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaPrimitiveAsList()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaRefasterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaRefasterTest.java index 06774f2a2c..3e6931e834 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaRefasterTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaRefasterTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class NoGuavaRefasterTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.recipe(new NoGuavaRefasterRecipes()) - .parser(JavaParser.fromJavaVersion().classpath("rewrite-java", "guava")); + .parser(JavaParser.fromJavaVersion().classpath("rewrite-java").classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSetTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSetTest.java index f3b263f966..31c084567c 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSetTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSetTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaSetsNewConcurrentHashSetTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaSetsNewConcurrentHashSet()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSetTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSetTest.java index 9235f1d540..aed1a27630 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSetTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSetTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaSetsNewHashSetTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaSetsNewHashSet()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSetTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSetTest.java index 39cbffff62..94fc04d1e9 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSetTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSetTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -29,7 +30,7 @@ class NoGuavaSetsNewLinkedHashSetTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new NoGuavaSetsNewLinkedHashSet()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample 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 180fd62112..f8e155c8bf 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Issue; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; @@ -30,7 +31,7 @@ class NoGuavaTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipeFromResource("/META-INF/rewrite/no-guava.yml", "org.openrewrite.java.migrate.guava.NoGuava") - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinTest.java b/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinTest.java index e00838a752..b30248dab5 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -28,7 +29,7 @@ class PreferJavaStringJoinTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec .recipe(new PreferJavaStringJoin()) - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample @@ -44,7 +45,7 @@ class Test { String s = Joiner.on(", ").join("a", "b"); } """, - """ + """ class Test { String s = String.join(", ", "a", "b"); } @@ -65,7 +66,7 @@ class Test { String s = Joiner.on(", ").join(new String[] {"a"}); } """, - """ + """ class Test { String s = String.join(", ", new String[] {"a"}); } @@ -87,7 +88,7 @@ class Test { String s = Joiner.on(", ").join(Set.of("a")); } """, - """ + """ import java.util.Set; class Test { @@ -132,7 +133,7 @@ class Test { String s = Joiner.on(", ").join(new HashSet()); } """, - """ + """ import java.util.HashSet; class Test { @@ -156,7 +157,7 @@ class Test { .join("a", "b"); } """, - """ + """ class Test { String s = String.join(", ", "a", "b"); } diff --git a/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilPredicateTest.java b/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilPredicateTest.java index 8e84847a2d..5ae4bba2ad 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilPredicateTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilPredicateTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -27,7 +28,7 @@ class PreferJavaUtilPredicateTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.recipeFromResources("org.openrewrite.java.migrate.guava.PreferJavaUtilPredicate") - .parser(JavaParser.fromJavaVersion().classpath("guava")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); } @DocumentExample @@ -36,7 +37,7 @@ void changeTypeAndMethodName() { rewriteRun( //language=java java( - """ + """ import com.google.common.base.Predicate; class A { @@ -50,7 +51,7 @@ public boolean apply(String input) { } } """, - """ + """ import java.util.function.Predicate; class A {