Reorder maybeRemoveImport before maybeAddImport (#873)

timtebeek · TeamModerne · web-flow · commit 9803871935a5 · 2025-12-15T15:16:19.000+01:00
* Reorder `maybeRemoveImport` before `maybeAddImport` Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.recipes.RemoveImportBeforeAddImport?organizationId=QUxML01vZGVybmUvTW9kZXJuZSArIE9wZW5SZXdyaXRl Co-authored-by: Moderne <team@moderne.io> * Updated expectations after removing imports before addition --------- Co-authored-by: Moderne <team@moderne.io>
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java
@@ -57,8 +57,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return md;
                 }
 
-                maybeAddImport(ASSERTJ, "assertThat", false);
                 maybeRemoveImport(JUNIT);
+                maybeAddImport(ASSERTJ, "assertThat", false);
 
                 List<Expression> args = md.getArguments();
                 Expression expected = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java
@@ -57,8 +57,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport(ASSERTJ, "assertThat", false);
                 maybeRemoveImport(JUNIT);
+                maybeAddImport(ASSERTJ, "assertThat", false);
 
                 List<Expression> args = mi.getArguments();
                 Expression expected = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThat.java
@@ -53,8 +53,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
                 maybeRemoveImport("org.junit.jupiter.api.Assertions");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 List<Expression> args = mi.getArguments();
                 Expression actual = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThat.java
@@ -51,8 +51,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
                 maybeRemoveImport("org.junit.jupiter.api.Assertions");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 Expression expected = mi.getArguments().get(0);
                 Expression actual = mi.getArguments().get(1);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java
@@ -57,8 +57,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport(ASSERTJ, "assertThat", false);
                 maybeRemoveImport(JUNIT);
+                maybeAddImport(ASSERTJ, "assertThat", false);
 
                 List<Expression> args = mi.getArguments();
                 Expression expected = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThat.java
@@ -53,8 +53,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
                 maybeRemoveImport("org.junit.jupiter.api.Assertions");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 List<Expression> args = mi.getArguments();
                 Expression actual = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThat.java
@@ -53,8 +53,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
                 maybeRemoveImport("org.junit.jupiter.api.Assertions");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 List<Expression> args = mi.getArguments();
                 Expression actual = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThat.java
@@ -53,8 +53,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
                 maybeRemoveImport("org.junit.jupiter.api.Assertions");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 List<Expression> args = mi.getArguments();
                 Expression expected = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionType.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionType.java
@@ -65,9 +65,9 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
 
                 boolean returnActual = hasReturnType.get();
 
-                maybeAddImport(ASSERTIONS_FOR_CLASS_TYPES, "assertThatExceptionOfType");
-                maybeRemoveImport(JUNIT_ASSERTIONS + ".assertThrows");
                 maybeRemoveImport(JUNIT_ASSERTIONS);
+                maybeRemoveImport(JUNIT_ASSERTIONS + ".assertThrows");
+                maybeAddImport(ASSERTIONS_FOR_CLASS_TYPES, "assertThatExceptionOfType");
 
                 List<Expression> args = mi.getArguments();
 
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThat.java
@@ -53,8 +53,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return mi;
                 }
 
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
                 maybeRemoveImport("org.junit.jupiter.api.Assertions");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 List<Expression> args = mi.getArguments();
                 Expression actual = args.get(0);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java
@@ -99,8 +99,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                         return mi;
                     }
 
-                    maybeAddImport(ASSERTJ, "fail", false);
                     maybeRemoveImport(JUNIT + ".fail");
+                    maybeAddImport(ASSERTJ, "fail", false);
 
                     List<Expression> arguments = mi.getArguments();
                     String anyArgs = String.join(",", nCopies(arguments.size(), "#{any()}"));
diff --git a/src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java b/src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java
@@ -301,8 +301,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl
                 md = md.withBody(residualMd.getBody().withStatements(mdStatements));
             }
 
-            maybeAddImport(MOCKITO_ALL_IMPORT.replace(".*", ""), "*", false);
             maybeRemoveImport(JMOCKIT_MOCK_IMPORT);
+            maybeAddImport(MOCKITO_ALL_IMPORT.replace(".*", ""), "*", false);
             maybeRemoveImport(JMOCKIT_MOCKUP_IMPORT);
 
             doAfterVisit(new LambdaBlockToExpression().getVisitor());
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AddParameterizedTestAnnotation.java b/src/main/java/org/openrewrite/java/testing/junit5/AddParameterizedTestAnnotation.java
@@ -79,10 +79,10 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration md, Execut
                     .imports("org.junit.jupiter.params.ParameterizedTest")
                     .build()
                     .apply(getCursor(), coordinates);
-            maybeAddImport("org.junit.jupiter.params.ParameterizedTest");
+            maybeRemoveImport("org.junit.jupiter.api.Test");
 
             // Remove @Test annotation if present
