Avoid recursion in ClassFileAnnotationMetadata.resolveTypeName()

sbrannen · sbrannen · commit d4cc273c312f · 2026-04-08T11:13:51.000+02:00
See gh-36577
diff --git a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java
@@ -226,10 +226,11 @@ static String resolveTypeName(ClassDesc type) {
 		if (type.isPrimitive()) {
 			return type.displayName();
 		}
-		if (type.isArray()) {
-			return resolveTypeName(type.componentType()) + "[]";
+		ClassDesc effectiveType = type;
+		while (effectiveType.isArray()) {
+			effectiveType = effectiveType.componentType();
 		}
-		String packageName = type.packageName();
+		String packageName = effectiveType.packageName();
 		return (packageName.isEmpty() ? type.displayName() : packageName + "." + type.displayName());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -226,10 +226,11 @@ static String resolveTypeName(ClassDesc type) {`
`226`	`226`	`if (type.isPrimitive()) {`
`227`	`227`	`return type.displayName();`
`228`	`228`	`}`
`229`		`- if (type.isArray()) {`
`230`		`- return resolveTypeName(type.componentType()) + "[]";`
	`229`	`+ ClassDesc effectiveType = type;`
	`230`	`+ while (effectiveType.isArray()) {`
	`231`	`+ effectiveType = effectiveType.componentType();`
`231`	`232`	`}`
`232`		`- String packageName = type.packageName();`
	`233`	`+ String packageName = effectiveType.packageName();`
`233`	`234`	`return (packageName.isEmpty() ? type.displayName() : packageName + "." + type.displayName());`
`234`	`235`	`}`
`235`	`236`