Completed generic type parsing.

raphw · May 26, 2015 · 8aa2180 · 8aa2180
1 parent f9272d1
commit 8aa2180
Show file tree

Hide file tree

Showing 3 changed files with 133 additions and 145 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterList.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterList.java
@@ -2,13 +2,16 @@
 
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.description.type.TypeList;
+import net.bytebuddy.description.type.generic.GenericType;
+import net.bytebuddy.description.type.generic.GenericTypeList;
 import net.bytebuddy.implementation.bytecode.StackSize;
 import net.bytebuddy.matcher.FilterableList;
 import net.bytebuddy.utility.JavaMethod;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -25,6 +28,8 @@ public interface ParameterList extends FilterableList<ParameterDescription, Para
      */
     TypeList asTypeList();
 
+    GenericTypeList asTypeListGen();
+
     /**
      * Checks if all parameters in this list define both an explicit name and an explicit modifier.
      *
@@ -132,6 +137,15 @@ public TypeList asTypeList() {
             return new TypeList.Explicit(typeDescriptions);
         }
 
+        @Override
+        public GenericTypeList asTypeListGen() {
+            List<GenericType> types = new ArrayList<GenericType>(parameter.length);
+            for (Object aParameter : parameter) {
+                types.add(new GenericType.LazyProjection.OfLoadedParameter(aParameter));
+            }
+            return new GenericTypeList.Explicit(types);
+        }
+
         @Override
         protected ParameterList wrap(List<ParameterDescription> values) {
             return new Explicit(values);
@@ -188,6 +202,15 @@ public int size() {
             public TypeList asTypeList() {
                 return new TypeList.ForLoadedType(parameterType);
             }
+
+            @Override
+            public GenericTypeList asTypeListGen() {
+                List<GenericType> types = new ArrayList<GenericType>(parameterType.length);
+                for (int index = 0; index < parameterType.length; index++) {
+                    types.add(new GenericType.LazyProjection.OfLegacyVmMethodParameter(method, index, parameterType[index]));
+                }
+                return new GenericTypeList.Explicit(types);
+            }
         }
 
         /**
@@ -241,6 +264,14 @@ public int size() {
             public TypeList asTypeList() {
                 return new TypeList.ForLoadedType(parameterType);
             }
+            @Override
+            public GenericTypeList asTypeListGen() {
+                List<GenericType> types = new ArrayList<GenericType>(parameterType.length);
+                for (int index = 0; index < parameterType.length; index++) {
+                    types.add(new GenericType.LazyProjection.OfLegacyVmConstructorParameter(constructor, index, parameterType[index]));
+                }
+                return new GenericTypeList.Explicit(types);
+            }
         }
     }
 
@@ -304,6 +335,15 @@ public TypeList asTypeList() {
             return new TypeList.Explicit(typeDescriptions);
         }
 
+        @Override
+        public GenericTypeList asTypeListGen() {
+            List<GenericType> types = new ArrayList<GenericType>(parameterDescriptions.size());
+            for (ParameterDescription parameterDescription : parameterDescriptions) {
+                types.add(parameterDescription.getTypeGen());
+            }
+            return new GenericTypeList.Explicit(types);
+        }
+
         @Override
         protected ParameterList wrap(List<ParameterDescription> values) {
             return new Explicit(values);
@@ -324,5 +364,10 @@ public boolean hasExplicitMetaData() {
         public TypeList asTypeList() {
             return new TypeList.Empty();
         }
+
+        @Override
+        public GenericTypeList asTypeListGen() {
+            return new GenericTypeList.Empty();
+        }
     }
 }
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
@@ -769,7 +769,6 @@ public static class OfLoadedParameter extends LazyProjection {
                 GET_GENERIC_TYPE = getGenericType;
             }
 
-
             private final Object parameter;
 
             public OfLoadedParameter(Object parameter) {