Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix BindingReflectionHintsRegistrar enum support

Browse Source 
This commit prevents a StackOverflowError in
BindingReflectionHintsRegistrar when processing enum types
and refine related generated hints.

See gh-28683
This commit is contained in:
Sébastien Deleuze
2022-06-27 12:18:43 +02:00
parent 730d6c95fc
commit fb1aa4f5d5
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrar.java
View File

@@ -98,7 +98,8 @@ public class BindingReflectionHintsRegistrar {
PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
Method writeMethod = propertyDescriptor.getWriteMethod();
if (writeMethod != null && writeMethod.getDeclaringClass() != Object.class) {
if (writeMethod != null && writeMethod.getDeclaringClass() != Object.class
&& writeMethod.getDeclaringClass() != Enum.class) {
hints.registerMethod(writeMethod, INVOKE);
MethodParameter methodParameter = MethodParameter.forExecutable(writeMethod, 0);
Type methodParameterType = methodParameter.getGenericParameterType();
@@ -107,7 +108,8 @@ public class BindingReflectionHintsRegistrar {
}
}
Method readMethod = propertyDescriptor.getReadMethod();
if (readMethod != null && readMethod.getDeclaringClass() != Object.class) {
if (readMethod != null && readMethod.getDeclaringClass() != Object.class
&& readMethod.getDeclaringClass() != Enum.class) {
hints.registerMethod(readMethod, INVOKE);
MethodParameter methodParameter = MethodParameter.forExecutable(readMethod, -1);
Type methodParameterType = methodParameter.getGenericParameterType();
@@ -144,7 +146,7 @@ public class BindingReflectionHintsRegistrar {
}
ResolvableType resolvableType = ResolvableType.forType(type);
Class<?> clazz = resolvableType.resolve();
if (clazz != null) {
if (clazz != null && !types.contains(clazz)) {
types.add(clazz);
for (ResolvableType genericResolvableType : resolvableType.getGenerics()) {
collectReferencedTypes(seen, types, genericResolvableType.getType());

11
spring-core/src/test/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrarTests.java
View File

@@ -196,6 +196,13 @@ public class BindingReflectionHintsRegistrarTests {
typeHint -> assertThat(typeHint.getType()).isEqualTo(TypeReference.of(Set.class)));
}
@Test
void registerTypeForSerializationWithEnum() {
bindingRegistrar.registerReflectionHints(this.hints.reflection(), SampleEnum.class);
assertThat(this.hints.reflection().typeHints()).singleElement()
.satisfies(typeHint -> assertThat(typeHint.getType()).isEqualTo(TypeReference.of(SampleEnum.class)));
}
static class SampleEmptyClass {
}
@@ -274,4 +281,8 @@ public class BindingReflectionHintsRegistrarTests {
}
}
enum SampleEnum {
value1, value2
}
}