Fix ReloadableJavaXyTypeSignatureBuilder

The change in the recent PR #4427 was a bit overly cautious. We should be able to use `?` as the name in the signature for all captured types.
openrewrite · Aug 23, 2024 · be820fb · be820fb
1 parent 1b487f5
commit be820fb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 28 deletions.
diff --git a/...-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11TypeSignatureBuilder.java b/...-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11TypeSignatureBuilder.java
@@ -15,7 +15,6 @@
  */
 package org.openrewrite.java.isolated;
 
-import com.sun.tools.javac.code.BoundKind;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.TypeTag;
@@ -141,12 +140,7 @@ public String classSignature(Object type) {
     @Override
     public String genericSignature(Object type) {
         Type.TypeVar generic = (Type.TypeVar) type;
-        String name;
-        if (generic instanceof Type.CapturedType && ((Type.CapturedType) generic).wildcard.kind == BoundKind.UNBOUND) {
-            name = "?";
-        } else {
-            name = generic.tsym.name.toString();
-        }
+        String name = generic instanceof Type.CapturedType ? "?" : generic.tsym.name.toString();
 
         if (typeVariableNameStack == null) {
             typeVariableNameStack = new HashSet<>();

diff --git a/...-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeSignatureBuilder.java b/...-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeSignatureBuilder.java
@@ -15,7 +15,6 @@
  */
 package org.openrewrite.java.isolated;
 
-import com.sun.tools.javac.code.BoundKind;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.TypeTag;
@@ -141,12 +140,7 @@ public String classSignature(Object type) {
     @Override
     public String genericSignature(Object type) {
         Type.TypeVar generic = (Type.TypeVar) type;
-        String name;
-        if (generic instanceof Type.CapturedType && ((Type.CapturedType) generic).wildcard.kind == BoundKind.UNBOUND) {
-            name = "?";
-        } else {
-            name = generic.tsym.name.toString();
-        }
+        String name = generic instanceof Type.CapturedType ? "?" : generic.tsym.name.toString();
 
         if (typeVariableNameStack == null) {
             typeVariableNameStack = new HashSet<>();

diff --git a/...-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeSignatureBuilder.java b/...-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeSignatureBuilder.java
@@ -15,7 +15,6 @@
  */
 package org.openrewrite.java.isolated;
 
-import com.sun.tools.javac.code.BoundKind;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.TypeTag;
@@ -141,12 +140,7 @@ public String classSignature(Object type) {
     @Override
     public String genericSignature(Object type) {
         Type.TypeVar generic = (Type.TypeVar) type;
-        String name;
-        if (generic instanceof Type.CapturedType && ((Type.CapturedType) generic).wildcard.kind == BoundKind.UNBOUND) {
-            name = "?";
-        } else {
-            name = generic.tsym.name.toString();
-        }
+        String name = generic instanceof Type.CapturedType ? "?" : generic.tsym.name.toString();
 
         if (typeVariableNameStack == null) {
             typeVariableNameStack = new HashSet<>();

diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeSignatureBuilder.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeSignatureBuilder.java
@@ -15,7 +15,6 @@
  */
 package org.openrewrite.java;
 
-import com.sun.tools.javac.code.BoundKind;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.TypeTag;
@@ -140,12 +139,7 @@ public String classSignature(Object type) {
     @Override
     public String genericSignature(Object type) {
         Type.TypeVar generic = (Type.TypeVar) type;
-        String name;
-        if (generic instanceof Type.CapturedType && ((Type.CapturedType) generic).wildcard.kind == BoundKind.UNBOUND) {
-            name = "?";
-        } else {
-            name = generic.tsym.name.toString();
-        }
+        String name = generic instanceof Type.CapturedType ? "?" : generic.tsym.name.toString();
 
         if (typeVariableNameStack == null) {
             typeVariableNameStack = new HashSet<>();