Remove imports before adding imports to avoid conflicts

Following openrewrite/rewrite#5439 (comment)

Author: timtebeek

src/main/java/org/openrewrite/java/migrate/DontOverfetchDto.java

@@ -87,8 +87,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                                                 JavaType.FullyQualified memberType = TypeUtils.asFullyQualified(member.getType());
                                                 memberTypeAtomic.set(memberType);
                                                 if (memberType != null) {
-                                                    maybeAddImport(memberType);
                                                     maybeRemoveImport(dtoType);
+                                                    maybeAddImport(memberType);
                                                     return v
                                                             .withType(memberType)
                                                             .withTypeExpression(TypeTree.build(memberType.getFullyQualifiedName()))

src/main/java/org/openrewrite/java/migrate/guava/NoGuavaCreateTempDir.java

@@ -56,10 +56,10 @@ private static class NoGuavaTempDirVisitor extends JavaIsoVisitor<ExecutionConte
         @Override
         public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
             J.CompilationUnit c = super.visitCompilationUnit(cu, ctx);
+            maybeRemoveImport("com.google.common.io.Files");
             maybeAddImport("java.nio.file.Files");
             maybeAddImport("java.io.IOException");
             maybeAddImport("java.io.File");
-            maybeRemoveImport("com.google.common.io.Files");
             return c;
         }
 

src/main/java/org/openrewrite/java/migrate/guava/NoGuavaOptionalFromJavaUtil.java

@@ -57,8 +57,8 @@ private static class ReplaceFromJavaUtilVisitor extends JavaVisitor<ExecutionCon
         @Override
         public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
             J c = super.visitCompilationUnit(cu, ctx);
-            maybeAddImport("java.util.Optional");
             maybeRemoveImport("com.google.common.base.Optional");
+            maybeAddImport("java.util.Optional");
             return c;
         }
 

src/main/java/org/openrewrite/java/migrate/guava/NoGuavaOptionalToJavaUtil.java

@@ -57,8 +57,8 @@ private static class ReplaceToJavaUtilVisitor extends JavaVisitor<ExecutionConte
         @Override
         public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
             J c = super.visitCompilationUnit(cu, ctx);
-            maybeAddImport("java.util.Optional");
             maybeRemoveImport("com.google.common.base.Optional");
+            maybeAddImport("java.util.Optional");
             return c;
         }
 

src/main/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalOrElseNull.java

@@ -57,8 +57,8 @@ private static class PreferJavaUtilOptionalOrElseNullVisitor extends JavaIsoVisi
         @Override
         public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
             J.CompilationUnit c = super.visitCompilationUnit(cu, ctx);
-            maybeAddImport("java.util.Optional");
             maybeRemoveImport("com.google.common.base.Optional");
+            maybeAddImport("java.util.Optional");
             return c;
         }
 

src/main/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalOrSupplier.java

@@ -76,8 +76,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                                 method.getCoordinates().replace(),
                                 mi.getSelect(),
                                 mi.getArguments().get(0));
-                maybeAddImport("java.util.Optional");
                 maybeRemoveImport("com.google.common.base.Optional");
+                maybeAddImport("java.util.Optional");
             }
             return mi;
         }

src/main/java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java

@@ -68,9 +68,9 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
                 if (MATCHER.matches(m)) {
+                    maybeRemoveImport("java.util.logging.LogManager");
                     maybeAddImport("java.lang.management.ManagementFactory");
                     maybeAddImport("java.lang.management.PlatformLoggingMXBean");
-                    maybeRemoveImport("java.util.logging.LogManager");
                     m = JavaTemplate.builder("ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)")
                             .imports("java.lang.management.ManagementFactory")
                             .imports("java.lang.management.PlatformLoggingMXBean")

src/main/java/org/openrewrite/java/migrate/net/URLConstructorToURICreate.java

@@ -63,16 +63,13 @@ public J visitNewClass(J.NewClass nc, ExecutionContext ctx) {
                                 return nc;
                             }
 
-                            JavaTemplate template = JavaTemplate.builder("URI.create(#{any(String)}).toURL()")
+                            maybeRemoveImport(URL_FQN);
+                            maybeAddImport(URI_FQN);
+                            return JavaTemplate.builder("URI.create(#{any(String)}).toURL()")
                                     .imports(URI_FQN)
                                     .javaParser(JavaParser.fromJavaVersion())
-                                    .build();
-                            maybeAddImport(URI_FQN);
-                            maybeRemoveImport(URL_FQN);
-
-                            return template.apply(getCursor(),
-                                    nc.getCoordinates().replace(),
-                                    nc.getArguments().get(0));
+                                    .build()
+                                    .apply(getCursor(), nc.getCoordinates().replace(), nc.getArguments().get(0));
                         }
                         return super.visitNewClass(nc, ctx);
                     }