Allow J.Empty type parameters in SemanticallyEqual (openrewrite#4266)

timtebeek · web-flow · commit a49c4d068d8b · 2024-06-17T18:37:42.000+02:00
* Allow J.Empty type parameters in SemanticallyEqual

* Expand tests for generics just to show type is checked
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/search/SemanticallyEqualTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/search/SemanticallyEqualTest.java
@@ -17,6 +17,7 @@
 
 import org.intellij.lang.annotations.Language;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Nested;
 import org.junitpioneer.jupiter.ExpectedToFail;
 import org.junitpioneer.jupiter.cartesian.CartesianTest;
 import org.openrewrite.java.JavaIsoVisitor;
@@ -298,6 +299,61 @@ class T {
         );
     }
 
+    @Nested
+    class Generics {
+        @Test
+        void firstEmpty() {
+            assertExpressionsEqual(
+              """
+                import java.util.List;
+                class T {
+                    List<String> a = new java.util.ArrayList<String>();
+                    List<String> b = new java.util.ArrayList<>();
+                }
+                """
+            );
+        }
+
+        @Test
+        void secondEmpty() {
+            assertExpressionsEqual(
+              """
+                import java.util.List;
+                class T {
+                    List<String> a = new java.util.ArrayList<>();
+                    List<String> b = new java.util.ArrayList<String>();
+                }
+                """
+            );
+        }
+
+        @Test
+        void bothEmpty() {
+            assertExpressionsEqual(
+              """
+                import java.util.List;
+                class T {
+                    List<String> a = new java.util.ArrayList<>();
+                    List<String> b = new java.util.ArrayList<>();
+                }
+                """
+            );
+        }
+
+        @Test
+        void bothEmptyButDifferent() {
+            assertExpressionsNotEqual(
+              """
+                import java.util.List;
+                class T {
+                    List<String> a = new java.util.ArrayList<>();
+                    List<Integer> b = new java.util.ArrayList<>();
+                }
+                """
+            );
+        }
+    }
+
     private void assertEqualToSelf(@Language("java") String a) {
         assertEqual(a, a);
     }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/search/SemanticallyEqual.java b/rewrite-java/src/main/java/org/openrewrite/java/search/SemanticallyEqual.java
@@ -1088,7 +1088,9 @@ public J.ParameterizedType visitParameterizedType(J.ParameterizedType type, J j)
                     return type;
                 }
 
-                this.visitList(type.getTypeParameters(), compareTo.getTypeParameters());
+                if (!(type.getTypeParameters().get(0) instanceof J.Empty || compareTo.getTypeParameters().get(0) instanceof J.Empty)) {
+                    this.visitList(type.getTypeParameters(), compareTo.getTypeParameters());
+                }
             }
             return type;
         }

Original file line number	Diff line number	Diff line change
`@@ -1088,7 +1088,9 @@ public J.ParameterizedType visitParameterizedType(J.ParameterizedType type, J j)`
`1088`	`1088`	`return type;`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`		`- this.visitList(type.getTypeParameters(), compareTo.getTypeParameters());`
	`1091`	`+ if (!(type.getTypeParameters().get(0) instanceof J.Empty \|\| compareTo.getTypeParameters().get(0) instanceof J.Empty)) {`
	`1092`	`+ this.visitList(type.getTypeParameters(), compareTo.getTypeParameters());`
	`1093`	`+ }`
`1092`	`1094`	`}`
`1093`	`1095`	`return type;`
`1094`	`1096`	`}`