Unified representation of non-generic types to always represent non-g…

…eneric types as explicitly non-generic.
raphw · Oct 13, 2015 · 12a4266 · 12a4266
1 parent f230533
commit 12a4266
Show file tree

Hide file tree

Showing 6 changed files with 272 additions and 340 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java
@@ -708,7 +708,7 @@ public ParameterList<ParameterDescription.InDefinedShape> getParameters() {
 
         @Override
         public GenericTypeList getExceptionTypes() {
-            return new GenericTypeList.LazyProjection.OfConstructorExceptionTypes(constructor);
+            return new GenericTypeList.OfConstructorExceptionTypes(constructor);
         }
 
         @Override
@@ -808,7 +808,7 @@ public ParameterList<ParameterDescription.InDefinedShape> getParameters() {
 
         @Override
         public GenericTypeList getExceptionTypes() {
-            return new GenericTypeList.LazyProjection.OfMethodExceptionTypes(method);
+            return new GenericTypeList.OfMethodExceptionTypes(method);
         }
 
         @Override
@@ -1139,7 +1139,7 @@ public TypeSubstituting(GenericTypeDescription declaringType,
 
         @Override
         public GenericTypeList getTypeVariables() {
-            return methodDescription.getTypeVariables().accept(new VariableRetainingDelegator());
+            return new GenericTypeList.ForDetachedTypes(methodDescription.getTypeVariables(), new VariableRetainingDelegator());
         }
 
         @Override
@@ -1154,7 +1154,7 @@ public ParameterList<?> getParameters() {
 
         @Override
         public GenericTypeList getExceptionTypes() {
-            return methodDescription.getExceptionTypes().accept(new VariableRetainingDelegator());
+            return new GenericTypeList.ForDetachedTypes(methodDescription.getExceptionTypes(), new VariableRetainingDelegator());
         }
 
         @Override
@@ -1281,7 +1281,7 @@ protected RetainedVariable(GenericTypeDescription typeVariable) {
 
                 @Override
                 public GenericTypeList getUpperBounds() {
-                    return typeVariable.getUpperBounds().accept(VariableRetainingDelegator.this);
+                    return new GenericTypeList.ForDetachedTypes(typeVariable.getUpperBounds(), VariableRetainingDelegator.this);
                 }
 
                 @Override

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java
@@ -284,7 +284,10 @@ abstract class AbstractBase extends ModifierReviewable.AbstractBase implements T
 
         @Override
         public GenericTypeDescription getSuperType() {
-            return LazyProjection.OfTransformedType.of(getDeclaredSuperType(), RawTypeWrapper.INSTANCE);
+            GenericTypeDescription superType = getDeclaredSuperType();
+            return superType == null
+                    ? TypeDescription.UNDEFINED
+                    : superType.accept(RawTypeWrapper.INSTANCE);
         }
 
         /**
@@ -296,7 +299,7 @@ public GenericTypeDescription getSuperType() {
 
         @Override
         public GenericTypeList getInterfaces() {
-            return new GenericTypeList.OfTransformedTypes(getDeclaredInterfaces(), RawTypeWrapper.INSTANCE);
+            return new GenericTypeList.ForDetachedTypes(getDeclaredInterfaces(), RawTypeWrapper.INSTANCE);
         }
 
         /**
@@ -723,7 +726,7 @@ public GenericTypeDescription onTypeVariable(GenericTypeDescription typeVariable
 
             @Override
             public GenericTypeDescription onNonGenericType(GenericTypeDescription typeDescription) {
-                return new ForNonGenericType(typeDescription.asErasure());
+                return new ForNonGenericType.Latent(typeDescription.asErasure());
             }
 
             @Override
@@ -752,7 +755,7 @@ protected RawTypeVariable(GenericTypeDescription typeVariable) {
 
                 @Override
                 public GenericTypeList getUpperBounds() {
-                    return new GenericTypeList.OfTransformedTypes(typeVariable.getUpperBounds(), RawTypeWrapper.INSTANCE);
+                    return new GenericTypeList.ForDetachedTypes(typeVariable.getUpperBounds(), RawTypeWrapper.INSTANCE);
                 }
 
                 @Override
@@ -885,7 +888,7 @@ public GenericTypeDescription getDeclaredSuperType() {
         public GenericTypeList getDeclaredInterfaces() {
             return isArray()
                     ? ARRAY_INTERFACES
-                    : new GenericTypeList.LazyProjection.OfInterfaces(type);
+                    : new GenericTypeList.OfLoadedInterfaceTypes(type);
         }
 
         @Override