Further improved handling of generic types.

raphw · May 22, 2015 · f9272d1 · f9272d1
1 parent 52d8784
commit f9272d1
Show file tree

Hide file tree

Showing 11 changed files with 829 additions and 526 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java
@@ -107,7 +107,7 @@ public TypeDescription getFieldType() {
 
         @Override
         public GenericType getFieldTypeGen() {
-            return new GenericType.LazyProjection.OfFieldType(field);
+            return new GenericType.LazyProjection.OfLoadedFieldType(field);
         }
 
         @Override

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldList.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldList.java
@@ -11,10 +11,18 @@
  */
 public interface FieldList extends FilterableList<FieldDescription, FieldList> {
 
+    abstract class AbstractBase extends FilterableList.AbstractBase<FieldDescription, FieldList> implements FieldList {
+
+        @Override
+        protected FieldList wrap(List<FieldDescription> values) {
+            return new Explicit(values);
+        }
+    }
+
     /**
      * An implementation of a field list for an array of loaded fields.
      */
-    class ForLoadedField extends AbstractBase<FieldDescription, FieldList> implements FieldList {
+    class ForLoadedField extends AbstractBase {
 
         /**
          * The loaded fields this field list represents.
@@ -48,17 +56,12 @@ public FieldDescription get(int index) {
         public int size() {
             return fields.size();
         }
-
-        @Override
-        protected FieldList wrap(List<FieldDescription> values) {
-            return new Explicit(values);
-        }
     }
 
     /**
      * A wrapper implementation of a field list for a given list of field descriptions.
      */
-    class Explicit extends AbstractBase<FieldDescription, FieldList> implements FieldList {
+    class Explicit extends AbstractBase {
 
         /**
          * The list of field descriptions this list represents.
@@ -83,17 +86,12 @@ public FieldDescription get(int index) {
         public int size() {
             return fieldDescriptions.size();
         }
-
-        @Override
-        protected FieldList wrap(List<FieldDescription> values) {
-            return new Explicit(values);
-        }
     }
 
     /**
      * An implementation of an empty field list.
      */
     class Empty extends FilterableList.Empty<FieldDescription, FieldList> implements FieldList {
-
+        /* empty */
     }
 }
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
@@ -465,6 +465,11 @@ public boolean isDefaultValue(Object value) {
                     || (returnType.represents(Class.class) && value instanceof TypeDescription);
         }
 
+        @Override
+        public TypeVariableSource getEnclosingSource() {
+            return getDeclaringType();
+        }
+
         @Override
         public boolean equals(Object other) {
             return other == this || other instanceof MethodDescription
@@ -662,7 +667,7 @@ public TypeDescription getReturnType() {
 
         @Override
         public GenericType getReturnTypeGen() {
-            return new GenericType.LazyProjection.OfReturnType(method);
+            return new GenericType.LazyProjection.OfLoadedReturnType(method);
         }
 
         @Override

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodList.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodList.java
@@ -13,11 +13,19 @@
  */
 public interface MethodList extends FilterableList<MethodDescription, MethodList> {
 
+    abstract class AbstractBase extends FilterableList.AbstractBase<MethodDescription, MethodList> implements MethodList {
+
+        @Override
+        protected MethodList wrap(List<MethodDescription> values) {
+            return new Explicit(values);
+        }
+    }
+
     /**
      * A method list implementation that returns all loaded byte code methods (methods and constructors) that
      * are declared for a given type.
      */
-    class ForLoadedType extends AbstractBase<MethodDescription, MethodList> implements MethodList {
+    class ForLoadedType extends AbstractBase {
 
         /**
          * The loaded methods that are represented by this method list.
@@ -73,17 +81,12 @@ public MethodDescription get(int index) {
         public int size() {
             return constructors.size() + methods.size();
         }
-
-        @Override
-        protected MethodList wrap(List<MethodDescription> values) {
-            return new Explicit(values);
-        }
     }
 
     /**
      * A method list that is a wrapper for a given list of method descriptions.
      */
-    class Explicit extends AbstractBase<MethodDescription, MethodList> implements MethodList {
+    class Explicit extends AbstractBase {
 
         /**
          * The list of methods that is represented by this method list.
@@ -108,17 +111,12 @@ public MethodDescription get(int index) {
         public int size() {
             return methodDescriptions.size();
         }
-
-        @Override
-        protected MethodList wrap(List<MethodDescription> values) {
-            return new Explicit(values);
-        }
     }
 
     /**
      * An implementation of an empty method list.
      */
     class Empty extends FilterableList.Empty<MethodDescription, MethodList> implements MethodList {
-
+        /* empty */
     }
 }
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java
@@ -235,7 +235,7 @@ public TypeDescription getTypeDescription() {
 
         @Override
         public GenericType getTypeGen() {
-            return new TypeDescription.LazyProjection.OfParameter(parameter);
+            return new GenericType.LazyProjection.OfLoadedParameter(parameter);
         }
 
         @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
@@ -586,6 +586,14 @@ public GenericType getOwnerType() {
             return null;
         }
 
+        @Override
+        public TypeVariableSource getEnclosingSource() {
+            MethodDescription enclosingMethod = getEnclosingMethod();
+            return enclosingMethod == null
+                    ? getEnclosingType()
+                    : enclosingMethod;
+        }
+
         @Override
         public boolean equals(Object other) {
             return other == this || other instanceof TypeDescription
@@ -836,7 +844,7 @@ public TypeDescription getSupertype() {
 
         @Override
         public GenericType getSuperTypeGen() {
-            return new LazyProjection.OfSuperType(type);
+            return new LazyProjection.OfLoadedSuperType(type);
         }
 
         @Override

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeList.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeList.java
@@ -26,10 +26,18 @@ public interface TypeList extends FilterableList<TypeDescription, TypeList> {
      */
     int getStackSize();
 
+    abstract class AbstractBase extends FilterableList.AbstractBase<TypeDescription, TypeList> implements TypeList {
+
+        @Override
+        protected TypeList wrap(List<TypeDescription> values) {
+            return new Explicit(values);
+        }
+    }
+
     /**
      * Implementation of a type list for an array of loaded types.
      */
-    class ForLoadedType extends AbstractBase<TypeDescription, TypeList> implements TypeList {
+    class ForLoadedType extends AbstractBase {
 
         /**
          * The loaded types this type list represents.
@@ -78,17 +86,12 @@ public String[] toInternalNames() {
         public int getStackSize() {
             return StackSize.sizeOf(types);
         }
-
-        @Override
-        protected TypeList wrap(List<TypeDescription> values) {
-            return new Explicit(values);
-        }
     }
 
     /**
      * A wrapper implementation of an explicit list of types.
      */
-    class Explicit extends AbstractBase<TypeDescription, TypeList> implements TypeList {
+    class Explicit extends AbstractBase {
 
         /**
          * The list of type descriptions this list represents.
@@ -132,11 +135,6 @@ public int getStackSize() {
             }
             return stackSize;
         }
-
-        @Override
-        protected TypeList wrap(List<TypeDescription> values) {
-            return new Explicit(values);
-        }
     }
 
     /**

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/generic/GenericType.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/generic/GenericType.java
@@ -692,11 +692,11 @@ public String toString() {
             return resolve().toString();
         }
 
-        public static class OfSuperType extends LazyProjection {
+        public static class OfLoadedSuperType extends LazyProjection {
 
             private final Class<?> type;
 
-            public OfSuperType(Class<?> type) {
+            public OfLoadedSuperType(Class<?> type) {
                 this.type = type;
             }
 
@@ -711,11 +711,11 @@ public TypeDescription asRawType() {
             }
         }
 
-        public static class OfReturnType extends LazyProjection {
+        public static class OfLoadedReturnType extends LazyProjection {
 
             private final Method method;
 
-            public OfReturnType(Method method) {
+            public OfLoadedReturnType(Method method) {
                 this.method = method;
             }
 
@@ -730,11 +730,11 @@ public TypeDescription asRawType() {
             }
         }
 
-        public static class OfFieldType extends LazyProjection {
+        public static class OfLoadedFieldType extends LazyProjection {
 
             private final Field field;
 
-            public OfFieldType(Field field) {
+            public OfLoadedFieldType(Field field) {
                 this.field = field;
             }
 
@@ -749,7 +749,7 @@ public TypeDescription asRawType() {
             }
         }
 
-        public static class OfParameter extends LazyProjection {
+        public static class OfLoadedParameter extends LazyProjection {
 
             protected static final JavaMethod GET_TYPE;
 
@@ -772,7 +772,7 @@ public static class OfParameter extends LazyProjection {
 
             private final Object parameter;
 
-            public OfParameter(Object parameter) {
+            public OfLoadedParameter(Object parameter) {
                 this.parameter = parameter;
             }
 

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/generic/GenericTypeList.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/generic/GenericTypeList.java
@@ -22,7 +22,12 @@ abstract class AbstractBase extends FilterableList.AbstractBase<GenericType, Gen
 
         @Override
         public String toSignature() {
-            return null;
+            return null; // TODO: implement, remove?
+        }
+
+        @Override
+        protected GenericTypeList wrap(List<GenericType> values) {
+            return new Explicit(values);
         }
     }
 
@@ -34,11 +39,6 @@ public Explicit(List<? extends GenericType> genericTypes) {
             this.genericTypes = genericTypes;
         }
 
-        @Override
-        protected GenericTypeList wrap(List<GenericType> values) {
-            return new Explicit(values);
-        }
-
         @Override
         public GenericType get(int index) {
             return genericTypes.get(index);
@@ -71,11 +71,6 @@ public ForLoadedType(List<? extends Type> types) {
             this.types = types;
         }
 
-        @Override
-        protected GenericTypeList wrap(List<GenericType> values) {
-            return new Explicit(values);
-        }
-
         @Override
         public GenericType get(int index) {
             return GenericType.Sort.describe(types.get(index));
@@ -135,11 +130,6 @@ public TypeList asRawTypes() {
             }
         }
 
-        @Override
-        protected GenericTypeList wrap(List<GenericType> values) {
-            return new Explicit(values);
-        }
-
         public static class OfConstructorExceptionTypes extends LazyProjection {
 
             private final Constructor<?> constructor;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/generic/TypeVariableSource.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/generic/TypeVariableSource.java
@@ -5,4 +5,6 @@
 public interface TypeVariableSource extends ByteCodeElement {
 
     GenericTypeList getTypeVariables();
+
+    TypeVariableSource getEnclosingSource();
 }