root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix enclosing class in TypeReference for inner type arrays 

See gh-28664
This commit is contained in:
Moritz Halbritter 2022-06-20 15:37:17 +02:00 committed by Stephane Nicoll
parent 4cb9e65353
commit c34de54d8a
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link ReflectionTypeReference}.
*
* @author Stephane Nicoll
* @author Moritz Halbritter
*/
class ReflectionTypeReferenceTests {
@ -38,10 +39,22 @@ class ReflectionTypeReferenceTests {
}
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 {
}
}