Avoid ResolvableType creation for interface/superclass check

See gh-30713
spring-projects · Jun 21, 2023 · 1dfe737 · 1dfe737
1 parent dc2f513
commit 1dfe737
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -567,7 +567,7 @@ private boolean determineUnresolvableGenerics() {
 			try {
 				for (Type genericInterface : resolved.getGenericInterfaces()) {
 					if (genericInterface instanceof Class<?> clazz) {
-						if (forClass(clazz).hasGenerics()) {
+						if (clazz.getTypeParameters().length > 0) {
 							return true;
 						}
 					}
@@ -576,7 +576,10 @@ private boolean determineUnresolvableGenerics() {
 			catch (TypeNotPresentException ex) {
 				// Ignore non-present types in generic signature
 			}
-			return getSuperType().hasUnresolvableGenerics();
+			Class<?> superclass = resolved.getSuperclass();
+			if (superclass != null && superclass != Object.class) {
+				return getSuperType().hasUnresolvableGenerics();
+			}
 		}
 		return false;
 	}