-            maybeRemoveImport("org.junit.jupiter.api.Test");
+            maybeAddImport("org.junit.jupiter.params.ParameterizedTest");
             return new RemoveAnnotationVisitor(TEST_ANNOTATION_MATCHER).visitMethodDeclaration(m, ctx);
         }
     }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AssertToAssertions.java b/src/main/java/org/openrewrite/java/testing/junit5/AssertToAssertions.java
@@ -63,8 +63,8 @@ public static class AssertToAssertionsVisitor extends JavaIsoVisitor<ExecutionCo
                     }
                 }
                 if (hasWildcardAssertImport) {
-                    maybeAddImport("org.junit.jupiter.api.Assertions", "*", false);
                     maybeRemoveImport("org.junit.Assert.*");
+                    maybeAddImport("org.junit.jupiter.api.Assertions", "*", false);
                 }
             }
             return tree;
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/RunnerToExtension.java b/src/main/java/org/openrewrite/java/testing/junit5/RunnerToExtension.java
@@ -102,8 +102,8 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                                 extensionType.getClassName()
                         );
                         maybeAddImport("org.junit.jupiter.api.extension.ExtendWith");
-                        maybeAddImport(extension);
                         maybeRemoveImport("org.junit.runner.RunWith");
+                        maybeAddImport(extension);
                         maybeRemoveImport(runner);
                     }
                 }
@@ -123,8 +123,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                                 extensionType.getClassName()
                         );
                         maybeAddImport("org.junit.jupiter.api.extension.ExtendWith");
-                        maybeAddImport(extension);
                         maybeRemoveImport("org.junit.runner.RunWith");
+                        maybeAddImport(extension);
                         maybeRemoveImport(runner);
                     }
                 }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java b/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java
@@ -74,8 +74,8 @@ public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
                     .visit(c, ctx);
             maybeAddImport("java.io.File");
             maybeAddImport("java.nio.file.Files");
-            maybeAddImport("org.junit.jupiter.api.io.TempDir");
             maybeRemoveImport("org.junit.ClassRule");
+            maybeAddImport("org.junit.jupiter.api.io.TempDir");
             maybeRemoveImport("org.junit.Rule");
             maybeRemoveImport("org.junit.rules.TemporaryFolder");
         }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UseTestMethodOrder.java b/src/main/java/org/openrewrite/java/testing/junit5/UseTestMethodOrder.java
@@ -52,8 +52,8 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                 Set<J.Annotation> methodOrders = FindAnnotations.find(cd.withBody(null), "@org.junit.FixMethodOrder");
 
                 if (!methodOrders.isEmpty()) {
-                    maybeAddImport("org.junit.jupiter.api.TestMethodOrder");
                     maybeRemoveImport("org.junit.FixMethodOrder");
+                    maybeAddImport("org.junit.jupiter.api.TestMethodOrder");
                     maybeRemoveImport("org.junit.runners.MethodSorters");
 
                     cd = JavaTemplate.builder("@TestMethodOrder(MethodName.class)")
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/AnyStringToNullable.java b/src/main/java/org/openrewrite/java/testing/mockito/AnyStringToNullable.java
@@ -56,8 +56,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
                 if (ANY_STRING.matches(mi)) {
-                    maybeAddImport("org.mockito.ArgumentMatchers", "nullable", false);
                     maybeRemoveImport("org.mockito.Mockito.anyString");
+                    maybeAddImport("org.mockito.ArgumentMatchers", "nullable", false);
                     return JavaTemplate.builder("nullable(String.class)")
                             .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "mockito-core-3.12"))
                             .staticImports("org.mockito.ArgumentMatchers.nullable")
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/RemoveTimesZeroAndOne.java b/src/main/java/org/openrewrite/java/testing/mockito/RemoveTimesZeroAndOne.java
@@ -54,8 +54,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                     public J.@Nullable MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                         J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
                         if (timesMatcher.matches(mi) && J.Literal.isLiteralValue(mi.getArguments().get(0), 0)) {
-                            maybeAddImport("org.mockito.Mockito", "never");
                             maybeRemoveImport("org.mockito.Mockito.times");
+                            maybeAddImport("org.mockito.Mockito", "never");
                             return JavaTemplate.builder("never()")
                                     .staticImports("org.mockito.Mockito.never")
                                     .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "mockito-core"))
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/VerifyZeroToNoMoreInteractions.java b/src/main/java/org/openrewrite/java/testing/mockito/VerifyZeroToNoMoreInteractions.java
@@ -72,8 +72,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                             return md;
                         }
 
-                        maybeAddImport("org.mockito.Mockito", "verifyNoMoreInteractions");
                         maybeRemoveImport("org.mockito.Mockito.verifyZeroInteractions");
+                        maybeAddImport("org.mockito.Mockito", "verifyNoMoreInteractions");
 
                         ChangeMethodName changeMethodName = new ChangeMethodName(VERIFY_ZERO_INTERACTIONS, "verifyNoMoreInteractions", false, false);
                         return (J.MethodInvocation) changeMethodName.getVisitor().visitNonNull(md, ctx);
diff --git a/src/main/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsToAssertThat.java
@@ -59,10 +59,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 Expression actual = args.get(0);
 
                 //always add the import (even if not referenced)
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
+                maybeRemoveImport("org.testng.Assert");
 
                 // Remove import for "org.testng.Assert" if no longer used.
