From 1e8017107a2fd600de6b8743485d1da2f577dd33 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 7 Sep 2022 07:50:49 +0200 Subject: [PATCH] Remove unnecessary workaround See gh-29091 --- ...tionContextAotGeneratorRuntimeHintsTests.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java b/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java index 51c837df380..7e0f274f910 100644 --- a/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java +++ b/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java @@ -20,10 +20,7 @@ import java.util.function.BiConsumer; import org.junit.jupiter.api.Test; -import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsRegistrar; -import org.springframework.aot.hint.TypeReference; import org.springframework.aot.test.agent.EnabledIfRuntimeHintsAgent; import org.springframework.aot.test.agent.RuntimeHintsInvocations; import org.springframework.aot.test.agent.RuntimeHintsRecorder; @@ -80,18 +77,7 @@ class ApplicationContextAotGeneratorRuntimeHintsTests { beanDefinition.setInitMethodName("customInit"); beanDefinition.setDestroyMethodName("customDestroy"); context.registerBeanDefinition("initDestroyComponent", beanDefinition); - compile(context, (hints, invocations) -> assertThat(invocations) - .withRegistrar(new InitDestroyIssueRegistrar()).match(hints)); - } - - // TODO: Remove once https://github.com/spring-projects/spring-framework/issues/29077 is fixed - static class InitDestroyIssueRegistrar implements RuntimeHintsRegistrar { - @Override - public void registerHints(RuntimeHints hints, ClassLoader classLoader) { - hints.reflection() - .registerType(TypeReference.of(InitDestroyComponent.class.getName()), typeHint -> - typeHint.withMembers(MemberCategory.INTROSPECT_PUBLIC_METHODS)); - } + compile(context, (hints, invocations) -> assertThat(invocations).match(hints)); } @SuppressWarnings({ "rawtypes", "unchecked" })