Handle removal of doNext(Recipe)

sambsnyd · sambsnyd · commit b8f29f373eed · 2023-05-30T21:07:08.000-07:00
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java
@@ -115,7 +115,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 );
             }
 
-            doAfterVisit(new RemoveUnusedImports());
+            doAfterVisit(new RemoveUnusedImports().getVisitor());
             doAfterVisit(new UnqualifiedMethodInvocations());
             return m;
         }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AssertToAssertions.java b/src/main/java/org/openrewrite/java/testing/junit5/AssertToAssertions.java
@@ -79,7 +79,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 return m;
             }
             doAfterVisit(new ChangeMethodTargetToStatic("org.junit.Assert " + m.getSimpleName() + "(..)",
-                    "org.junit.jupiter.api.Assertions", null, null, true));
+                    "org.junit.jupiter.api.Assertions", null, null, true)
+                    .getVisitor());
             List<Expression> args = m.getArguments();
             Expression firstArg = args.get(0);
             // Suppress arg-switching for Assertions.assertEquals(String, String)
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java b/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java
@@ -71,11 +71,11 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
                         J.CompilationUnit c = super.visitCompilationUnit(cu, ctx);
                         doAfterVisit(new TestCaseVisitor());
                         // ChangeType for org.junit.Assert method invocations because TestCase extends org.junit.Assert
-                        doAfterVisit(new ChangeType("junit.framework.TestCase", "org.junit.Assert", true));
-                        doAfterVisit(new ChangeType("junit.framework.Assert", "org.junit.Assert", true));
+                        doAfterVisit(new ChangeType("junit.framework.TestCase", "org.junit.Assert", true).getVisitor());
+                        doAfterVisit(new ChangeType("junit.framework.Assert", "org.junit.Assert", true).getVisitor());
                         doAfterVisit(new AssertToAssertions.AssertToAssertionsVisitor());
-                        doAfterVisit(new UseStaticImport("org.junit.jupiter.api.Assertions assert*(..)"));
-                        doAfterVisit(new UseStaticImport("org.junit.jupiter.api.Assertions fail*(..)"));
+                        doAfterVisit(new UseStaticImport("org.junit.jupiter.api.Assertions assert*(..)").getVisitor());
+                        doAfterVisit(new UseStaticImport("org.junit.jupiter.api.Assertions fail*(..)").getVisitor());
                         return c;
                     }
 
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/RemoveObsoleteRunners.java b/src/main/java/org/openrewrite/java/testing/junit5/RemoveObsoleteRunners.java
@@ -57,7 +57,7 @@ public class RemoveObsoleteRunnersVisitor extends JavaIsoVisitor<ExecutionContex
         public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
             for (String runner : obsoleteRunners) {
                 //noinspection ConstantConditions
-                doAfterVisit(new RemoveAnnotation("@org.junit.runner.RunWith(" + runner + ".class)"));
+                doAfterVisit(new RemoveAnnotation("@org.junit.runner.RunWith(" + runner + ".class)").getVisitor());
                 maybeRemoveImport(runner);
             }
             maybeRemoveImport("org.junit.runner.RunWith");
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java b/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java
@@ -65,7 +65,9 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
                 J.CompilationUnit c = (J.CompilationUnit) super.visitCompilationUnit(cu, ctx);
                 if (c != cu) {
-                    doAfterVisit(new ChangeType("org.junit.rules.TemporaryFolder", "java.io.File", true));
+                    c = (J.CompilationUnit) new ChangeType(
+                            "org.junit.rules.TemporaryFolder", "java.io.File", true).getVisitor()
+                            .visit(c, ctx);
                     maybeAddImport("java.io.File");
                     maybeAddImport("org.junit.jupiter.api.io.TempDir");
                     maybeRemoveImport("org.junit.ClassRule");
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TestRuleToTestInfo.java b/src/main/java/org/openrewrite/java/testing/junit5/TestRuleToTestInfo.java
@@ -81,8 +81,8 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
                     return mi;
                 }
             });
-            doAfterVisit(new ChangeType("org.junit.rules.TestName", "java.lang.String", true));
-            doAfterVisit(new ChangeType("org.junit.Before", "org.junit.jupiter.api.BeforeEach", true));
+            doAfterVisit(new ChangeType("org.junit.rules.TestName", "java.lang.String", true).getVisitor());
+            doAfterVisit(new ChangeType("org.junit.Before", "org.junit.jupiter.api.BeforeEach", true).getVisitor());
             return compilationUnit;
         }
 
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UpdateBeforeAfterAnnotations.java b/src/main/java/org/openrewrite/java/testing/junit5/UpdateBeforeAfterAnnotations.java
@@ -52,10 +52,10 @@ public static class UpdateBeforeAfterAnnotationsVisitor extends JavaIsoVisitor<E
         public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
             //This visitor handles changing the method visibility for any method annotated with one of the four before/after
             //annotations. It registers visitors that will sweep behind it making the type changes.
