Fixed type variable resolution to be retained for transformed methods.

raphw · Jul 28, 2016 · 52a3752 · 52a3752
1 parent bb3a37f
commit 52a3752
Show file tree

Hide file tree

Showing 16 changed files with 292 additions and 92 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java
@@ -305,17 +305,17 @@ public <T> DynamicType.Builder<T> subclass(TypeDefinition superType) {
     public <T> DynamicType.Builder<T> subclass(TypeDefinition superType, ConstructorStrategy constructorStrategy) {
         TypeDescription.Generic actualSuperType;
         TypeList.Generic interfaceTypes;
-        if (superType.isPrimitive() || superType.isArray() || superType.asErasure().isFinal()) {
+        if (superType.isPrimitive() || superType.isArray() || superType.isFinal()) {
             throw new IllegalArgumentException("Cannot subclass primitive, array or final types: " + superType);
-        } else if (superType.asErasure().isInterface()) {
+        } else if (superType.isInterface()) {
             interfaceTypes = new TypeList.Generic.Explicit(superType.asGenericType());
             actualSuperType = TypeDescription.Generic.OBJECT;
         } else {
             interfaceTypes = new TypeList.Generic.Empty();
             actualSuperType = superType.asGenericType();
         }
         return new SubclassDynamicTypeBuilder<T>(InstrumentedType.Default.subclass(namingStrategy.subclass(superType.asGenericType()),
-                ModifierContributor.Resolver.of(Visibility.PUBLIC, TypeManifestation.PLAIN).resolve(superType.asErasure().getModifiers()),
+                ModifierContributor.Resolver.of(Visibility.PUBLIC, TypeManifestation.PLAIN).resolve(superType.getModifiers()),
                 actualSuperType).withInterfaces(interfaceTypes),
                 classFileVersion,
                 auxiliaryTypeNamingStrategy,

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/ModifierReviewable.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/ModifierReviewable.java
@@ -112,7 +112,7 @@ interface OfEnumeration extends OfByteCodeElement {
     /**
      * A modifier reviewable for a {@link net.bytebuddy.description.type.TypeDescription}.
      */
-    interface ForTypeDescription extends OfAbstraction, OfEnumeration {
+    interface ForTypeDefinition extends OfAbstraction, OfEnumeration {
 
         /**
          * Specifies if the modifier described by this object represents the interface flag.
@@ -206,7 +206,7 @@ interface ForParameterDescription extends ModifierReviewable {
     /**
      * An abstract base implementation of a {@link ModifierReviewable} class.
      */
-    abstract class AbstractBase implements ForTypeDescription, ForFieldDescription, ForMethodDescription, ForParameterDescription {
+    abstract class AbstractBase implements ForTypeDefinition, ForFieldDescription, ForMethodDescription, ForParameterDescription {
 
         @Override
         public boolean isAbstract() {

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/TypeVariableSource.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/TypeVariableSource.java
@@ -1,15 +1,16 @@
 package net.bytebuddy.description;
 
 import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDefinition;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.description.type.TypeList;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 /**
- * A type variable source represents a byte code element that can declare type variables.
+ * A type variable source represents a code element that can declare type variables.
  */
-public interface TypeVariableSource extends ByteCodeElement {
+public interface TypeVariableSource extends ModifierReviewable.OfAbstraction {
 
     /**
      * Indicates that a type variable source is undefined.
@@ -68,10 +69,10 @@ interface Visitor<T> {
         /**
          * Applies the visitor on a type.
          *
-         * @param typeDescription The type onto which this visitor is applied.
+         * @param typeDefinition The type onto which this visitor is applied.
          * @return The visitor's return value.
          */
-        T onType(TypeDescription typeDescription);
+        T onType(TypeDefinition typeDefinition);
 
         /**
          * Applies the visitor on a method.
@@ -92,8 +93,8 @@ enum NoOp implements Visitor<TypeVariableSource> {
             INSTANCE;
 
             @Override
-            public TypeVariableSource onType(TypeDescription typeDescription) {
+            public TypeVariableSource onType(TypeDefinition typeDefinition) {
-                return typeDescription;
+                return typeDefinition;
             }
 
             @Override

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
@@ -38,6 +38,7 @@
 public interface MethodDescription extends TypeVariableSource,
         ModifierReviewable.ForMethodDescription,
         NamedElement.WithGenericName,
+        ByteCodeElement,
         ByteCodeElement.TypeDependant<MethodDescription.InDefinedShape, MethodDescription.Token> {
 
     /**
@@ -458,7 +459,7 @@ public boolean isVirtual() {
 
         @Override
         public boolean isDefaultMethod() {
-            return !isAbstract() && !isBridge() && getDeclaringType().asErasure().isInterface();
+            return !isAbstract() && !isBridge() && getDeclaringType().isInterface();
         }
 
         @Override
@@ -648,7 +649,7 @@ private static boolean isAnnotationType(TypeDescription annotationType, Annotati
         public TypeVariableSource getEnclosingSource() {
             return isStatic()
                     ? TypeVariableSource.UNDEFINED
-                    : getDeclaringType().asErasure();
+                    : getDeclaringType();
         }
 
         @Override

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDefinition.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDefinition.java
@@ -1,6 +1,8 @@
 package net.bytebuddy.description.type;
 
+import net.bytebuddy.description.ModifierReviewable;
 import net.bytebuddy.description.NamedElement;
+import net.bytebuddy.description.TypeVariableSource;
 import net.bytebuddy.description.field.FieldList;
 import net.bytebuddy.description.method.MethodList;
 import net.bytebuddy.implementation.bytecode.StackSize;
@@ -12,7 +14,7 @@
 /**
  * Implementations define a type, either as a {@link TypeDescription} or as a {@link TypeDescription.Generic}.
  */
-public interface TypeDefinition extends NamedElement, Iterable<TypeDefinition> {
+public interface TypeDefinition extends NamedElement, TypeVariableSource, ModifierReviewable.ForTypeDefinition, Iterable<TypeDefinition> {
 
     /**
      * Returns this type definition as a generic type.