-                maybeRemoveImport("org.testng.Assert");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 if (args.size() == 2) {
                     return JavaTemplate.builder("assertThat(#{any()}).isEqualTo(#{any()});")
diff --git a/src/main/java/org/openrewrite/java/testing/testng/TestNgAssertNotEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/testng/TestNgAssertNotEqualsToAssertThat.java
@@ -119,10 +119,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 }
 
                 //Make sure there is a static import for "org.assertj.core.api.Assertions.assertThat" (even if not referenced)
-                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
+                maybeRemoveImport("org.testng.Assert");
 
                 // Remove import for "org.testng.Assert" if no longer used.
-                maybeRemoveImport("org.testng.Assert");
+                maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
 
                 return method;
             }
diff --git a/src/test/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionTypeTest.java b/src/test/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionTypeTest.java
@@ -78,10 +78,11 @@ void memberReference() {
         rewriteRun(
           java(
             """
-              import static org.junit.jupiter.api.Assertions.assertThrows;
               import java.util.concurrent.CompletableFuture;
               import java.util.concurrent.ExecutionException;
 
+              import static org.junit.jupiter.api.Assertions.assertThrows;
+
               public class MemberReferenceTest {
 
                   public void throwsWithMemberReference() {
@@ -91,10 +92,11 @@ public void throwsWithMemberReference() {
               }
               """,
             """
-              import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
               import java.util.concurrent.CompletableFuture;
               import java.util.concurrent.ExecutionException;
 
+              import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
+
               public class MemberReferenceTest {
 
                   public void throwsWithMemberReference() {
@@ -335,10 +337,11 @@ void withMemberReference(String message) {
             rewriteRun(
               java(
                       """
-                  import static org.junit.jupiter.api.Assertions.assertThrows;
                   import java.util.concurrent.CompletableFuture;
                   import java.util.concurrent.ExecutionException;
 
+                  import static org.junit.jupiter.api.Assertions.assertThrows;
+
                   public class SimpleExpectedExceptionTest {
                       public void throwsExceptionWithSpecificType() {
                           CompletableFuture<Boolean> future = new CompletableFuture<>();
@@ -347,10 +350,11 @@ public void throwsExceptionWithSpecificType() {
                   }
                   """.formatted(message),
                       """
-                  import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
                   import java.util.concurrent.CompletableFuture;
                   import java.util.concurrent.ExecutionException;
 
+                  import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
+
                   public class SimpleExpectedExceptionTest {
                       public void throwsExceptionWithSpecificType() {
                           CompletableFuture<Boolean> future = new CompletableFuture<>();
diff --git a/src/test/java/org/openrewrite/java/testing/mockito/VerifyZeroToNoMoreInteractionsTest.java b/src/test/java/org/openrewrite/java/testing/mockito/VerifyZeroToNoMoreInteractionsTest.java
@@ -107,8 +107,8 @@ void doesNotConvertAnyOtherMethods() {
             """
               import org.mockito.junit.jupiter.MockitoExtension;
               import org.mockito.Mock;
-              import static org.mockito.Mockito.verifyZeroInteractions;
               import static org.mockito.Mockito.verify;
+              import static org.mockito.Mockito.verifyZeroInteractions;
 
               class MyTest {
                   @Mock
@@ -123,8 +123,8 @@ void test() {
             """
               import org.mockito.junit.jupiter.MockitoExtension;
               import org.mockito.Mock;
-              import static org.mockito.Mockito.verifyNoMoreInteractions;
               import static org.mockito.Mockito.verify;
+              import static org.mockito.Mockito.verifyNoMoreInteractions;
 
               class MyTest {
                   @Mock

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu`
`57`	`57`	`return md;`
`58`	`58`	`}`
`59`	`59`
`60`		`- maybeAddImport(ASSERTJ, "assertThat", false);`
`61`	`60`	`maybeRemoveImport(JUNIT);`
	`61`	`+ maybeAddImport(ASSERTJ, "assertThat", false);`
`62`	`62`
`63`	`63`	`List<Expression> args = md.getArguments();`
`64`	`64`	`Expression expected = args.get(0);`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu`
`53`	`53`	`return mi;`
`54`	`54`	`}`
`55`	`55`
`56`		`- maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);`
`57`	`56`	`maybeRemoveImport("org.junit.jupiter.api.Assertions");`
	`57`	`+ maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);`
`58`	`58`
`59`	`59`	`List<Expression> args = mi.getArguments();`
`60`	`60`	`Expression actual = args.get(0);`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu`
`51`	`51`	`return mi;`
`52`	`52`	`}`
`53`	`53`
`54`		`- maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);`
`55`	`54`	`maybeRemoveImport("org.junit.jupiter.api.Assertions");`
	`55`	`+ maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);`
`56`	`56`
`57`	`57`	`Expression expected = mi.getArguments().get(0);`
`58`	`58`	`Expression actual = mi.getArguments().get(1);`