Fix enclosing class in TypeReference for inner type arrays

See gh-28664

Author: mhalbritter

spring-core/src/main/java/org/springframework/aot/hint/ReflectionTypeReference.java

@@ -28,10 +28,18 @@ final class ReflectionTypeReference extends AbstractTypeReference {
 	private final Class<?> type;
 
 	private ReflectionTypeReference(Class<?> type) {
-		super(type.getPackageName(), type.getSimpleName(), safeCreate(type.getEnclosingClass()));
+		super(type.getPackageName(), type.getSimpleName(), safeCreate(getEnclosingClass(type)));
 		this.type = type;
 	}
 
+	@Nullable
+	private static Class<?> getEnclosingClass(Class<?> type) {
+		if (type.isArray()) {
+			return type.getComponentType().getEnclosingClass();
+		}
+		return type.getEnclosingClass();
+	}
+
 	@Nullable
 	private static ReflectionTypeReference safeCreate(@Nullable Class<?> type) {
 		return (type != null ? new ReflectionTypeReference(type) : null);

spring-core/src/test/java/org/springframework/aot/hint/ReflectionTypeReferenceTests.java

@@ -28,6 +28,7 @@
  * Tests for {@link ReflectionTypeReference}.
  *
  * @author Stephane Nicoll
+ * @author Moritz Halbritter
  */
 class ReflectionTypeReferenceTests {
 
@@ -38,10 +39,22 @@ void typeReferenceFromClasHasSuitableReflectionTargetName(TypeReference typeRefe
 	}
 
 	static Stream<Arguments> reflectionTargetNames() {
-		return Stream.of(Arguments.of(ReflectionTypeReference.of(int.class), "int"),
+		return Stream.of(
+				Arguments.of(ReflectionTypeReference.of(int.class), "int"),
 				Arguments.of(ReflectionTypeReference.of(int[].class), "int[]"),
 				Arguments.of(ReflectionTypeReference.of(Integer[].class), "java.lang.Integer[]"),
-				Arguments.of(ReflectionTypeReference.of(Object[].class), "java.lang.Object[]"));
+				Arguments.of(ReflectionTypeReference.of(Object[].class), "java.lang.Object[]"),
+				Arguments.of(ReflectionTypeReference.of(StaticInner.class), "org.springframework.aot.hint.ReflectionTypeReferenceTests$StaticInner"),
+				Arguments.of(ReflectionTypeReference.of(StaticInner[].class), "org.springframework.aot.hint.ReflectionTypeReferenceTests$StaticInner[]"),
+				Arguments.of(ReflectionTypeReference.of(Inner.class), "org.springframework.aot.hint.ReflectionTypeReferenceTests$Inner"),
+				Arguments.of(ReflectionTypeReference.of(Inner[].class), "org.springframework.aot.hint.ReflectionTypeReferenceTests$Inner[]")
+		);
+	}
+
+	static class StaticInner {
+	}
+
+	class Inner {
 	}
 
 }