Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve GenericTypeResolver to resolve type variable recursively

Browse Source 
Fix GH-24963
This commit is contained in:
Yanming Zhou
2023-03-08 12:55:49 +08:00
committed by Juergen Hoeller
parent 4b2e40153a
commit e788aeb25b
5 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
View File

@@ -39,6 +39,7 @@ import org.springframework.util.ConcurrentReferenceHashMap;
* @author Rob Harrop
* @author Sam Brannen
* @author Phillip Webb
* @author Yanming Zhou
* @since 2.5.2
*/
public final class GenericTypeResolver {
@@ -167,7 +168,7 @@ public final class GenericTypeResolver {
else if (genericType instanceof ParameterizedType parameterizedType) {
ResolvableType resolvedType = ResolvableType.forType(genericType);
if (resolvedType.hasUnresolvableGenerics()) {
Class<?>[] generics = new Class<?>[parameterizedType.getActualTypeArguments().length];
ResolvableType[] generics = new ResolvableType[parameterizedType.getActualTypeArguments().length];
Type[] typeArguments = parameterizedType.getActualTypeArguments();
ResolvableType contextType = ResolvableType.forClass(contextClass);
for (int i = 0; i < typeArguments.length; i++) {
@@ -175,14 +176,17 @@ public final class GenericTypeResolver {
if (typeArgument instanceof TypeVariable<?> typeVariable) {
ResolvableType resolvedTypeArgument = resolveVariable(typeVariable, contextType);
if (resolvedTypeArgument != ResolvableType.NONE) {
generics[i] = resolvedTypeArgument.resolve();
generics[i] = resolvedTypeArgument;
}
else {
generics[i] = ResolvableType.forType(typeArgument).resolve();
generics[i] = ResolvableType.forType(typeArgument);
}
}
else if (typeArgument instanceof ParameterizedType) {
generics[i] = ResolvableType.forType(resolveType(typeArgument, contextClass));
}
else {
generics[i] = ResolvableType.forType(typeArgument).resolve();
generics[i] = ResolvableType.forType(typeArgument);
}
}
Class<?> rawClass = resolvedType.getRawClass();

3
spring-core/src/main/java/org/springframework/core/ResolvableType.java
View File

@@ -70,6 +70,7 @@ import org.springframework.util.StringUtils;
* @author Phillip Webb
* @author Juergen Hoeller
* @author Stephane Nicoll
* @author Yanming Zhou
* @since 4.0
* @see #forField(Field)
* @see #forMethodParameter(Method, int)
@@ -572,7 +573,7 @@ public class ResolvableType implements Serializable {
private boolean determineUnresolvableGenerics() {
ResolvableType[] generics = getGenerics();
for (ResolvableType generic : generics) {
if (generic.isUnresolvableTypeVariable() || generic.isWildcardWithoutBounds()) {
if (generic.isUnresolvableTypeVariable() || generic.isWildcardWithoutBounds() || generic.hasUnresolvableGenerics()) {
return true;
}
}