Stop generating generic type as Object for unresolved generics

Closes gh-29454
2022-11-09 12:00:34 +01:00
parent 70bb785ed6
commit da4b539f20
5 changed files with 98 additions and 1 deletions
--- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/ResolvableTypeCodeGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/ResolvableTypeCodeGenerator.java
@@ -45,7 +45,7 @@ final class ResolvableTypeCodeGenerator {
 			return CodeBlock.of("$T.NONE", ResolvableType.class);
 		}
 		Class<?> type = ClassUtils.getUserClass(resolvableType.toClass());
-		if (resolvableType.hasGenerics()) {
+		if (resolvableType.hasGenerics() && !resolvableType.hasUnresolvableGenerics()) {
 			return generateCodeWithGenerics(resolvableType, type);
 		}
 		if (allowClassResult) {