From b3784f38d7b61b3284f5a9626d7968ed3dac7b03 Mon Sep 17 00:00:00 2001
From: Jonathan Schneider <jkschneider@gmail.com>
Date: Sat, 19 Sep 2020 08:08:27 -0700
Subject: [PATCH] Determinism in JavaType.Class.build

---
 .../openrewrite/java/Java11ParserDebugTest.kt | 24 ++++++++++
 .../org/openrewrite/java/tree/JavaType.java   | 45 ++++++++++++++++---
 .../openrewrite/java/tree/TreeBuilder.java    | 17 +------
 3 files changed, 63 insertions(+), 23 deletions(-)
 create mode 100644 rewrite-java-11/src/test/kotlin/org/openrewrite/java/Java11ParserDebugTest.kt

diff --git a/rewrite-java-11/src/test/kotlin/org/openrewrite/java/Java11ParserDebugTest.kt b/rewrite-java-11/src/test/kotlin/org/openrewrite/java/Java11ParserDebugTest.kt
new file mode 100644
index 00000000000..6759557cecb
--- /dev/null
+++ b/rewrite-java-11/src/test/kotlin/org/openrewrite/java/Java11ParserDebugTest.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.extension.ExtendWith
+import org.openrewrite.DebugOnly
+import org.openrewrite.java.tree.JavaTypeTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java11JavaTypeTest: Java11Test(), JavaTypeTest
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
index 1bc3232fe43..1d2b55e35f6 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
@@ -52,7 +52,7 @@ public interface JavaType extends Serializable {
      */
     static JavaType buildType(String typeName) {
         JavaType.Primitive primitive = JavaType.Primitive.fromKeyword(typeName);
-        if(primitive != null) {
+        if (primitive != null) {
             return primitive;
         } else {
             return JavaType.Class.build(typeName);
@@ -132,6 +132,11 @@ public boolean deepEquals(JavaType type) {
             return type instanceof ShallowClass &&
                     fullyQualifiedName.equals(((ShallowClass) type).fullyQualifiedName);
         }
+
+        @Override
+        public String toString() {
+            return "ShallowClass{" +  + '}';
+        }
     }
 
     @Getter
@@ -206,12 +211,28 @@ public static Class build(String fullyQualifiedName,
 
             synchronized (flyweights) {
                 Set<JavaType.Class> variants = flyweights.computeIfAbsent(fullyQualifiedName, fqn -> HashObjSets.newMutableSet());
-                return (!relaxedClassTypeMatching ? variants.stream().filter(v -> v.deepEquals(test)) : variants.stream())
-                        .findAny()
-                        .orElseGet(() -> {
-                            variants.add(test);
-                            return test;
-                        });
+
+                if (relaxedClassTypeMatching) {
+                    return variants.stream()
+                            .findFirst()
+                            .orElseGet(() -> {
+                                variants.add(test);
+                                return test;
+                            });
+                } else {
+                    return variants.stream().filter(v -> v.deepEquals(test))
+                            .findFirst()
+                            .orElseGet(() -> {
+                                if (test.supertype == null) {
+                                    return variants.stream().findFirst().orElseGet(() -> {
+                                        variants.add(test);
+                                        return test;
+                                    });
+                                }
+                                variants.add(test);
+                                return test;
+                            });
+                }
             }
         }
 
@@ -278,6 +299,11 @@ public boolean deepEquals(@Nullable JavaType type) {
                     TypeUtils.deepEquals(supertype, c.supertype) &&
                     TypeUtils.deepEquals(typeParameters, c.typeParameters);
         }
+
+        @Override
+        public String toString() {
+            return "Class{" + fullyQualifiedName + '}';
+        }
     }
 
     @EqualsAndHashCode(callSuper = false)
@@ -289,6 +315,11 @@ class Cyclic extends FullyQualified {
         public boolean deepEquals(JavaType type) {
             return this.equals(type);
         }
+
+        @Override
+        public String toString() {
+            return "Cyclic{" + fullyQualifiedName + '}';
+        }
     }
 
     @Data
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/TreeBuilder.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/TreeBuilder.java
index 215eeae02a6..d9240b68d43 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/TreeBuilder.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/TreeBuilder.java
@@ -123,24 +123,9 @@ public J buildDeclaration(J.ClassDecl insertionScope, String snippet, JavaType..
                 .map(it -> (JavaType.Class) it)
                 .toArray(JavaType.Class[]::new);
 
-        JavaType.FullyQualified[] genericTypes = Stream.concat(
-                stream(types)
-                        .filter(it -> it instanceof JavaType.GenericTypeVariable),
-                stream(imports)
-                        .filter(it -> it.getTypeParameters().size() > 0)
-                        .flatMap(it -> it.getTypeParameters().stream()))
-                .map(it -> (JavaType.FullyQualified) it)
-                .toArray(JavaType.FullyQualified[]::new);
-        String typeParameters = "";
-        if (genericTypes.length > 0) {
-            typeParameters = "<" + stream(genericTypes)
-                    .map(JavaType.FullyQualified::getFullyQualifiedName)
-                    .collect(joining(", ", "", "")) + ">";
-        }
-
         String source = stream(imports)
                 .map(i -> "import " + i.getFullyQualifiedName() + ";").collect(joining("\n", "", "\n\n")) +
-                "class CodeSnippet" + typeParameters + " {\n" +
+                "class CodeSnippet {\n" +
                 scopeVariables +
                 StringUtils.trimIndent(snippet) + "\n" +
                 "}";