diff --git a/src/test/java/org/openrewrite/java/migrate/lang/MigrateZipErrorToZipExceptionTest.java b/src/test/java/org/openrewrite/java/migrate/MigrateZipErrorToZipExceptionTest.java
similarity index 98%
rename from src/test/java/org/openrewrite/java/migrate/lang/MigrateZipErrorToZipExceptionTest.java
rename to src/test/java/org/openrewrite/java/migrate/MigrateZipErrorToZipExceptionTest.java
index 9ec5a48638..eeff30739c 100644
--- a/src/test/java/org/openrewrite/java/migrate/lang/MigrateZipErrorToZipExceptionTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/MigrateZipErrorToZipExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openrewrite.java.migrate.lang;
+package org.openrewrite.java.migrate;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
diff --git a/src/test/java/org/openrewrite/java/migrate/UpgradeSpringBootForJava25Test.java b/src/test/java/org/openrewrite/java/migrate/UpgradeSpringBootParentForJava25Test.java
similarity index 97%
rename from src/test/java/org/openrewrite/java/migrate/UpgradeSpringBootForJava25Test.java
rename to src/test/java/org/openrewrite/java/migrate/UpgradeSpringBootParentForJava25Test.java
index ee43536729..c4adbbd124 100644
--- a/src/test/java/org/openrewrite/java/migrate/UpgradeSpringBootForJava25Test.java
+++ b/src/test/java/org/openrewrite/java/migrate/UpgradeSpringBootParentForJava25Test.java
@@ -25,10 +25,10 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.openrewrite.maven.Assertions.pomXml;
-class UpgradeSpringBootForJava25Test implements RewriteTest {
+class UpgradeSpringBootParentForJava25Test implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
- spec.recipeFromResources("org.openrewrite.java.migrate.UpgradePluginsForJava25");
+ spec.recipeFromResources("org.openrewrite.java.migrate.UpgradeSpringBootParentForJava25");
}
@DocumentExample
diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPredicatesEqualToTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPredicatesEqualToTest.java
deleted file mode 100644
index 2955fe64f4..0000000000
--- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPredicatesEqualToTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2025 the original author or authors.
- *
- * Licensed under the Moderne Source Available License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://docs.moderne.io/licensing/moderne-source-available-license
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.migrate.guava;
-
-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;
-import org.openrewrite.test.RewriteTest;
-
-import static org.openrewrite.java.Assertions.java;
-
-class NoGuavaPredicatesEqualToTest implements RewriteTest {
- @Override
- public void defaults(RecipeSpec spec) {
- spec
- .recipeFromResources("org.openrewrite.java.migrate.guava.NoGuava")
- .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava"));
- }
-
- @DocumentExample
- @Test
- void predicatesEqualToToPredicateIsEqual() {
- rewriteRun(
- //language=java
- java(
- """
- import com.google.common.base.Predicate;
- import com.google.common.base.Predicates;
-
- class A {
- public static Predicate isHelloPredicate() {
- return Predicates.equalTo("hello");
- }
- }
- """,
- """
- import java.util.function.Predicate;
-
- class A {
- public static Predicate isHelloPredicate() {
- return Predicate.isEqual("hello");
- }
- }
- """
- )
- );
- }
-
- @Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/903")
- @Test
- void inlinedPredicatesEqualToWithParameterizedType() {
- rewriteRun(
- //language=java
- java(
- """
- import com.google.common.base.Predicates;
- import com.google.common.base.Predicate;
-
- import java.util.Collection;
-
- class Test {
- public static void test(Collection aCollection, Predicate> anotherPredicate) {
- Predicate> combined = Predicates.and(Predicates.equalTo(aCollection), anotherPredicate);
- }
- }
- """,
- """
- import java.util.Collection;
- import java.util.function.Predicate;
-
- class Test {
- public static void test(Collection aCollection, Predicate> anotherPredicate) {
- Predicate> combined = Predicate.>isEqual(aCollection).and(anotherPredicate);
- }
- }
- """
- )
- );
- }
-
- @Test
- void inlinedPredicatesEqualToWithStandardType() {
- rewriteRun(
- //language=java
- java(
- """
- import com.google.common.base.Predicates;
- import com.google.common.base.Predicate;
-
- class Test {
- static Predicate getMaxLengthPredicate() {
- return s -> s.length() < 10;
- }
-
- public static void test() {
- Predicate combined = Predicates.and(Predicates.equalTo("MyTest"), getMaxLengthPredicate());
- }
- }
- """,
- """
- import java.util.function.Predicate;
-
- class Test {
- static Predicate getMaxLengthPredicate() {
- return s -> s.length() < 10;
- }
-
- public static void test() {
- Predicate combined = Predicate.isEqual("MyTest").and(getMaxLengthPredicate());
- }
- }
- """
- )
- );
- }
-}
diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java
deleted file mode 100644
index f1d2b9eea0..0000000000
--- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2025 the original author or authors.
- *
- * Licensed under the Moderne Source Available License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://docs.moderne.io/licensing/moderne-source-available-license
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.migrate.guava;
-
-import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.ExpectedToFail;
-import org.junitpioneer.jupiter.Issue;
-import org.openrewrite.DocumentExample;
-import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.java.JavaParser;
-import org.openrewrite.test.RecipeSpec;
-import org.openrewrite.test.RewriteTest;
-
-import static org.openrewrite.java.Assertions.java;
-
-class NoGuavaSetsFilterTest implements RewriteTest {
-
- @Override
- public void defaults(RecipeSpec spec) {
- spec
- .recipeFromResources("org.openrewrite.java.migrate.guava.NoGuava")
- .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava"));
- }
-
- @DocumentExample
- @Test
- void replaceSetsFilter() {
- //language=java
- rewriteRun(
- java(
- """
- import java.util.Set;
-
- import com.google.common.base.Predicate;
- import com.google.common.collect.Sets;
-
- class Test {
- public static Set test(Set set, Predicate isNotNull) {
- return Sets.filter(set, isNotNull);
- }
- }
- """,
- """
- import java.util.Set;
- import java.util.function.Predicate;
- import java.util.stream.Collectors;
-
- class Test {
- public static Set test(Set set, Predicate isNotNull) {
- return set.stream().filter(isNotNull).collect(Collectors.toSet());
- }
- }
- """
- )
- );
- }
-
- @Test
- void replaceSetsFilterUsingSortedSet() {
- //language=java
- rewriteRun(
- java(
- """
- import java.util.Set;
- import java.util.SortedSet;
-
- import com.google.common.base.Predicate;
- import com.google.common.collect.Sets;
-
- class Test {
- public static Set test(SortedSet set, Predicate isNotNull) {
- return Sets.filter(set, isNotNull);
- }
- }
- """,
- """
- import java.util.Set;
- import java.util.SortedSet;
- import java.util.TreeSet;
- import java.util.function.Predicate;
- import java.util.stream.Collectors;
-
- class Test {
- public static Set test(SortedSet set, Predicate isNotNull) {
- return set.stream().filter(isNotNull).collect(Collectors.toCollection(TreeSet::new));
- }
- }
- """
- )
- );
- }
-
- @ExpectedToFail("Sets.filter has special handling for sorted sets which now gets lost")
- @Issue("https://github.com/openrewrite/rewrite-migrate-java/pull/898#discussion_r2461706208")
- @Test
- void replaceSetsFilterIndirectlyUsingSortedSet() {
- //language=java
- rewriteRun(
- java(
- """
- import java.util.Set;
- import java.util.SortedSet;
-
- import com.google.common.base.Predicate;
- import com.google.common.collect.Sets;
-
- class Test {
- public static Set test(SortedSet set, Predicate isNotNull) {
- Set indirectSet = set;
- return Sets.filter(indirectSet, isNotNull);
- }
- }
- """
- // This now gets converted, but skips past a `instanceof SortedSet` check that keeps it a sorted set
- )
- );
- }
-}
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 9b5ed2c0c7..1104f84513 100644
--- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaTest.java
@@ -16,6 +16,7 @@
package org.openrewrite.java.migrate.guava;
import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ExpectedToFail;
import org.openrewrite.DocumentExample;
import org.openrewrite.InMemoryExecutionContext;
import org.openrewrite.Issue;
@@ -198,4 +199,193 @@ boolean test(Collection collection, Predicate aPredicate) {
)
);
}
+
+ @Test
+ void predicatesEqualToToPredicateIsEqual() {
+ rewriteRun(
+ //language=java
+ java(
+ """
+ import com.google.common.base.Predicate;
+ import com.google.common.base.Predicates;
+
+ class A {
+ public static Predicate isHelloPredicate() {
+ return Predicates.equalTo("hello");
+ }
+ }
+ """,
+ """
+ import java.util.function.Predicate;
+
+ class A {
+ public static Predicate isHelloPredicate() {
+ return Predicate.isEqual("hello");
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/903")
+ @Test
+ void inlinedPredicatesEqualToWithParameterizedType() {
+ rewriteRun(
+ //language=java
+ java(
+ """
+ import com.google.common.base.Predicates;
+ import com.google.common.base.Predicate;
+
+ import java.util.Collection;
+
+ class Test {
+ public static void test(Collection aCollection, Predicate> anotherPredicate) {
+ Predicate> combined = Predicates.and(Predicates.equalTo(aCollection), anotherPredicate);
+ }
+ }
+ """,
+ """
+ import java.util.Collection;
+ import java.util.function.Predicate;
+
+ class Test {
+ public static void test(Collection aCollection, Predicate> anotherPredicate) {
+ Predicate> combined = Predicate.>isEqual(aCollection).and(anotherPredicate);
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void inlinedPredicatesEqualToWithStandardType() {
+ rewriteRun(
+ //language=java
+ java(
+ """
+ import com.google.common.base.Predicates;
+ import com.google.common.base.Predicate;
+
+ class Test {
+ static Predicate getMaxLengthPredicate() {
+ return s -> s.length() < 10;
+ }
+
+ public static void test() {
+ Predicate combined = Predicates.and(Predicates.equalTo("MyTest"), getMaxLengthPredicate());
+ }
+ }
+ """,
+ """
+ import java.util.function.Predicate;
+
+ class Test {
+ static Predicate getMaxLengthPredicate() {
+ return s -> s.length() < 10;
+ }
+
+ public static void test() {
+ Predicate combined = Predicate.isEqual("MyTest").and(getMaxLengthPredicate());
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void replaceSetsFilter() {
+ //language=java
+ rewriteRun(
+ java(
+ """
+ import java.util.Set;
+
+ import com.google.common.base.Predicate;
+ import com.google.common.collect.Sets;
+
+ class Test {
+ public static Set test(Set set, Predicate isNotNull) {
+ return Sets.filter(set, isNotNull);
+ }
+ }
+ """,
+ """
+ import java.util.Set;
+ import java.util.function.Predicate;
+ import java.util.stream.Collectors;
+
+ class Test {
+ public static Set test(Set set, Predicate isNotNull) {
+ return set.stream().filter(isNotNull).collect(Collectors.toSet());
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void replaceSetsFilterUsingSortedSet() {
+ //language=java
+ rewriteRun(
+ java(
+ """
+ import java.util.Set;
+ import java.util.SortedSet;
+
+ import com.google.common.base.Predicate;
+ import com.google.common.collect.Sets;
+
+ class Test {
+ public static Set test(SortedSet set, Predicate isNotNull) {
+ return Sets.filter(set, isNotNull);
+ }
+ }
+ """,
+ """
+ import java.util.Set;
+ import java.util.SortedSet;
+ import java.util.TreeSet;
+ import java.util.function.Predicate;
+ import java.util.stream.Collectors;
+
+ class Test {
+ public static Set test(SortedSet set, Predicate isNotNull) {
+ return set.stream().filter(isNotNull).collect(Collectors.toCollection(TreeSet::new));
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @ExpectedToFail("Sets.filter has special handling for sorted sets which now gets lost")
+ @Issue("https://github.com/openrewrite/rewrite-migrate-java/pull/898#discussion_r2461706208")
+ @Test
+ void replaceSetsFilterIndirectlyUsingSortedSet() {
+ //language=java
+ rewriteRun(
+ java(
+ """
+ import java.util.Set;
+ import java.util.SortedSet;
+
+ import com.google.common.base.Predicate;
+ import com.google.common.collect.Sets;
+
+ class Test {
+ public static Set test(SortedSet set, Predicate isNotNull) {
+ Set indirectSet = set;
+ return Sets.filter(indirectSet, isNotNull);
+ }
+ }
+ """
+ // This now gets converted, but skips past a `instanceof SortedSet` check that keeps it a sorted set
+ )
+ );
+ }
}
diff --git a/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalTest.java b/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalTest.java
index 690fd7fad7..f88bfc3a24 100644
--- a/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalTest.java
@@ -20,7 +20,6 @@
import org.junitpioneer.jupiter.ExpectedToFail;
import org.openrewrite.DocumentExample;
import org.openrewrite.Issue;
-import org.openrewrite.config.Environment;
import org.openrewrite.java.JavaParser;
import org.openrewrite.java.search.FindMethods;
import org.openrewrite.java.tree.J;
@@ -36,12 +35,7 @@
class PreferJavaUtilOptionalTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
- spec.recipe(
- Environment.builder()
- .scanRuntimeClasspath("org.openrewrite.java.migrate.guava")
- .build()
- .activateRecipes("org.openrewrite.java.migrate.guava.NoGuava")
- )
+ spec.recipeFromResources("org.openrewrite.java.migrate.guava.PreferJavaUtilOptional")
.parser(JavaParser.fromJavaVersion().classpath("rewrite-java", "guava"));
}
@@ -160,6 +154,9 @@ Optional foo(Optional optional) {
void orSupplierToOrElseGetWithSupplierArgument() {
//language=java
rewriteRun(
+ spec -> spec.recipeFromResources(
+ "org.openrewrite.java.migrate.guava.PreferJavaUtilOptional",
+ "org.openrewrite.java.migrate.guava.PreferJavaUtilSupplier"),
java(
"""
import com.google.common.base.Optional;
@@ -295,7 +292,6 @@ Optional foo(Optional firstChoice, Optional secondChoice
@Nested
class NotYetImplemented {
- @DocumentExample
@ExpectedToFail("Not yet implemented")
@Test
void getCatchIllegalStateExceptionToNoSuchElementException() {
diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaXmlBindRuntimeTest.java b/src/test/java/org/openrewrite/java/migrate/jakarta/AddJakartaXmlBindRuntimeTest.java
similarity index 93%
rename from src/test/java/org/openrewrite/java/migrate/jakarta/JakartaXmlBindRuntimeTest.java
rename to src/test/java/org/openrewrite/java/migrate/jakarta/AddJakartaXmlBindRuntimeTest.java
index ce0e648ab3..bb7c6b9cca 100644
--- a/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaXmlBindRuntimeTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/jakarta/AddJakartaXmlBindRuntimeTest.java
@@ -29,10 +29,10 @@
import static org.openrewrite.java.Assertions.*;
import static org.openrewrite.maven.Assertions.pomXml;
-class JakartaXmlBindRuntimeTest implements RewriteTest {
+class AddJakartaXmlBindRuntimeTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
- spec.recipeFromResources("org.openrewrite.java.migrate.jakarta.JavaxXmlBindMigrationToJakartaXmlBind")
+ spec.recipe(new AddJakartaXmlBindRuntime())
.parser(JavaParser.fromJavaVersion().dependsOn(
"package javax.xml.bind; public abstract class JAXBContext { public static JAXBContext newInstance(Class>... types) { return null; } }"));
}
@@ -41,6 +41,7 @@ public void defaults(RecipeSpec spec) {
@Test
void addsRuntimeForContextFactory() {
rewriteRun(
+ spec -> spec.recipeFromResources("org.openrewrite.java.migrate.jakarta.JavaxXmlBindMigrationToJakartaXmlBind"),
mavenProject("app",
pomXml(
"""
@@ -97,7 +98,6 @@ class A { JAXBContext context = JAXBContext.newInstance(A.class); }
@Test
void onlyFactoryGetsTestScope() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()),
mavenProject("app",
pomXml(POM, spec -> spec.after(pom -> {
return assertThat( pom ).contains( "jaxb-runtime ", "test " ).actual();
@@ -110,7 +110,6 @@ void onlyFactoryGetsTestScope() {
@Test
void doesNotAddRuntimeForApiReferencesWithoutFactoryCalls() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()),
mavenProject("app",
pomXml(POM),
srcMainJava(java("import javax.xml.bind.JAXBContext; class A { JAXBContext context; }"))
@@ -121,7 +120,6 @@ void doesNotAddRuntimeForApiReferencesWithoutFactoryCalls() {
@Test
void leavesOtherModulesAlone() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()),
mavenProject("app",
pomXml(POM, spec -> spec.after(pom -> {
return assertThat( pom ).contains( "jaxb-runtime ", "runtime " ).actual();
@@ -136,7 +134,6 @@ void leavesOtherModulesAlone() {
@Test
void respectsExplicitMoxyProvider() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()),
mavenProject("app",
pomXml(POM.replace("", """
@@ -156,7 +153,6 @@ void respectsExplicitMoxyProvider() {
@Test
void respectsProvidedJakartaPlatform() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()),
mavenProject("app",
pomXml(POM.replace("", """
@@ -177,7 +173,7 @@ void respectsProvidedJakartaPlatform() {
@Test
void recognizesUnattributedFactoryCalls() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()).typeValidationOptions(TypeValidation.none()),
+ spec -> spec.typeValidationOptions(TypeValidation.none()),
mavenProject("app",
pomXml(POM, spec -> spec.after(pom -> {
return assertThat( pom ).contains( "jaxb-runtime ", "runtime " ).actual();
@@ -195,7 +191,6 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Integ
@Test
void productionUsageWinsOverTestUsage() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()),
mavenProject("app",
pomXml(POM, spec -> spec.after(pom -> {
return assertThat( pom ).contains( "jaxb-runtime ", "runtime " )
@@ -210,6 +205,7 @@ void productionUsageWinsOverTestUsage() {
@Test
void dependencyFreeApplicationGetsCompileApiAndRuntime() {
rewriteRun(
+ spec -> spec.recipeFromResources("org.openrewrite.java.migrate.jakarta.JavaxXmlBindMigrationToJakartaXmlBind"),
mavenProject("app",
pomXml(POM, spec -> spec.after(pom -> {
return assertThat( pom ).contains( "jakarta.xml.bind-api ",
@@ -223,7 +219,8 @@ void dependencyFreeApplicationGetsCompileApiAndRuntime() {
@Test
void unattributedFactoryGetsCompileApiBeforeRuntime() {
rewriteRun(
- spec -> spec.typeValidationOptions(TypeValidation.none()),
+ spec -> spec.recipeFromResources("org.openrewrite.java.migrate.jakarta.JavaxXmlBindMigrationToJakartaXmlBind")
+ .typeValidationOptions(TypeValidation.none()),
mavenProject("app",
pomXml(POM, spec -> spec.after(pom -> {
return assertThat( pom ).contains( "jakarta.xml.bind-api ",
@@ -263,7 +260,6 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Integ
@Test
void compileScopedPlatformDoesNotProvideRuntime() {
rewriteRun(
- spec -> spec.recipe(new AddJakartaXmlBindRuntime()),
mavenProject("app",
pomXml(POM.replace("", """
diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/UpdateAnnotationAttributeJavaxToJakartaTest.java b/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaEE10AnnotationAttributesTest.java
similarity index 98%
rename from src/test/java/org/openrewrite/java/migrate/jakarta/UpdateAnnotationAttributeJavaxToJakartaTest.java
rename to src/test/java/org/openrewrite/java/migrate/jakarta/JakartaEE10AnnotationAttributesTest.java
index f0b0a9c878..b4fcf5667a 100644
--- a/src/test/java/org/openrewrite/java/migrate/jakarta/UpdateAnnotationAttributeJavaxToJakartaTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaEE10AnnotationAttributesTest.java
@@ -24,7 +24,7 @@
import static org.openrewrite.java.Assertions.java;
-class UpdateAnnotationAttributeJavaxToJakartaTest implements RewriteTest {
+class JakartaEE10AnnotationAttributesTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
diff --git a/src/test/java/org/openrewrite/java/migrate/javaee/OpenJPAPersistenceProviderTest.java b/src/test/java/org/openrewrite/java/migrate/javaee7/OpenJPAPersistenceProviderTest.java
similarity index 99%
rename from src/test/java/org/openrewrite/java/migrate/javaee/OpenJPAPersistenceProviderTest.java
rename to src/test/java/org/openrewrite/java/migrate/javaee7/OpenJPAPersistenceProviderTest.java
index 81edcbb2f8..b5549d8904 100644
--- a/src/test/java/org/openrewrite/java/migrate/javaee/OpenJPAPersistenceProviderTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/javaee7/OpenJPAPersistenceProviderTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openrewrite.java.migrate.javaee;
+package org.openrewrite.java.migrate.javaee7;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
diff --git a/src/test/java/org/openrewrite/java/migrate/javaee/ApacheDefaultProviderTest.java b/src/test/java/org/openrewrite/java/migrate/javaee8/ApacheDefaultProviderTest.java
similarity index 98%
rename from src/test/java/org/openrewrite/java/migrate/javaee/ApacheDefaultProviderTest.java
rename to src/test/java/org/openrewrite/java/migrate/javaee8/ApacheDefaultProviderTest.java
index 4c3ef862ae..e48dcc8870 100644
--- a/src/test/java/org/openrewrite/java/migrate/javaee/ApacheDefaultProviderTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/javaee8/ApacheDefaultProviderTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openrewrite.java.migrate.javaee;
+package org.openrewrite.java.migrate.javaee8;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
diff --git a/src/test/java/org/openrewrite/java/migrate/javaee/ServletIsRequestedSessionIdFromURLTest.java b/src/test/java/org/openrewrite/java/migrate/javaee8/ServletIsRequestedSessionIdFromURLTest.java
similarity index 97%
rename from src/test/java/org/openrewrite/java/migrate/javaee/ServletIsRequestedSessionIdFromURLTest.java
rename to src/test/java/org/openrewrite/java/migrate/javaee8/ServletIsRequestedSessionIdFromURLTest.java
index 9c74c47ecf..2ce19900a6 100644
--- a/src/test/java/org/openrewrite/java/migrate/javaee/ServletIsRequestedSessionIdFromURLTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/javaee8/ServletIsRequestedSessionIdFromURLTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openrewrite.java.migrate.javaee;
+package org.openrewrite.java.migrate.javaee8;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
diff --git a/src/test/java/org/openrewrite/java/migrate/javaee/AddTableGeneratorTest.java b/src/test/java/org/openrewrite/java/migrate/javax/AddTableGeneratorTest.java
similarity index 98%
rename from src/test/java/org/openrewrite/java/migrate/javaee/AddTableGeneratorTest.java
rename to src/test/java/org/openrewrite/java/migrate/javax/AddTableGeneratorTest.java
index 72016f4045..cc758b33c8 100644
--- a/src/test/java/org/openrewrite/java/migrate/javaee/AddTableGeneratorTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/javax/AddTableGeneratorTest.java
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openrewrite.java.migrate.javaee;
+package org.openrewrite.java.migrate.javax;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
import org.openrewrite.InMemoryExecutionContext;
import org.openrewrite.java.JavaParser;
-import org.openrewrite.java.migrate.javax.AddTableGenerator;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
diff --git a/src/test/java/org/openrewrite/java/migrate/maven/MigrateJaxwsMavenPluginTest.java b/src/test/java/org/openrewrite/java/migrate/javax/MigrateJaxBWSPluginTest.java
similarity index 98%
rename from src/test/java/org/openrewrite/java/migrate/maven/MigrateJaxwsMavenPluginTest.java
rename to src/test/java/org/openrewrite/java/migrate/javax/MigrateJaxBWSPluginTest.java
index e48aa3f92c..0079534e3c 100644
--- a/src/test/java/org/openrewrite/java/migrate/maven/MigrateJaxwsMavenPluginTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/javax/MigrateJaxBWSPluginTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openrewrite.java.migrate.maven;
+package org.openrewrite.java.migrate.javax;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
@@ -22,7 +22,7 @@
import static org.openrewrite.maven.Assertions.pomXml;
-class MigrateJaxwsMavenPluginTest implements RewriteTest {
+class MigrateJaxBWSPluginTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
diff --git a/src/test/java/org/openrewrite/java/migrate/lang/UseThreadsOrExecutorsTest.java b/src/test/java/org/openrewrite/java/migrate/lang/FindVirtualThreadOpportunitiesTest.java
similarity index 99%
rename from src/test/java/org/openrewrite/java/migrate/lang/UseThreadsOrExecutorsTest.java
rename to src/test/java/org/openrewrite/java/migrate/lang/FindVirtualThreadOpportunitiesTest.java
index 6f630d7395..9ee6b4e71d 100644
--- a/src/test/java/org/openrewrite/java/migrate/lang/UseThreadsOrExecutorsTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lang/FindVirtualThreadOpportunitiesTest.java
@@ -23,7 +23,7 @@
import static org.openrewrite.java.Assertions.java;
-class UseThreadsOrExecutorsTest implements RewriteTest {
+class FindVirtualThreadOpportunitiesTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
diff --git a/src/test/java/org/openrewrite/java/migrate/lang/JavaLangAPIsTest.java b/src/test/java/org/openrewrite/java/migrate/lang/JavaLangAPIsTest.java
index 9bffda6c7c..3d9bc9443e 100644
--- a/src/test/java/org/openrewrite/java/migrate/lang/JavaLangAPIsTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lang/JavaLangAPIsTest.java
@@ -17,7 +17,6 @@
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
-import org.openrewrite.config.Environment;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
@@ -27,10 +26,7 @@
class JavaLangAPIsTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
- spec.recipe(Environment.builder()
- .scanRuntimeClasspath("org.openrewrite.java.migrate.lang")
- .build()
- .activateRecipes("org.openrewrite.java.migrate.lang.JavaLangAPIs"));
+ spec.recipeFromResources("org.openrewrite.java.migrate.lang.JavaLangAPIs");
}
@DocumentExample
diff --git a/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java b/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java
index 804eabf2d3..bcd254d9c2 100644
--- a/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java
@@ -18,7 +18,6 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
-import org.openrewrite.config.Environment;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
@@ -30,13 +29,8 @@ class UseVarKeywordTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
- spec.recipe(
- Environment.builder()
- .scanRuntimeClasspath("org.openrewrite.java.migrate.lang")
- .build()
- .activateRecipes("org.openrewrite.java.migrate.lang.UseVar"))
- .allSources(s -> s.markers(javaVersion(10)))
- ;
+ spec.recipeFromResources("org.openrewrite.java.migrate.lang.UseVar")
+ .allSources(s -> s.markers(javaVersion(10)));
}
@Nested
diff --git a/src/test/java/org/openrewrite/java/migrate/lang/var/UseVarForObjectsTest.java b/src/test/java/org/openrewrite/java/migrate/lang/var/UseVarForObjectTest.java
similarity index 99%
rename from src/test/java/org/openrewrite/java/migrate/lang/var/UseVarForObjectsTest.java
rename to src/test/java/org/openrewrite/java/migrate/lang/var/UseVarForObjectTest.java
index 59d8ac5eda..e4ca57f3f3 100644
--- a/src/test/java/org/openrewrite/java/migrate/lang/var/UseVarForObjectsTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lang/var/UseVarForObjectTest.java
@@ -23,7 +23,7 @@
import static org.openrewrite.java.Assertions.*;
-class UseVarForObjectsTest extends VarBaseTest {
+class UseVarForObjectTest extends VarBaseTest {
@Override
public void defaults(RecipeSpec spec) {
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/log/UseCommonsLogTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseCommonsLogTest.java
new file mode 100644
index 0000000000..7ee2fe9348
--- /dev/null
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseCommonsLogTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Moderne Source Available License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok.log;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.java.Assertions.java;
+
+class UseCommonsLogTest implements RewriteTest {
+
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.recipe(new UseCommonsLog(null))
+ .parser(JavaParser.fromJavaVersion()
+ .logCompilationWarningsAndErrors(true)
+ .classpath("commons-logging"));
+ }
+
+ @DocumentExample
+ @Test
+ void replaceCommonsLog() {
+ rewriteRun(
+ // language=java
+ java(
+ """
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ class A {
+ private static final Log log = LogFactory.getLog(A.class);
+ }
+ """,
+ """
+ import lombok.extern.apachecommons.CommonsLog;
+
+ @CommonsLog
+ class A {
+ }
+ """
+ )
+ );
+ }
+}
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/log/UseJBossLogTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseJBossLogTest.java
new file mode 100644
index 0000000000..0c34fdce6f
--- /dev/null
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseJBossLogTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Moderne Source Available License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok.log;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.java.Assertions.java;
+
+class UseJBossLogTest implements RewriteTest {
+
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.recipe(new UseJBossLog(null))
+ .parser(JavaParser.fromJavaVersion()
+ .logCompilationWarningsAndErrors(true)
+ .classpath("jboss-logging"));
+ }
+
+ @DocumentExample
+ @Test
+ void replaceJbossLog() {
+ rewriteRun(
+ // language=java
+ java(
+ """
+ import org.jboss.logging.Logger;
+ class A {
+ private static final Logger log = Logger.getLogger(A.class);
+ }
+ """,
+ """
+ import lombok.extern.jbosslog.JBossLog;
+
+ @JBossLog
+ class A {
+ }
+ """
+ )
+ );
+ }
+}
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLog4j2Test.java b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLog4j2Test.java
new file mode 100644
index 0000000000..b2f8fbee05
--- /dev/null
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLog4j2Test.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Moderne Source Available License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok.log;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.java.Assertions.java;
+
+class UseLog4j2Test implements RewriteTest {
+
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.recipe(new UseLog4j2(null))
+ .parser(JavaParser.fromJavaVersion()
+ .logCompilationWarningsAndErrors(true)
+ .classpath("log4j-api"));
+ }
+
+ @DocumentExample
+ @Test
+ void replaceLog4j() {
+ rewriteRun(
+ // language=java
+ java(
+ """
+ import org.apache.logging.log4j.Logger;
+ import org.apache.logging.log4j.LogManager;
+ class A {
+ private static final Logger log = LogManager.getLogger(A.class);
+ }
+ """,
+ """
+ import lombok.extern.log4j.Log4j2;
+
+ @Log4j2
+ class A {
+ }
+ """
+ )
+ );
+ }
+}
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLogTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLogTest.java
new file mode 100644
index 0000000000..ab1b8549c7
--- /dev/null
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLogTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * Licensed under the Moderne Source Available License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate.lombok.log;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.java.Assertions.java;
+
+class UseLogTest implements RewriteTest {
+
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.recipe(new UseLog(null))
+ .parser(JavaParser.fromJavaVersion()
+ .logCompilationWarningsAndErrors(true));
+ }
+
+ @DocumentExample
+ @Test
+ void replaceLog() {
+ rewriteRun(
+ // language=java
+ java(
+ """
+ import java.util.logging.Logger;
+ class A {
+ private static final Logger log = Logger.getLogger(A.class.getName());
+ }
+ """,
+ """
+ import lombok.extern.java.Log;
+
+ @Log
+ class A {
+ }
+ """
+ )
+ );
+ }
+}
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/log/ConvertAnyLogTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLombokLogAnnotationsTest.java
similarity index 98%
rename from src/test/java/org/openrewrite/java/migrate/lombok/log/ConvertAnyLogTest.java
rename to src/test/java/org/openrewrite/java/migrate/lombok/log/UseLombokLogAnnotationsTest.java
index b4647c111d..de3d305741 100644
--- a/src/test/java/org/openrewrite/java/migrate/lombok/log/ConvertAnyLogTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseLombokLogAnnotationsTest.java
@@ -23,7 +23,7 @@
import static org.openrewrite.java.Assertions.java;
-class ConvertAnyLogTest implements RewriteTest {
+class UseLombokLogAnnotationsTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
diff --git a/src/test/java/org/openrewrite/java/migrate/lombok/log/ConvertToLogAnnotationTest.java b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseSlf4jTest.java
similarity index 65%
rename from src/test/java/org/openrewrite/java/migrate/lombok/log/ConvertToLogAnnotationTest.java
rename to src/test/java/org/openrewrite/java/migrate/lombok/log/UseSlf4jTest.java
index aa2461907b..b2b1bc7126 100644
--- a/src/test/java/org/openrewrite/java/migrate/lombok/log/ConvertToLogAnnotationTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/lombok/log/UseSlf4jTest.java
@@ -25,7 +25,7 @@
import static org.openrewrite.java.Assertions.java;
-class ConvertToLogAnnotationTest implements RewriteTest {
+class UseSlf4jTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
@@ -212,111 +212,4 @@ class A {
)
);
}
-
- @Test
- void replaceLog4j() {
- rewriteRun(
- spec -> spec.recipe(new UseLog4j2(null))
- .parser(JavaParser.fromJavaVersion()
- .logCompilationWarningsAndErrors(true)
- .classpath("log4j-api")),
- // language=java
- java(
- """
- import org.apache.logging.log4j.Logger;
- import org.apache.logging.log4j.LogManager;
- class A {
- private static final Logger log = LogManager.getLogger(A.class);
- }
- """,
- """
- import lombok.extern.log4j.Log4j2;
-
- @Log4j2
- class A {
- }
- """
- )
- );
- }
-
- @Test
- void replaceLog() {
- rewriteRun(
- spec -> spec.recipe(new UseLog(null))
- .parser(JavaParser.fromJavaVersion()
- .logCompilationWarningsAndErrors(true)),
-
- // language=java
- java(
- """
- import java.util.logging.Logger;
- class A {
- private static final Logger log = Logger.getLogger(A.class.getName());
- }
- """,
- """
- import lombok.extern.java.Log;
-
- @Log
- class A {
- }
- """
- )
- );
- }
-
- @Test
- void replaceJbossLog() {
- rewriteRun(
- spec -> spec.recipe(new UseJBossLog(null))
- .parser(JavaParser.fromJavaVersion()
- .logCompilationWarningsAndErrors(true)
- .classpath("jboss-logging")),
- // language=java
- java(
- """
- import org.jboss.logging.Logger;
- class A {
- private static final Logger log = Logger.getLogger(A.class);
- }
- """,
- """
- import lombok.extern.jbosslog.JBossLog;
-
- @JBossLog
- class A {
- }
- """
- )
- );
- }
-
- @Test
- void replaceCommonsLog() {
- rewriteRun(
- spec -> spec.recipe(new UseCommonsLog(null))
- .parser(JavaParser.fromJavaVersion()
- .logCompilationWarningsAndErrors(true)
- .classpath("commons-logging")),
- // language=java
- java(
- """
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- class A {
- private static final Log log = LogFactory.getLog(A.class);
- }
- """,
- """
- import lombok.extern.apachecommons.CommonsLog;
-
- @CommonsLog
- class A {
- }
- """
- )
- );
- }
-
}
diff --git a/src/test/java/org/openrewrite/java/migrate/util/MigrateInflaterDeflaterToAutoCloseableTest.java b/src/test/java/org/openrewrite/java/migrate/util/MigrateInflaterDeflaterToCloseTest.java
similarity index 99%
rename from src/test/java/org/openrewrite/java/migrate/util/MigrateInflaterDeflaterToAutoCloseableTest.java
rename to src/test/java/org/openrewrite/java/migrate/util/MigrateInflaterDeflaterToCloseTest.java
index 11e504bebc..3e8ce9e213 100644
--- a/src/test/java/org/openrewrite/java/migrate/util/MigrateInflaterDeflaterToAutoCloseableTest.java
+++ b/src/test/java/org/openrewrite/java/migrate/util/MigrateInflaterDeflaterToCloseTest.java
@@ -24,7 +24,7 @@
import static org.openrewrite.java.Assertions.java;
import static org.openrewrite.java.Assertions.javaVersion;
-class MigrateInflaterDeflaterToAutoCloseableTest implements RewriteTest {
+class MigrateInflaterDeflaterToCloseTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {