From 3f9a809c32063eb1106dbec0822a38d541f3e870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Tue, 5 Dec 2023 16:53:42 +0100 Subject: [PATCH] Improve `@RegisterReflectionForBinding` for enums Closes gh-31570 --- .../aot/hint/BindingReflectionHintsRegistrar.java | 5 +++++ .../aot/hint/BindingReflectionHintsRegistrarTests.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java b/spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java index 046f466046d..c36e9797cc3 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java @@ -94,6 +94,11 @@ public class BindingReflectionHintsRegistrar { registerRecordHints(hints, seen, recordComponent.getAccessor()); } } + if (clazz.isEnum()) { + typeHint.withMembers( + MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, + MemberCategory.INVOKE_PUBLIC_METHODS); + } typeHint.withMembers( MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS); diff --git a/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java index d057197d9ff..c3906146260 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java @@ -229,8 +229,8 @@ class BindingReflectionHintsRegistrarTests { @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))); + assertThat(RuntimeHintsPredicates.reflection().onType(SampleEnum.class).withMemberCategories( + MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS)).accepts(this.hints); } @Test