fix: Handle ImmutableOf as Select on MethodInvocation (#557)

* fix: Handle ImmutableOf as Select on MethodInvocation * Rename argument for clarity --------- Co-authored-by: Tim te Beek <tim@moderne.io>
openrewrite · Sep 18, 2024 · 53afa8a · 53afa8a
1 parent b5ab237
commit 53afa8a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 10 deletions.
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java b/src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java
@@ -68,7 +68,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(check, new JavaVisitor<ExecutionContext>() {
             @Override
             public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
-                if (IMMUTABLE_MATCHER.matches(method) && isParentTypeDownCast()) {
+                if (IMMUTABLE_MATCHER.matches(method) && isParentTypeDownCast(method)) {
                     maybeRemoveImport(guavaType);
                     maybeAddImport(javaType);
 
@@ -115,7 +115,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
                 return super.visitMethodInvocation(method, ctx);
             }
 
-            private boolean isParentTypeDownCast() {
+            private boolean isParentTypeDownCast(MethodCall immutableMethod) {
                 J parent = getCursor().dropParentUntil(J.class::isInstance).getValue();
                 boolean isParentTypeDownCast = false;
                 if (parent instanceof J.VariableDeclarations.NamedVariable) {
@@ -138,14 +138,8 @@ private boolean isParentTypeDownCast() {
                     }
                 } else if (parent instanceof J.MethodInvocation) {
                     J.MethodInvocation m = (J.MethodInvocation) parent;
-                    if (m.getMethodType() != null) {
-                        int index = 0;
-                        for (Expression argument : m.getArguments()) {
-                            if (IMMUTABLE_MATCHER.matches(argument)) {
-                                break;
-                            }
-                            index++;
-                        }
+                    int index = m.getArguments().indexOf(immutableMethod);
+                    if (m.getMethodType() != null && index != -1) {
                         isParentTypeDownCast = isParentTypeMatched(m.getMethodType().getParameterTypes().get(index));
                     }
                 } else if (parent instanceof J.NewClass) {

diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java
@@ -312,6 +312,41 @@ class Test {
         );
     }
 
+    @Test
+    void doNotChangeMethodInvocationWithSelect() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              import java.util.List;
+
+              public class A {
+                  Object[] list;
+                  public void method(Object[] list ) {
+                      this.list = list;
+                  }
+              }
+              """
+          ),
+          version(
+            //language=java
+            java(
+              """
+                import com.google.common.collect.ImmutableList;
+
+                class Test {
+                    void method() {
+                        A a = new A();
+                        a.method(ImmutableList.of().toArray());
+                    }
+                }
+                """
+            ),
+            11
+          )
+        );
+    }
+
     @Test
     void methodInvocationWithListArgument() {
         //language=java