Fixed resolution of type variables for transformed methods and fields…

… which was based on the declaring type rather than the instrumented type. As a result, resolved type variables could not be found or were found incorrectly.
raphw · Aug 1, 2016 · f63611e · f63611e
1 parent f3da996
commit f63611e
Show file tree

Hide file tree

Showing 15 changed files with 274 additions and 266 deletions.
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,7 +1,6 @@
 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;
 
@@ -69,10 +68,10 @@ interface Visitor<T> {
         /**
          * Applies the visitor on a type.
          *
-         * @param typeDefinition The type onto which this visitor is applied.
+         * @param typeDescription The type onto which this visitor is applied.
          * @return The visitor's return value.
          */
-        T onType(TypeDefinition typeDefinition);
+        T onType(TypeDescription typeDescription);
 
         /**
          * Applies the visitor on a method.
@@ -93,8 +92,8 @@ enum NoOp implements Visitor<TypeVariableSource> {
             INSTANCE;
 
             @Override
-            public TypeVariableSource onType(TypeDefinition typeDefinition) {
+            public TypeVariableSource onType(TypeDescription typeDescription) {
-                return typeDefinition;
+                return typeDescription;
             }
 
             @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
@@ -649,7 +649,7 @@ private static boolean isAnnotationType(TypeDescription annotationType, Annotati
         public TypeVariableSource getEnclosingSource() {
             return isStatic()
                     ? TypeVariableSource.UNDEFINED
-                    : getDeclaringType();
+                    : getDeclaringType().asErasure();
         }
 
         @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
@@ -2,7 +2,6 @@
 
 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;
@@ -14,7 +13,7 @@
 /**
  * Implementations define a type, either as a {@link TypeDescription} or as a {@link TypeDescription.Generic}.
  */
-public interface TypeDefinition extends NamedElement, TypeVariableSource, ModifierReviewable.ForTypeDefinition, Iterable<TypeDefinition> {
+public interface TypeDefinition extends NamedElement, ModifierReviewable.ForTypeDefinition, Iterable<TypeDefinition> {
 
     /**
      * Returns this type definition as a generic type.