Harmonize RuntimeHintsRegistrar implementations

snicoll · snicoll · commit 2c92d7da8f8f · 2022-07-12T18:30:23.000+02:00
Closes gh-28801
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHints.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHints.java
@@ -29,7 +29,7 @@
  *
  * @author Brian Clozel
  */
-class JakartaAnnotationsRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+class JakartaAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
diff --git a/spring-beans/src/main/resources/META-INF/spring/aot.factories b/spring-beans/src/main/resources/META-INF/spring/aot.factories
@@ -1,4 +1,5 @@
 org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
 org.springframework.beans.factory.aot.BeanRegistrationsAotProcessor
+
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.beans.factory.annotation.JakartaAnnotationsRuntimeHintsRegistrar
+org.springframework.beans.factory.annotation.JakartaAnnotationsRuntimeHints
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsTests.java
@@ -33,10 +33,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link JakartaAnnotationsRuntimeHintsRegistrar}.
+ * Tests for {@link JakartaAnnotationsRuntimeHints}.
+ *
  * @author Brian Clozel
  */
-class JakartaAnnotationsRuntimeHintsRegistrarTests {
+class JakartaAnnotationsRuntimeHintsTests {
 
 	private final RuntimeHints hints = new RuntimeHints();
 
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailMimeTypesRuntimeHints.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailMimeTypesRuntimeHints.java
@@ -27,10 +27,11 @@
  * @author Sebastien Deleuze
  * @since 6.0
  */
-class MimeTypeResourceHintsRegistrar implements RuntimeHintsRegistrar {
+class JavaMailMimeTypesRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		hints.resources().registerPattern("org/springframework/mail/javamail/mime.types");
 	}
+
 }
diff --git a/spring-context-support/src/main/resources/META-INF/spring/aot.factories b/spring-context-support/src/main/resources/META-INF/spring/aot.factories
@@ -1,2 +1,2 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar= \
-org.springframework.mail.javamail.MimeTypeResourceHintsRegistrar
+org.springframework.mail.javamail.JavaMailMimeTypesRuntimeHints
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -37,6 +37,9 @@
 import org.springframework.aop.framework.AopInfrastructureBean;
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.support.RuntimeHintsUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanNameAware;
@@ -65,6 +68,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor.ScheduledAnnotationsRuntimeHints;
 import org.springframework.scheduling.config.CronTask;
 import org.springframework.scheduling.config.FixedDelayTask;
 import org.springframework.scheduling.config.FixedRateTask;
@@ -107,7 +111,7 @@
  * @see org.springframework.scheduling.config.ScheduledTaskRegistrar
  * @see AsyncAnnotationBeanPostProcessor
  */
-@ImportRuntimeHints(ScheduledAnnotationRuntimeHintsRegistrar.class)
+@ImportRuntimeHints(ScheduledAnnotationsRuntimeHints.class)
 public class ScheduledAnnotationBeanPostProcessor
 		implements ScheduledTaskHolder, MergedBeanDefinitionPostProcessor, DestructionAwareBeanPostProcessor,
 		Ordered, EmbeddedValueResolverAware, BeanNameAware, BeanFactoryAware, ApplicationContextAware,
@@ -607,4 +611,14 @@ public void destroy() {
 		this.registrar.destroy();
 	}
 
+	static class ScheduledAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
+
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			RuntimeHintsUtils.registerAnnotation(hints, Scheduled.class);
+			RuntimeHintsUtils.registerAnnotation(hints, Schedules.class);
+		}
+
+	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationRuntimeHintsRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationRuntimeHintsRegistrar.java
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
@@ -23,15 +23,19 @@
 import org.aopalliance.aop.Advice;
 
 import org.springframework.aop.Pointcut;
+import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.aop.framework.autoproxy.AbstractBeanFactoryAwareAdvisingPostProcessor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.ImportRuntimeHints;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.validation.beanvalidation.MethodValidationPostProcessor.MethodValidationRuntimeHints;
 
 /**
  * A convenient {@link BeanPostProcessor} implementation that delegates to a
@@ -58,7 +62,7 @@
  * @see jakarta.validation.executable.ExecutableValidator
  */
 @SuppressWarnings("serial")
