Reorder maybeRemoveImport before maybeAddImport (#6439)

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>

Author: timtebeek

rewrite-java-test/src/test/java/org/openrewrite/java/JavaTemplateTest.java

@@ -444,8 +444,8 @@ void replaceAnonymousClassObject() {
               @Override
               public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                   if ("asList".equals(method.getSimpleName())) {
-                      maybeAddImport("java.util.Collections");
                       maybeRemoveImport("java.util.Arrays");
+                      maybeAddImport("java.util.Collections");
 
                       return JavaTemplate.builder("Collections.singletonList(#{any()})")
                         .imports("java.util.Collections")
@@ -492,8 +492,8 @@ void replaceGenericTypedObject() {
               @Override
               public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                   if ("asList".equals(method.getSimpleName())) {
-                      maybeAddImport("java.util.Collections");
                       maybeRemoveImport("java.util.Arrays");
+                      maybeAddImport("java.util.Collections");
                       return JavaTemplate.builder("Collections.singletonList(#{any()})")
                         .imports("java.util.Collections")
                         .build()
@@ -541,8 +541,8 @@ void replaceParameterizedTypeObject() {
               @Override
               public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                   if ("asList".equals(method.getSimpleName())) {
-                      maybeAddImport("java.util.Collections");
                       maybeRemoveImport("java.util.Arrays");
+                      maybeAddImport("java.util.Collections");
                       return JavaTemplate.builder("Collections.singletonList(#{any()})")
                         .imports("java.util.Collections")
                         .build()
@@ -1192,8 +1192,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     Expression expected = args.getFirst();
                     Expression actual = args.get(1);
 
-                    maybeAddImport("org.assertj.core.api.Assertions", "assertThat");
                     maybeRemoveImport("org.junit.jupiter.api.Assertions");
+                    maybeAddImport("org.assertj.core.api.Assertions", "assertThat");
 
                     if (args.size() == 2) {
                         return JavaTemplate.builder("assertThat(#{any()}).isEqualTo(#{any()});")

rewrite-java/src/main/java/org/openrewrite/java/ChangeFieldType.java

@@ -43,8 +43,8 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
         J.VariableDeclarations mv = super.visitVariableDeclarations(multiVariable, p);
         if (typeAsClass != null && oldFullyQualifiedTypeName.equals(typeAsClass.getFullyQualifiedName())) {
 
-            maybeAddImport(newFieldType);
             maybeRemoveImport(typeAsClass);
+            maybeAddImport(newFieldType);
 
             mv = mv.withTypeExpression(mv.getTypeExpression() == null ?
                     null :

rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodInvocationReturnType.java

@@ -87,8 +87,8 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
                     JavaType newType = JavaType.buildType(newReturnType);
                     JavaType.FullyQualified newFieldType = TypeUtils.asFullyQualified(newType);
 
-                    maybeAddImport(newFieldType);
                     maybeRemoveImport(originalType);
+                    maybeAddImport(newFieldType);
 
                     mv = mv.withTypeExpression(mv.getTypeExpression() == null ?
                             null :