Possible fix for spring-projects#33968

rPraml · rPraml · commit f60d747ea68a · 2024-12-13T08:23:51.000+01:00
diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
@@ -180,7 +180,7 @@ else if (genericType instanceof ParameterizedType parameterizedType) {
 								generics[i] = resolvedTypeArgument;
 							}
 							else {
-								generics[i] = ResolvableType.forType(typeArgument);
+								generics[i] = ResolvableType.forType(typeArgument).resolveType();
 							}
 						}
 						else if (typeArgument instanceof ParameterizedType) {

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ else if (genericType instanceof ParameterizedType parameterizedType) {`
`180`	`180`	`generics[i] = resolvedTypeArgument;`
`181`	`181`	`}`
`182`	`182`	`else {`
`183`		`- generics[i] = ResolvableType.forType(typeArgument);`
	`183`	`+ generics[i] = ResolvableType.forType(typeArgument).resolveType();`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`	`else if (typeArgument instanceof ParameterizedType) {`