-@ImportRuntimeHints(MethodValidationRuntimeHintsRegistrar.class)
+@ImportRuntimeHints(MethodValidationRuntimeHints.class)
 public class MethodValidationPostProcessor extends AbstractBeanFactoryAwareAdvisingPostProcessor
 		implements InitializingBean {
 
@@ -127,4 +131,14 @@ protected Advice createMethodValidationAdvice(@Nullable Validator validator) {
 		return (validator != null ? new MethodValidationInterceptor(validator) : new MethodValidationInterceptor());
 	}
 
+
+	static class MethodValidationRuntimeHints implements RuntimeHintsRegistrar {
+
+		@Override
+		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+			hints.proxies().registerJdkProxy(AopProxyUtils.completeJdkProxyInterfaces(Validator.class));
+		}
+
+	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationRuntimeHintsRegistrar.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationRuntimeHintsRegistrar.java
diff --git a/spring-core/src/main/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHints.java b/spring-core/src/main/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHints.java
@@ -30,7 +30,7 @@
  * @author Phillip Webb
  * @since 6.0
  */
-class CoreAnnotationsRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+class CoreAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
diff --git a/spring-core/src/main/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHints.java b/spring-core/src/main/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHints.java
@@ -40,15 +40,15 @@
  * @since 6.0
  * @see SpringFactoriesLoader
  */
-class SpringFactoriesLoaderRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+class SpringFactoriesLoaderRuntimeHints implements RuntimeHintsRegistrar {
 
 	private static final List<String> RESOURCE_LOCATIONS =
 			List.of(SpringFactoriesLoader.FACTORIES_RESOURCE_LOCATION);
 
 	private static final Consumer<TypeHint.Builder> HINT = builder ->
 			builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
 
-	private static final Log logger = LogFactory.getLog(SpringFactoriesLoaderRuntimeHintsRegistrar.class);
+	private static final Log logger = LogFactory.getLog(SpringFactoriesLoaderRuntimeHints.class);
 
 
 	@Override
diff --git a/spring-core/src/main/resources/META-INF/spring/aot.factories b/spring-core/src/main/resources/META-INF/spring/aot.factories
@@ -1,3 +1,3 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.aot.hint.support.CoreAnnotationsRuntimeHintsRegistrar,\
-org.springframework.aot.hint.support.SpringFactoriesLoaderRuntimeHintsRegistrar
+org.springframework.aot.hint.support.CoreAnnotationsRuntimeHints,\
+org.springframework.aot.hint.support.SpringFactoriesLoaderRuntimeHints
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsTests.java
@@ -31,13 +31,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CoreAnnotationsRuntimeHintsRegistrar}.
+ * Tests for {@link CoreAnnotationsRuntimeHints}.
  *
  * @author Phillip Webb
  */
-class CoreAnnotationsRuntimeHintsRegistrarTests {
+class CoreAnnotationsRuntimeHintsTests {
 
-	private RuntimeHints hints = new RuntimeHints();
+	private final RuntimeHints hints = new RuntimeHints();
 
 	@BeforeEach
 	void setup() {
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsTests.java
@@ -31,11 +31,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringFactoriesLoaderRuntimeHintsRegistrar}.
+ * Tests for {@link SpringFactoriesLoaderRuntimeHints}.
  *
  * @author Phillip Webb
  */
-class SpringFactoriesLoaderRuntimeHintsRegistrarTests {
+class SpringFactoriesLoaderRuntimeHintsTests {
 
 	private RuntimeHints hints;
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessagingAnnotationsRuntimeHints.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessagingAnnotationsRuntimeHints.java
@@ -31,7 +31,7 @@
  * @author Sebastien Deleuze
  * @since 6.0
  */
-public class MessagingAnnotationsRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+public class MessagingAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SimpAnnotationsRuntimeHints.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SimpAnnotationsRuntimeHints.java
@@ -29,7 +29,7 @@
  * @author Sebastien Deleuze
  * @since 6.0
  */
-public class SimpAnnotationsRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+public class SimpAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -42,12 +42,12 @@
 import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 import org.springframework.messaging.converter.MessageConverter;
 import org.springframework.messaging.converter.StringMessageConverter;
-import org.springframework.messaging.handler.annotation.MessagingAnnotationsRuntimeHintsRegistrar;
+import org.springframework.messaging.handler.annotation.MessagingAnnotationsRuntimeHints;
 import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver;
 import org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler;
 import org.springframework.messaging.simp.SimpLogging;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.messaging.simp.annotation.SimpAnnotationsRuntimeHintsRegistrar;
+import org.springframework.messaging.simp.annotation.SimpAnnotationsRuntimeHints;
 import org.springframework.messaging.simp.annotation.support.SimpAnnotationMethodMessageHandler;
 import org.springframework.messaging.simp.broker.AbstractBrokerMessageHandler;
 import org.springframework.messaging.simp.broker.SimpleBrokerMessageHandler;
@@ -98,7 +98,7 @@
  * @author Sebastien Deleuze
  * @since 4.0
  */
-@ImportRuntimeHints({ MessagingAnnotationsRuntimeHintsRegistrar.class, SimpAnnotationsRuntimeHintsRegistrar.class })
+@ImportRuntimeHints({ MessagingAnnotationsRuntimeHints.class, SimpAnnotationsRuntimeHints.class })
 public abstract class AbstractMessageBrokerConfiguration implements ApplicationContextAware {
 
 	private static final String MVC_VALIDATOR_NAME = "mvcValidator";
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
@@ -38,7 +38,7 @@
  */
 @Configuration(proxyBeanMethods = false)
 @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
-@ImportRuntimeHints(TransactionRuntimeHintsRegistrar.class)
+@ImportRuntimeHints(TransactionRuntimeHints.class)
 public class ProxyTransactionManagementConfiguration extends AbstractTransactionManagementConfiguration {
 
 	@Bean(name = TransactionManagementConfigUtils.TRANSACTION_ADVISOR_BEAN_NAME)
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java
@@ -39,9 +39,9 @@
  *
  * @author Sebastien Deleuze
  * @since 6.0
- * @see TransactionRuntimeHintsRegistrar
+ * @see TransactionRuntimeHints
  */
-public class TransactionBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor {
+class TransactionBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor {
 
 	private final static String JAKARTA_TRANSACTIONAL_CLASS_NAME = "jakarta.transaction.Transactional";
 
@@ -70,7 +70,7 @@ private boolean isTransactional(Class<?> beanClass) {
 
 	private static class TransactionBeanRegistrationAotContribution implements BeanRegistrationAotContribution {
 
-		private Class<?> beanClass;
+		private final Class<?> beanClass;
 
 		public TransactionBeanRegistrationAotContribution(Class<?> beanClass) {
 			this.beanClass = beanClass;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionRuntimeHints.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionRuntimeHints.java
@@ -16,13 +16,14 @@
 
 package org.springframework.transaction.annotation;
 
+import java.util.List;
+
 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.hint.support.RuntimeHintsUtils;
-
-import static java.util.Arrays.asList;
+import org.springframework.transaction.TransactionDefinition;
 
 /**
  * {@link RuntimeHintsRegistrar} implementation that registers runtime hints for
@@ -32,17 +33,16 @@
  * @since 6.0
  * @see TransactionBeanRegistrationAotProcessor
  */
-public class TransactionRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+class TransactionRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-		RuntimeHintsUtils.registerAnnotation(hints, org.springframework.transaction.annotation.Transactional.class);
-
+		RuntimeHintsUtils.registerAnnotation(hints, Transactional.class);
 		hints.reflection()
-				.registerTypes(asList(
-								TypeReference.of(org.springframework.transaction.annotation.Isolation.class),
-								TypeReference.of(org.springframework.transaction.annotation.Propagation.class),
-								TypeReference.of(org.springframework.transaction.TransactionDefinition.class)),
+				.registerTypes(List.of(
+								TypeReference.of(Isolation.class),
+								TypeReference.of(Propagation.class),
+								TypeReference.of(TransactionDefinition.class)),
 						builder -> builder.withMembers(MemberCategory.DECLARED_FIELDS));
 	}
 }
diff --git a/spring-web/src/main/java/org/springframework/http/HttpMimeTypesRuntimeHints.java b/spring-web/src/main/java/org/springframework/http/HttpMimeTypesRuntimeHints.java
diff --git a/spring-web/src/main/java/org/springframework/http/codec/CodecConfigurerRuntimeHints.java b/spring-web/src/main/java/org/springframework/http/codec/CodecConfigurerRuntimeHints.java
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonModulesRuntimeHints.java b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonModulesRuntimeHints.java
diff --git a/spring-web/src/main/resources/META-INF/spring/aot.factories b/spring-web/src/main/resources/META-INF/spring/aot.factories
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java
diff --git a/spring-websocket/src/main/resources/META-INF/spring/aot.factories b/spring-websocket/src/main/resources/META-INF/spring/aot.factories

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`*`
`30`	`30`	`* @author Brian Clozel`
`31`	`31`	`*/`
`32`		`-class JakartaAnnotationsRuntimeHintsRegistrar implements RuntimeHintsRegistrar {`
	`32`	`+class JakartaAnnotationsRuntimeHints implements RuntimeHintsRegistrar {`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public void registerHints(RuntimeHints hints, ClassLoader classLoader) {`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,11 @@`
`27`	`27`	`* @author Sebastien Deleuze`
`28`	`28`	`* @since 6.0`
`29`	`29`	`*/`
`30`		`-class MimeTypeResourceHintsRegistrar implements RuntimeHintsRegistrar {`
	`30`	`+class JavaMailMimeTypesRuntimeHints implements RuntimeHintsRegistrar {`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {`
`34`	`34`	`hints.resources().registerPattern("org/springframework/mail/javamail/mime.types");`
`35`	`35`	`}`
	`36`	`+`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`org.springframework.aot.hint.RuntimeHintsRegistrar= \`
`2`		`-org.springframework.mail.javamail.MimeTypeResourceHintsRegistrar`
	`2`	`+org.springframework.mail.javamail.JavaMailMimeTypesRuntimeHints`