Only remove imports when method select changes (#6277)

Author: timtebeek

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

@@ -19,6 +19,7 @@
 import org.openrewrite.DocumentExample;
 import org.openrewrite.Issue;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
 
 import static org.openrewrite.java.Assertions.java;
 
@@ -426,4 +427,36 @@ void sample() {
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/6275")
+    @Test
+    void shouldNotRemoveUsedStaticImport() {
+        rewriteRun(
+          spec -> spec.recipe(new UseStaticImport("java.util.Collections *(..)"))
+            .typeValidationOptions(TypeValidation.all().identifiers(false).methodInvocations(false)),
+          java(
+            """
+              import java.util.Collections;
+              import java.util.Set;
+
+              class Test extends TypeNotFound {
+                  void test() {
+                      Set<String> set = Collections.unmodifiableSet(newHashSetFromSuperType());
+                  }
+              }
+              """,
+            """
+              import java.util.Set;
+
+              import static java.util.Collections.unmodifiableSet;
+
+              class Test extends TypeNotFound {
+                  void test() {
+                      Set<String> set = unmodifiableSet(newHashSetFromSuperType());
+                  }
+              }
+              """
+          )
+        );
+    }
 }

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

@@ -88,11 +88,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     return m;
                 }
 
-                JavaType.FullyQualified receiverType = m.getMethodType().getDeclaringType();
-                maybeRemoveImport(receiverType);
-                maybeAddImport(receiverType.getFullyQualifiedName(), m.getSimpleName(), false);
-
                 if (m.getSelect() != null) {
+                    JavaType.FullyQualified receiverType = m.getMethodType().getDeclaringType();
+                    maybeRemoveImport(receiverType);
+                    maybeAddImport(receiverType.getFullyQualifiedName(), m.getSimpleName(), false);
                     return m.withSelect(null).withName(m.getName().withPrefix(m.getSelect().getPrefix()));
                 }
             }