IsEmptyCallOnCollections: Remove context-sensitive template

openrewrite · Mar 7, 2024 · 5319d0d · 5319d0d
1 parent c6e7a0f
commit 5319d0d
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/src/main/java/org/openrewrite/staticanalysis/IsEmptyCallOnCollections.java b/src/main/java/org/openrewrite/staticanalysis/IsEmptyCallOnCollections.java
@@ -25,10 +25,12 @@
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaCoordinates;
 
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Set;
 
 public class IsEmptyCallOnCollections extends Recipe {
@@ -57,11 +59,6 @@ public Duration getEstimatedEffortPerOccurrence() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(new UsesMethod<>(COLLECTION_SIZE), new JavaVisitor<ExecutionContext>() {
-            final JavaTemplate isEmpty = JavaTemplate.builder("#{}#{any(java.util.Collection)}.isEmpty()")
-                    .build();
-            final JavaTemplate isEmptyNoReceiver = JavaTemplate.builder("#{}isEmpty()")
-                    .contextSensitive()
-                    .build();
 
             @Override
             public J visitBinary(J.Binary binary, ExecutionContext ctx) {
@@ -73,17 +70,13 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) {
                         J maybeSizeCall = zeroRight ? binary.getLeft() : binary.getRight();
                         if (maybeSizeCall instanceof J.MethodInvocation) {
                             J.MethodInvocation maybeSizeCallMethod = (J.MethodInvocation) maybeSizeCall;
-                            if (COLLECTION_SIZE.matches(maybeSizeCallMethod)) {
-                                String op = binary.getOperator() == J.Binary.Type.Equal ? "" : "!";
-                                return (maybeSizeCallMethod.getSelect() == null ?
-                                        isEmptyNoReceiver.apply(getCursor(), binary.getCoordinates().replace(), op) :
-                                        isEmpty.apply(getCursor(), binary.getCoordinates().replace(), op, maybeSizeCallMethod.getSelect())
-                                ).withPrefix(binary.getPrefix());
+                            if (COLLECTION_SIZE.matches(maybeSizeCallMethod) && maybeSizeCallMethod.getMethodType() != null) {
+                                return newIsEmptyCall(maybeSizeCallMethod, binary.getCoordinates().replace(), binary.getOperator() != J.Binary.Type.Equal)
+                                        .withPrefix(binary.getPrefix());
                             }
                         }
                     }
-                }
-                if (isOne(binary.getLeft()) || isOne(binary.getRight())) {
+                } else if (isOne(binary.getLeft()) || isOne(binary.getRight())) {
                     boolean oneRight = isOne(binary.getRight());
                     if ((oneRight && binary.getOperator() == J.Binary.Type.LessThan)
                         || (!oneRight && binary.getOperator() == J.Binary.Type.GreaterThan)
@@ -92,30 +85,39 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) {
                         J maybeSizeCall = oneRight ? binary.getLeft() : binary.getRight();
                         if (maybeSizeCall instanceof J.MethodInvocation) {
                             J.MethodInvocation maybeSizeCallMethod = (J.MethodInvocation) maybeSizeCall;
-                            if (COLLECTION_SIZE.matches(maybeSizeCallMethod)) {
-                                String op = "";
-                                if (binary.getOperator() == J.Binary.Type.GreaterThanOrEqual || binary.getOperator() == J.Binary.Type.LessThanOrEqual) {
-                                    op = "!";
-                                }
-                                return (maybeSizeCallMethod.getSelect() == null ?
-                                        isEmptyNoReceiver.apply(getCursor(), binary.getCoordinates().replace(), op) :
-                                        isEmpty.apply(getCursor(), binary.getCoordinates().replace(), op, maybeSizeCallMethod.getSelect())
-                                ).withPrefix(binary.getPrefix());
+                            if (COLLECTION_SIZE.matches(maybeSizeCallMethod) && maybeSizeCallMethod.getMethodType() != null) {
+                                return newIsEmptyCall(maybeSizeCallMethod, binary.getCoordinates().replace(),
+                                        binary.getOperator() == J.Binary.Type.GreaterThanOrEqual || binary.getOperator() == J.Binary.Type.LessThanOrEqual)
+                                        .withPrefix(binary.getPrefix());
                             }
                         }
                     }
                 }
                 return super.visitBinary(binary, ctx);
             }
+
+            private J newIsEmptyCall(J.MethodInvocation method, JavaCoordinates coordinates, boolean negate) {
+                JavaTemplate isEmpty = JavaTemplate.builder("#{}#{any(java.util.Collection)}.isEmpty()").build();
+                if (method.getSelect() == null) {
+                    assert method.getMethodType() != null;
+                    J.Identifier this_ = JavaElementFactory.newThis(method.getMethodType().getDeclaringType());
+                    J isEmptyCall = isEmpty.apply(getCursor(), coordinates, negate ? "!" : "", this_);
+                    if (negate) {
+                        return ((J.Unary) isEmptyCall).withExpression(((J.MethodInvocation) ((J.Unary) isEmptyCall).getExpression()).withSelect(null));
+                    }
+                    return ((J.MethodInvocation) isEmptyCall).withSelect(null);
+                }
+                return isEmpty.apply(getCursor(), coordinates, negate ? "!" : "", method.getSelect());
+            }
         });
     }
 
     private static boolean isZero(Expression expression) {
-        return expression instanceof J.Literal && Integer.valueOf(0).equals(((J.Literal) expression).getValue());
+        return expression instanceof J.Literal && Objects.equals(0, ((J.Literal) expression).getValue());
     }
 
     private static boolean isOne(Expression expression) {
-        return expression instanceof J.Literal && Integer.valueOf(1).equals(((J.Literal) expression).getValue());
+        return expression instanceof J.Literal && Objects.equals(1, ((J.Literal) expression).getValue());
     }
 
 }