-            doAfterVisit(new ChangeType("org.junit.Before", "org.junit.jupiter.api.BeforeEach", true));
-            doAfterVisit(new ChangeType("org.junit.After", "org.junit.jupiter.api.AfterEach", true));
-            doAfterVisit(new ChangeType("org.junit.BeforeClass", "org.junit.jupiter.api.BeforeAll", true));
-            doAfterVisit(new ChangeType("org.junit.AfterClass", "org.junit.jupiter.api.AfterAll", true));
+            doAfterVisit(new ChangeType("org.junit.Before", "org.junit.jupiter.api.BeforeEach", true).getVisitor());
+            doAfterVisit(new ChangeType("org.junit.After", "org.junit.jupiter.api.AfterEach", true).getVisitor());
+            doAfterVisit(new ChangeType("org.junit.BeforeClass", "org.junit.jupiter.api.BeforeAll", true).getVisitor());
+            doAfterVisit(new ChangeType("org.junit.AfterClass", "org.junit.jupiter.api.AfterAll", true).getVisitor());
 
             return super.visitCompilationUnit(cu, ctx);
         }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UpdateMockWebServer.java b/src/main/java/org/openrewrite/java/testing/junit5/UpdateMockWebServer.java
@@ -33,9 +33,11 @@
 import org.openrewrite.java.tree.TypeUtils;
 import org.openrewrite.marker.Markers;
 
