Merge pull request #35038 from OlgaMaciaszek

* pr/35038:
  Polish "Add hints to instantiate HttpService group adapters"
  Add hints to instantiate HttpService group adapters

Closes gh-35038

Author: snicoll

spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.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/resources/META-INF/spring/aot.factories

@@ -3,6 +3,7 @@ org.springframework.http.HttpMimeTypesRuntimeHints,\
 org.springframework.http.codec.CodecConfigurerRuntimeHints,\
 org.springframework.http.converter.json.JacksonModulesRuntimeHints,\
 org.springframework.http.converter.json.ProblemDetailRuntimeHints,\
+org.springframework.web.service.registry.HttpServiceProxyRegistryFactoryBean.HttpServiceProxyRegistryRuntimeHints,\
 org.springframework.web.util.WebUtilRuntimeHints
 
 org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\

spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterTests.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2002-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.client.support;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
+import org.springframework.beans.factory.aot.AotServices;
+import org.springframework.util.ClassUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link RestClientHttpServiceGroupAdapter}.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @author Stephane Nicoll
+ */
+class RestClientHttpServiceGroupAdapterTests {
+
+	@Test
+	void registerInstantiationHints() throws Exception {
+		RuntimeHints hints = new RuntimeHints();
+		AotServices.factories().load(RuntimeHintsRegistrar.class)
+				.forEach(registrar -> registrar.registerHints(hints,
+						ClassUtils.getDefaultClassLoader()));
+		assertThat(RuntimeHintsPredicates.reflection()
+				.onConstructorInvocation(RestClientHttpServiceGroupAdapter.class.getConstructor())).accepts(hints);
+	}
+
+}

spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterTests.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2002-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.reactive.function.client.support;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
+import org.springframework.beans.factory.aot.AotServices;
+import org.springframework.util.ClassUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WebClientHttpServiceGroupAdapter}.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @author Stephane Nicoll
+ */
+class WebClientHttpServiceGroupAdapterTests {
+
+	@Test
+	void registerInstantiationHints() throws Exception {
+		RuntimeHints hints = new RuntimeHints();
+		AotServices.factories().load(RuntimeHintsRegistrar.class)
+				.forEach(registrar -> registrar.registerHints(hints,
+						ClassUtils.getDefaultClassLoader()));
+		assertThat(RuntimeHintsPredicates.reflection()
+				.onConstructorInvocation(WebClientHttpServiceGroupAdapter.class.getConstructor())).accepts(hints);
+	}
+
+}