Migrate hint registration to shortcuts

Migrate code to make use of the `MemberCategory` and `FieldMode`
shortcuts.

See gh-29011

Author: philwebb

integration-tests/src/test/java/org/springframework/aot/test/ReflectionInvocationsTests.java

@@ -33,7 +33,7 @@ class ReflectionInvocationsTests {
 	@Test
 	void sampleTest() {
 		RuntimeHints hints = new RuntimeHints();
-		hints.reflection().registerType(String.class, hint -> hint.withMembers(MemberCategory.INTROSPECT_PUBLIC_METHODS));
+		hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_PUBLIC_METHODS);
 
 		RuntimeHintsInvocations invocations = RuntimeHintsRecorder.record(() -> {
 			SampleReflection sample = new SampleReflection();
@@ -45,8 +45,8 @@ void sampleTest() {
 	@Test
 	void multipleCallsTest() {
 		RuntimeHints hints = new RuntimeHints();
-		hints.reflection().registerType(String.class, hint -> hint.withMembers(MemberCategory.INTROSPECT_PUBLIC_METHODS));
-		hints.reflection().registerType(Integer.class, hint -> hint.withMembers(MemberCategory.INTROSPECT_PUBLIC_METHODS));
+		hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_PUBLIC_METHODS);
+		hints.reflection().registerType(Integer.class,MemberCategory.INTROSPECT_PUBLIC_METHODS);
 		RuntimeHintsInvocations invocations = RuntimeHintsRecorder.record(() -> {
 			SampleReflection sample = new SampleReflection();
 			sample.multipleCalls(); // does Method[] methods = String.class.getMethods(); methods = Integer.class.getMethods();

spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -36,7 +36,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,8 +46,6 @@
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.generate.MethodReference;
 import org.springframework.aot.hint.ExecutableMode;
-import org.springframework.aot.hint.FieldHint;
-import org.springframework.aot.hint.FieldMode;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
@@ -914,10 +911,6 @@ private static class AotContribution implements BeanRegistrationAotContribution
 
 		private static final String INSTANCE_PARAMETER = "instance";
 
-		private static final Consumer<FieldHint.Builder> ALLOW_WRITE = builder -> builder
-				.withMode(FieldMode.WRITE);
-
-
 		private final Class<?> target;
 
 		private final Collection<AutowiredElement> autowiredElements;
@@ -987,7 +980,7 @@ private CodeBlock generateMethodStatementForElement(
 		private CodeBlock generateMethodStatementForField(Field field, boolean required,
 				RuntimeHints hints) {
 
-			hints.reflection().registerField(field, ALLOW_WRITE);
+			hints.reflection().registerField(field);
 			CodeBlock resolver = CodeBlock.of("$T.$L($S)",
 					AutowiredFieldValueResolver.class,
 					(!required) ? "forField" : "forRequiredField", field.getName());

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBeanRuntimeHints.java

@@ -16,8 +16,6 @@
 
 package org.springframework.scheduling.quartz;
 
-import java.util.function.Consumer;
-
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -45,13 +43,14 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 		if (!ClassUtils.isPresent(SCHEDULER_FACTORY_CLASS_NAME, classLoader)) {
 			return;
 		}
-		Consumer<Builder> typeHint = type -> type
-				.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)
-				.onReachableType(SchedulerFactoryBean.class);
 		hints.reflection()
-				.registerType(TypeReference.of(SCHEDULER_FACTORY_CLASS_NAME), typeHint)
+				.registerType(TypeReference.of(SCHEDULER_FACTORY_CLASS_NAME), this::typeHint)
 				.registerTypes(TypeReference.listOf(ResourceLoaderClassLoadHelper.class,
-						LocalTaskExecutorThreadPool.class, LocalDataSourceJobStore.class), typeHint);
+						LocalTaskExecutorThreadPool.class, LocalDataSourceJobStore.class), this::typeHint);
 		this.reflectiveRegistrar.registerRuntimeHints(hints, LocalTaskExecutorThreadPool.class);
 	}
+
+	private void typeHint(Builder typeHint) {
+		typeHint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS).onReachableType(SchedulerFactoryBean.class);
+	}
 }

spring-context/src/main/java/org/springframework/context/aot/BindingReflectionHintsRegistrar.java

@@ -80,20 +80,20 @@ private void registerReflectionHints(ReflectionHints hints, Set<Type> seen, Type
 			if (clazz.isPrimitive() || clazz == Object.class) {
 				return;
 			}
-			hints.registerType(clazz, builder -> {
+			hints.registerType(clazz, typeHint -> {
 				if (seen.contains(type)) {
 					return;
 				}
 				seen.add(type);
 				if (shouldRegisterMembers(clazz)) {
 					if (clazz.isRecord()) {
-						builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+						typeHint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
 						for (RecordComponent recordComponent : clazz.getRecordComponents()) {
 							registerRecordHints(hints, seen, recordComponent.getAccessor());
 						}
 					}
 					else {
-						builder.withMembers(
+						typeHint.withMembers(
 								MemberCategory.DECLARED_FIELDS,
 								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
 						try {