+import java.util.List;
 import java.util.UUID;
 
 import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 
 /**
  * Recipe for converting JUnit 4 okhttp3 MockWebServer Rules with their JUnit 5 equivalent.
@@ -142,8 +144,6 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                                 cd = cd.withBody(body);
                             }
                             maybeRemoveImport("org.junit.Rule");
-                            doAfterVisit(new UpgradeDependencyVersion("com.squareup.okhttp3", "mockwebserver", "4.X",
-                                    null, false, emptyList()));
                         }
                         return cd;
                     }
@@ -176,4 +176,10 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                     }
                 });
     }
+
+    @Override
+    public List<Recipe> getRecipeList() {
+        return singletonList(new UpgradeDependencyVersion("com.squareup.okhttp3", "mockwebserver", "4.X",
+                null, false, emptyList()));
+    }
 }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UseWiremockExtension.java b/src/main/java/org/openrewrite/java/testing/junit5/UseWiremockExtension.java
@@ -24,7 +24,11 @@
 import org.openrewrite.java.search.UsesType;
 import org.openrewrite.java.tree.*;
 
+import java.util.Collections;
+import java.util.List;
+
 import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 
 public class UseWiremockExtension extends Recipe {
 
@@ -48,7 +52,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public J preVisit(J tree, ExecutionContext ctx) {
                 if (tree instanceof JavaSourceFile) {
                     doAfterVisit(new ChangeType("com.github.tomakehurst.wiremock.junit.WireMockRule",
-                            "com.github.tomakehurst.wiremock.junit5.WireMockExtension", true));
+                            "com.github.tomakehurst.wiremock.junit5.WireMockExtension", true).getVisitor());
                 }
                 return tree;
             }
@@ -59,8 +63,8 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
                 J.NewClass n = (J.NewClass) super.visitNewClass(newClass, ctx);
                 if (newWiremockRule.matches(n)) {
                     maybeAddImport("com.github.tomakehurst.wiremock.junit5.WireMockExtension");
-                    doAfterVisit(new ChangeType("org.junit.Rule", "org.junit.jupiter.api.extension.RegisterExtension", true));
-                    doAfterVisit(new UpgradeDependencyVersion("com.github.tomakehurst", "wiremock-jre8", "2.x", null, true, emptyList()));
+                    doAfterVisit(new ChangeType("org.junit.Rule", "org.junit.jupiter.api.extension.RegisterExtension", true)
+                            .getVisitor());
 
                     Expression arg = n.getArguments().get(0);
 
@@ -163,4 +167,10 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
             }
         });
     }
+
+    @Override
+    public List<Recipe> getRecipeList() {
+        return singletonList(new UpgradeDependencyVersion("com.github.tomakehurst", "wiremock*",
+                "2.x", null, true, emptyList()));
+    }
 }
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/MockUtilsToStatic.java b/src/main/java/org/openrewrite/java/testing/mockito/MockUtilsToStatic.java
@@ -61,9 +61,10 @@ public static class MockUtilsToStaticVisitor extends JavaVisitor<ExecutionContex
         );
 
         @Override
-        public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
-            doAfterVisit(changeMethodTargetToStatic);
-            return super.visitCompilationUnit(cu, ctx);
+        public J visitCompilationUnit(J.CompilationUnit compilationUnit, ExecutionContext ctx) {
+            J.CompilationUnit cu = (J.CompilationUnit) super.visitCompilationUnit(compilationUnit, ctx);
+            cu = (J.CompilationUnit) changeMethodTargetToStatic.getVisitor().visitNonNull(cu, ctx);
+            return cu;
         }
 
         @Override
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/MockitoJUnitRunnerSilentToExtension.java b/src/main/java/org/openrewrite/java/testing/mockito/MockitoJUnitRunnerSilentToExtension.java
@@ -68,7 +68,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                             .build();
                     cd = maybeAutoFormat(cd, cd.withTemplate(template, getCursor(), cd.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName))), ctx);
                     doAfterVisit(new RunnerToExtension(Collections.singletonList("org.mockito.junit.MockitoJUnitRunner$Silent"),
-                            "org.mockito.junit.jupiter.MockitoExtension"));
+                            "org.mockito.junit.jupiter.MockitoExtension").getVisitor());
                     maybeRemoveImport("org.mockito.junit.MockitoJUnitRunner");
                     maybeAddImport("org.mockito.quality.Strictness");
                     maybeAddImport("org.mockito.junit.jupiter.MockitoSettings");

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu`
`115`	`115`	`);`
`116`	`116`	`}`
`117`	`117`
`118`		`- doAfterVisit(new RemoveUnusedImports());`
	`118`	`+ doAfterVisit(new RemoveUnusedImports().getVisitor());`
`119`	`119`	`doAfterVisit(new UnqualifiedMethodInvocations());`
`120`	`120`	`return m;`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class RemoveObsoleteRunnersVisitor extends JavaIsoVisitor<ExecutionContex`
`57`	`57`	`public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {`
`58`	`58`	`for (String runner : obsoleteRunners) {`
`59`	`59`	`//noinspection ConstantConditions`
`60`		`- doAfterVisit(new RemoveAnnotation("@org.junit.runner.RunWith(" + runner + ".class)"));`
	`60`	`+ doAfterVisit(new RemoveAnnotation("@org.junit.runner.RunWith(" + runner + ".class)").getVisitor());`
`61`	`61`	`maybeRemoveImport(runner);`
`62`	`62`	`}`
`63`	`63`	`maybeRemoveImport("org.junit.runner.RunWith");`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)`
`81`	`81`	`return mi;`
`82`	`82`	`}`
`83`	`83`	`});`
`84`		`- doAfterVisit(new ChangeType("org.junit.rules.TestName", "java.lang.String", true));`
`85`		`- doAfterVisit(new ChangeType("org.junit.Before", "org.junit.jupiter.api.BeforeEach", true));`
	`84`	`+ doAfterVisit(new ChangeType("org.junit.rules.TestName", "java.lang.String", true).getVisitor());`
	`85`	`+ doAfterVisit(new ChangeType("org.junit.Before", "org.junit.jupiter.api.BeforeEach", true).getVisitor());`
`86`	`86`	`return compilationUnit;`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,11 @@`
`33`	`33`	`import org.openrewrite.java.tree.TypeUtils;`
`34`	`34`	`import org.openrewrite.marker.Markers;`
`35`	`35`
	`36`	`+import java.util.List;`
`36`	`37`	`import java.util.UUID;`
`37`	`38`
`38`	`39`	`import static java.util.Collections.emptyList;`
	`40`	`+import static java.util.Collections.singletonList;`
`39`	`41`
`40`	`42`	`/**`
`41`	`43`	`* Recipe for converting JUnit 4 okhttp3 MockWebServer Rules with their JUnit 5 equivalent.`
`@@ -142,8 +144,6 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex`
`142`	`144`	`cd = cd.withBody(body);`
`143`	`145`	`}`
`144`	`146`	`maybeRemoveImport("org.junit.Rule");`
`145`		`- doAfterVisit(new UpgradeDependencyVersion("com.squareup.okhttp3", "mockwebserver", "4.X",`
`146`		`- null, false, emptyList()));`
`147`	`147`	`}`
`148`	`148`	`return cd;`
`149`	`149`	`}`
`@@ -176,4 +176,10 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex`
`176`	`176`	`}`
`177`	`177`	`});`
`178`	`178`	`}`
	`179`	`+`
	`180`	`+ @Override`
	`181`	`+ public List<Recipe> getRecipeList() {`
	`182`	`+ return singletonList(new UpgradeDependencyVersion("com.squareup.okhttp3", "mockwebserver", "4.X",`
	`183`	`+ null, false, emptyList()));`
	`184`	`+ }`
`179`	`185`	`}`