Polish "Add hints to instantiate HttpService group adapters"

See gh-35038
This commit is contained in:
Stéphane Nicoll
2025-06-12 21:23:50 +02:00
parent 8142f80581
commit 8bf9e0cbff
7 changed files with 45 additions and 131 deletions

View File

@@ -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);
}
}

View File

@@ -1,2 +0,0 @@
org.springframework.aot.hint.RuntimeHintsRegistrar= \
org.springframework.web.reactive.function.client.support.WebClientHttpServiceGroupAdapterRuntimeHints

View File

@@ -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);
}
}