Polish "Add hints to instantiate HttpService group adapters"

See gh-35038

Author: snicoll

spring-web/src/main/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHints.java

@@ -27,6 +27,10 @@
 
 import org.jspecify.annotations.Nullable;
 
+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.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -126,14 +130,15 @@ public HttpServiceProxyRegistry getObject() {
 
 	private static class GroupAdapterInitializer {
 
+		private static final String REST_CLIENT_HTTP_SERVICE_GROUP_ADAPTER = "org.springframework.web.client.support.RestClientHttpServiceGroupAdapter";
+
+		private static final String WEB_CLIENT_HTTP_SERVICE_GROUP_ADAPTER = "org.springframework.web.reactive.function.client.support.WebClientHttpServiceGroupAdapter";
+
 		static Map<HttpServiceGroup.ClientType, HttpServiceGroupAdapter<?>> initGroupAdapters() {
 			Map<HttpServiceGroup.ClientType, HttpServiceGroupAdapter<?>> map = new LinkedHashMap<>(2);
 
-			addGroupAdapter(map, HttpServiceGroup.ClientType.REST_CLIENT,
-					"org.springframework.web.client.support.RestClientHttpServiceGroupAdapter");
-
-			addGroupAdapter(map, HttpServiceGroup.ClientType.WEB_CLIENT,
-					"org.springframework.web.reactive.function.client.support.WebClientHttpServiceGroupAdapter");
+			addGroupAdapter(map, HttpServiceGroup.ClientType.REST_CLIENT, REST_CLIENT_HTTP_SERVICE_GROUP_ADAPTER);
+			addGroupAdapter(map, HttpServiceGroup.ClientType.WEB_CLIENT, WEB_CLIENT_HTTP_SERVICE_GROUP_ADAPTER);
 
 			return map;
 		}
@@ -314,4 +319,17 @@ private Map<Class<?>, Object> getProxyMapForGroup(String groupName) {
 		}
 	}
 
+	static class HttpServiceProxyRegistryRuntimeHints implements RuntimeHintsRegistrar {
+
+		@Override
+		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+			hints.reflection()
+					.registerType(TypeReference.of(GroupAdapterInitializer.REST_CLIENT_HTTP_SERVICE_GROUP_ADAPTER),
+							MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS)
+					.registerTypeIfPresent(classLoader, GroupAdapterInitializer.WEB_CLIENT_HTTP_SERVICE_GROUP_ADAPTER,
+							MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
+		}
+
+	}
+
 }

spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.java

@@ -3,8 +3,8 @@ org.springframework.http.HttpMimeTypesRuntimeHints,\
 org.springframework.http.codec.CodecConfigurerRuntimeHints,\
 org.springframework.http.converter.json.JacksonModulesRuntimeHints,\
 org.springframework.http.converter.json.ProblemDetailRuntimeHints,\
-org.springframework.web.util.WebUtilRuntimeHints,\
-org.springframework.web.client.support.RestClientHttpServiceGroupAdapterRuntimeHints
+org.springframework.web.service.registry.HttpServiceProxyRegistryFactoryBean.HttpServiceProxyRegistryRuntimeHints,\
+org.springframework.web.util.WebUtilRuntimeHints
 
 org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
 org.springframework.web.service.annotation.HttpExchangeBeanRegistrationAotProcessor,\

spring-web/src/main/resources/META-INF/spring/aot.factories

@@ -16,43 +16,32 @@
 
 package org.springframework.web.client.support;
 
-import org.junit.jupiter.api.BeforeEach;
 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.predicate.RuntimeHintsPredicates;
-import org.springframework.core.io.support.SpringFactoriesLoader;
+import org.springframework.beans.factory.aot.AotServices;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RestClientHttpServiceGroupAdapterRuntimeHints}.
+ * Tests for {@link RestClientHttpServiceGroupAdapter}.
  *
  * @author Olga Maciaszek-Sharma
+ * @author Stephane Nicoll
  */
-class RestClientHttpServiceGroupAdapterRuntimeHintsRegistrarTests {
-
-	private RuntimeHints hints;
-
-	@BeforeEach
-	void setUp() {
-		this.hints = new RuntimeHints();
-		SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
-				.load(RuntimeHintsRegistrar.class)
-				.forEach(registrar ->
-						registrar.registerHints(this.hints, ClassUtils.getDefaultClassLoader()));
-	}
+class RestClientHttpServiceGroupAdapterTests {
 
 	@Test
-	void shouldRegisterHintsForAdapter() {
+	void registerInstantiationHints() throws Exception {
+		RuntimeHints hints = new RuntimeHints();
+		AotServices.factories().load(RuntimeHintsRegistrar.class)
+				.forEach(registrar -> registrar.registerHints(hints,
+						ClassUtils.getDefaultClassLoader()));
 		assertThat(RuntimeHintsPredicates.reflection()
-				.onType(RestClientHttpServiceGroupAdapter.class)
-				.withMemberCategory(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS))
-				.accepts(this.hints);
-
+				.onConstructorInvocation(RestClientHttpServiceGroupAdapter.class.getConstructor())).accepts(hints);
 	}
 
 }

…upAdapterRuntimeHintsRegistrarTests.java …tClientHttpServiceGroupAdapterTests.javaspring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHintsRegistrarTests.java renamed to spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterTests.java spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHintsRegistrarTests.java renamed to spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterTests.java

@@ -16,43 +16,32 @@
 
 package org.springframework.web.reactive.function.client.support;
 
-import org.junit.jupiter.api.BeforeEach;
 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.predicate.RuntimeHintsPredicates;
-import org.springframework.core.io.support.SpringFactoriesLoader;
+import org.springframework.beans.factory.aot.AotServices;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link WebClientHttpServiceGroupAdapterRuntimeHints}.
+ * Tests for {@link WebClientHttpServiceGroupAdapter}.
  *
  * @author Olga Maciaszek-Sharma
+ * @author Stephane Nicoll
  */
-class WebClientHttpServiceGroupAdapterRuntimeHintsTests {
-
-	private RuntimeHints hints;
-
-	@BeforeEach
-	void setUp() {
-		this.hints = new RuntimeHints();
-		SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
-				.load(RuntimeHintsRegistrar.class)
-				.forEach(registrar ->
-						registrar.registerHints(this.hints, ClassUtils.getDefaultClassLoader()));
-	}
+class WebClientHttpServiceGroupAdapterTests {
 
 	@Test
-	void shouldRegisterHintsForAdapter() {
+	void registerInstantiationHints() throws Exception {
+		RuntimeHints hints = new RuntimeHints();
+		AotServices.factories().load(RuntimeHintsRegistrar.class)
+				.forEach(registrar -> registrar.registerHints(hints,
+						ClassUtils.getDefaultClassLoader()));
 		assertThat(RuntimeHintsPredicates.reflection()
-				.onType(WebClientHttpServiceGroupAdapter.class)
-				.withMemberCategory(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS))
-				.accepts(this.hints);
-
+				.onConstructorInvocation(WebClientHttpServiceGroupAdapter.class.getConstructor())).accepts(hints);
 	}
 
 }