diff --git a/spring-web/src/main/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHints.java b/spring-web/src/main/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHints.java deleted file mode 100644 index cf488e2f065..00000000000 --- a/spring-web/src/main/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHints.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.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; - -/** - * A {@link RuntimeHintsRegistrar} implementation that adds hints for {@link RestClientHttpServiceGroupAdapter}. - * - * @author Olga Maciaszek-Sharma - * @since 7.0 - */ -public class RestClientHttpServiceGroupAdapterRuntimeHints implements RuntimeHintsRegistrar { - - @Override - public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { - hints.reflection() - .registerType(TypeReference.of(RestClientHttpServiceGroupAdapter.class), - MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS); - } -} diff --git a/spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.java b/spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.java index 18b595df0a7..141bdd6fbd9 100644 --- a/spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.java @@ -27,6 +27,10 @@ import java.util.stream.Collectors; 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 final class HttpServiceProxyRegistryFactoryBean 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> initGroupAdapters() { Map> 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 @@ public final class HttpServiceProxyRegistryFactoryBean } } + 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); + } + + } + } diff --git a/spring-web/src/main/resources/META-INF/spring/aot.factories b/spring-web/src/main/resources/META-INF/spring/aot.factories index ea75b5e38dc..c90c5b39444 100644 --- a/spring-web/src/main/resources/META-INF/spring/aot.factories +++ b/spring-web/src/main/resources/META-INF/spring/aot.factories @@ -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,\ diff --git a/spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHintsRegistrarTests.java b/spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterTests.java similarity index 57% rename from spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHintsRegistrarTests.java rename to spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterTests.java index 34dbacbda88..496837dd54b 100644 --- a/spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterRuntimeHintsRegistrarTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapterTests.java @@ -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); } } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterRuntimeHints.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterRuntimeHints.java deleted file mode 100644 index 951bbf2fbd4..00000000000 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterRuntimeHints.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.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; - -/** - * A {@link RuntimeHintsRegistrar} implementation that adds hints for {@link WebClientHttpServiceGroupAdapter}. - * - * @author Olga Maciaszek-Sharma - * @since 7.0 - */ -public class WebClientHttpServiceGroupAdapterRuntimeHints implements RuntimeHintsRegistrar { - - @Override - public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { - hints.reflection() - .registerType(TypeReference.of(WebClientHttpServiceGroupAdapter.class), - MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS); - } -} diff --git a/spring-webflux/src/main/resources/META-INF/spring/aot.factories b/spring-webflux/src/main/resources/META-INF/spring/aot.factories deleted file mode 100644 index e0a89b5d662..00000000000 --- a/spring-webflux/src/main/resources/META-INF/spring/aot.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.aot.hint.RuntimeHintsRegistrar= \ -org.springframework.web.reactive.function.client.support.WebClientHttpServiceGroupAdapterRuntimeHints \ No newline at end of file diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterRuntimeHintsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterTests.java similarity index 58% rename from spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterRuntimeHintsTests.java rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterTests.java index 78fabc3204a..d5163357659 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterRuntimeHintsTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceGroupAdapterTests.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); } }