diff --git a/src/main/resources/META-INF/rewrite/assertj.yml b/src/main/resources/META-INF/rewrite/assertj.yml index b8be8c5c7..daa4c087b 100644 --- a/src/main/resources/META-INF/rewrite/assertj.yml +++ b/src/main/resources/META-INF/rewrite/assertj.yml @@ -581,6 +581,7 @@ recipeList: - org.openrewrite.java.ChangePackage: oldPackageName: org.fest.assertions.api newPackageName: org.assertj.core.api + recursive: true - org.openrewrite.java.ChangeType: oldFullyQualifiedTypeName: org.fest.assertions.core.Condition newFullyQualifiedTypeName: org.assertj.core.api.Condition diff --git a/src/main/resources/META-INF/rewrite/datafaker.yml b/src/main/resources/META-INF/rewrite/datafaker.yml index f6349e625..0f4c40c40 100644 --- a/src/main/resources/META-INF/rewrite/datafaker.yml +++ b/src/main/resources/META-INF/rewrite/datafaker.yml @@ -34,6 +34,7 @@ recipeList: - org.openrewrite.java.ChangePackage: oldPackageName: com.github.javafaker newPackageName: net.datafaker + recursive: true - org.openrewrite.java.dependencies.ChangeDependency: oldGroupId: com.github.javafaker oldArtifactId: javafaker diff --git a/src/test/java/org/openrewrite/java/testing/assertj/FestToAssertJTest.java b/src/test/java/org/openrewrite/java/testing/assertj/FestToAssertJTest.java index a41ef60dd..cece5cf03 100644 --- a/src/test/java/org/openrewrite/java/testing/assertj/FestToAssertJTest.java +++ b/src/test/java/org/openrewrite/java/testing/assertj/FestToAssertJTest.java @@ -211,4 +211,25 @@ void test(Object object1, Object object2) { ) ); } + + @Test + void typeInSubpackage() { + //language=java + rewriteRun( + java( + """ + import org.fest.assertions.api.filter.Filters; + class A { + Class type = Filters.class; + } + """, + """ + import org.assertj.core.api.filter.Filters; + class A { + Class type = Filters.class; + } + """ + ) + ); + } } diff --git a/src/test/java/org/openrewrite/java/testing/datafaker/JavaFakerToDataFakerTest.java b/src/test/java/org/openrewrite/java/testing/datafaker/JavaFakerToDataFakerTest.java index cae74fd62..1f102db06 100644 --- a/src/test/java/org/openrewrite/java/testing/datafaker/JavaFakerToDataFakerTest.java +++ b/src/test/java/org/openrewrite/java/testing/datafaker/JavaFakerToDataFakerTest.java @@ -66,4 +66,25 @@ void method() { ) ); } + + @Test + void typeInSubpackage() { + rewriteRun( + //language=java + java( + """ + import com.github.javafaker.service.RandomService; + class A { + RandomService random = new RandomService(); + } + """, + """ + import net.datafaker.service.RandomService; + class A { + RandomService random = new RandomService(); + } + """ + ) + ); + } }