Don't use static import on collision with local method (#3729)

If a class declares a method with the same name as a candidate for a static import, then that will always lead to compile errors if the static import is applied. Therefore the recipe must check for not having any similarly named method locally.
openrewrite · Nov 22, 2023 · aa84b61 · aa84b61
1 parent d9ea65b
commit aa84b61
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/UseStaticImportTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/UseStaticImportTest.java
@@ -93,6 +93,29 @@ public void methodWithTypeParameter() {
           )
         );
     }
+
+    @Test
+    void sameMethodLocallyNoStaticImport() {
+        rewriteRun(
+          spec -> spec.recipe(new UseStaticImport("java.util.Collections emptyList()")),
+          java(
+            """
+            import java.util.Collections;
+            import java.util.List;
+
+            public class SameMethodNameLocally {
+                public void avoidCollision() {
+                    List<Object> list = Collections.emptyList();
+                }
+                
+                private int emptyList(String canHaveDifferentArguments) {
+                }
+            }
+            """
+          )
+        );
+    }
+
     @Test
     void methodInvocationsHavingNullSelect() {
         rewriteRun(

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/UseStaticImport.java b/rewrite-java/src/main/java/org/openrewrite/java/UseStaticImport.java
@@ -18,6 +18,7 @@
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import org.openrewrite.*;
+import org.openrewrite.java.search.DeclaresMethod;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaType;
@@ -50,7 +51,10 @@ public String getDescription() {
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return Preconditions.check(new UsesMethod<>(methodPattern), new UseStaticImportVisitor());
+        int indexSpace = methodPattern.indexOf(' ');
+        int indexBrace = methodPattern.indexOf('(', indexSpace);
+        String identicalMethodName = "* " + methodPattern.substring(indexSpace, indexBrace) + "(..)";
+        return Preconditions.check(Preconditions.and(new UsesMethod<>(methodPattern), Preconditions.not(new DeclaresMethod<>(identicalMethodName))), new UseStaticImportVisitor());
     }
 
     private class UseStaticImportVisitor extends JavaIsoVisitor<ExecutionContext> {