root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-6977: added support for array parameter types

This commit is contained in:
Christian Dupuis 2010-03-12 15:09:24 +00:00
parent 991c982e5b
commit 145dcfd0c2
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.springframework.core/src/main/java/org/springframework/core/GenericTypeResolver.java
View File

@ -18,6 +18,7 @@ package org.springframework.core;
import java.lang.ref.Reference; import java.lang.ref.Reference;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.lang.reflect.Array;
import java.lang.reflect.GenericArrayType; import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
@ -146,14 +147,7 @@ public abstract class GenericTypeResolver {
Class[] result = new Class[typeArgs.length]; Class[] result = new Class[typeArgs.length];
for (int i = 0; i < typeArgs.length; i++) { for (int i = 0; i < typeArgs.length; i++) {
Type arg = typeArgs[i]; Type arg = typeArgs[i];
if (arg instanceof TypeVariable) { result[i] = extractClass(ownerClass, arg);
TypeVariable tv = (TypeVariable) arg;
arg = getTypeVariableMap(ownerClass).get(tv);
if (arg == null) {
arg = extractBoundForTypeVariable(tv);
}
}
result[i] = (arg instanceof Class ? (Class) arg : Object.class);
} }
return result; return result;
} }
@ -169,6 +163,26 @@ public abstract class GenericTypeResolver {
} }
return null; return null;
} }
private static Class extractClass(Class ownerClass, Type arg) {
if (arg instanceof TypeVariable) {
TypeVariable tv = (TypeVariable) arg;
arg = getTypeVariableMap(ownerClass).get(tv);
if (arg == null) {
arg = extractBoundForTypeVariable(tv);
}
else {
arg = extractClass(ownerClass, arg);
}
}
else if (arg instanceof GenericArrayType) {
GenericArrayType gat = (GenericArrayType) arg;
Type gt = gat.getGenericComponentType();
Class<?> componentClass = extractClass(ownerClass, gt);
arg = Array.newInstance(componentClass, 0).getClass();
}
return (arg instanceof Class ? (Class) arg : Object.class);
}
/** /**