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
7 changes: 6 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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")

Expand Down Expand Up @@ -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<JavaCompile> {
options.compilerArgs.add("-Arewrite.javaParserClasspathFrom=resources")
}
Binary file modified src/main/resources/META-INF/rewrite/classpath.tsv.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Loading