Remove use of TestHttpClientAdapter

Now that HttpClientAdapter is deprecated and replaced by HttpExchangeAdapter
and ReactorHttpExchangeAdapter, our tests should use the new contracts.

See gh-30117

Author: rstoyanchev

spring-web/src/test/java/org/springframework/web/service/invoker/CookieValueArgumentResolverTests.java

@@ -35,9 +35,10 @@
  */
 class CookieValueArgumentResolverTests {
 
-	private final TestHttpClientAdapter client = new TestHttpClientAdapter();
+	private final TestExchangeAdapter client = new TestExchangeAdapter();
 
-	private final Service service = HttpServiceProxyFactory.builder(this.client).build().createClient(Service.class);
+	private final Service service =
+			HttpServiceProxyFactory.builderFor(this.client).build().createClient(Service.class);
 
 
 	@Test

spring-web/src/test/java/org/springframework/web/service/invoker/HttpClientServiceMethodTests.java

@@ -19,7 +19,7 @@
 import org.junit.jupiter.api.BeforeEach;
 
 /**
- * Tests for {@link HttpServiceMethod} with a blocking test {@link TestHttpExchangeAdapter} that
+ * Tests for {@link HttpServiceMethod} with a blocking test {@link TestExchangeAdapter} that
  * stubs the client invocations.
  * <p>
  * The tests do not create or invoke {@code HttpServiceMethod} directly but rather use
@@ -32,10 +32,8 @@ class HttpExchangeAdapterServiceMethodTests extends HttpServiceMethodTests {
 
 	@BeforeEach
 	void setUp() {
-		this.client = new TestHttpExchangeAdapter();
-		this.proxyFactory = HttpServiceProxyFactory.builder()
-			.exchangeAdapter((HttpExchangeAdapter) this.client)
-			.build();
+		this.client = new TestExchangeAdapter();
+		this.proxyFactory = HttpServiceProxyFactory.builderFor(this.client).build();
 	}
 
 }

spring-web/src/test/java/org/springframework/web/service/invoker/HttpExchangeAdapterServiceMethodTests.java

@@ -35,9 +35,10 @@
  */
 class HttpMethodArgumentResolverTests {
 
-	private final TestHttpClientAdapter client = new TestHttpClientAdapter();
+	private final TestExchangeAdapter client = new TestExchangeAdapter();
 
-	private final Service service = HttpServiceProxyFactory.builder(this.client).build().createClient(Service.class);
+	private final Service service =
+			HttpServiceProxyFactory.builderFor(this.client).build().createClient(Service.class);
 
 
 	@Test

spring-web/src/test/java/org/springframework/web/service/invoker/HttpMethodArgumentResolverTests.java

@@ -36,8 +36,8 @@
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
- * Base class for testing {@link HttpServiceMethod} with a test {@link TestHttpClientAdapter}
- * and a test {@link TestHttpExchangeAdapter} that stub the client invocations.
+ * Base class for testing {@link HttpServiceMethod} with a test {@link TestExchangeAdapter}
+ * and a test {@link TestExchangeAdapter} that stub the client invocations.
  *
  * <p>
  * The tests do not create or invoke {@code HttpServiceMethod} directly but rather use
@@ -52,7 +52,7 @@ abstract class HttpServiceMethodTests {
 	protected static final ParameterizedTypeReference<String> BODY_TYPE = new ParameterizedTypeReference<>() {
 	};
 
-	protected TestAdapter client;
+	protected TestExchangeAdapter client;
 
 	protected HttpServiceProxyFactory proxyFactory;
 
@@ -66,19 +66,19 @@ void blockingService() {
 		assertThat(headers).isNotNull();
 
 		String body = service.getBody();
-		assertThat(body).isEqualTo(client.getInvokedMethodReference());
+		assertThat(body).isEqualTo(client.getInvokedMethodName());
 
 		Optional<String> optional = service.getBodyOptional();
-		assertThat(optional).contains("body");
+		assertThat(optional.get()).startsWith("exchangeForBody");
 
 		ResponseEntity<String> entity = service.getEntity();
-		assertThat(entity.getBody()).isEqualTo("entity");
+		assertThat(entity.getBody()).startsWith("exchangeForEntity");
 
 		ResponseEntity<Void> voidEntity = service.getVoidEntity();
 		assertThat(voidEntity.getBody()).isNull();
 
 		List<String> list = service.getList();
-		assertThat(list.get(0)).isEqualTo("body");
+		assertThat(list.get(0)).startsWith("exchangeForBody");
 	}
 
 	@Test
@@ -104,10 +104,8 @@ void methodAnnotatedService() {
 
 	@Test
 	void typeAndMethodAnnotatedService() {
-		HttpExchangeAdapter actualClient = this.client instanceof HttpClientAdapter httpClient
-				? httpClient.asHttpExchangeAdapter() : (HttpExchangeAdapter) client;
 		HttpServiceProxyFactory proxyFactory = HttpServiceProxyFactory.builder()
-			.exchangeAdapter(actualClient)
+			.exchangeAdapter(this.client)
 			.embeddedValueResolver(value -> (value.equals("${baseUrl}") ? "/base" : value))
 			.build();
 
@@ -131,7 +129,7 @@ void typeAndMethodAnnotatedService() {
 	}
 
 	protected void verifyClientInvocation(String methodName, @Nullable ParameterizedTypeReference<?> expectedBodyType) {
-		assertThat(this.client.getInvokedMethodReference()).isEqualTo(methodName);
+		assertThat(this.client.getInvokedMethodName()).isEqualTo(methodName);
 		assertThat(this.client.getBodyType()).isEqualTo(expectedBodyType);
 	}
 

spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java

@@ -18,7 +18,6 @@
 
 import java.util.Optional;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpEntity;
@@ -42,16 +41,10 @@
 @SuppressWarnings("unchecked")
 class MultipartFileArgumentResolverTests {
 
-	private final TestHttpClientAdapter clientAdapter = new TestHttpClientAdapter();
+	private final TestExchangeAdapter client = new TestExchangeAdapter();
 
-	private TestClient client;
-
-
-	@BeforeEach
-	void setUp() {
-		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(this.clientAdapter).build();
-		this.client = factory.createClient(TestClient.class);
-	}
+	private final MultipartService multipartService =
+			HttpServiceProxyFactory.builderFor(this.client).build().createClient(MultipartService.class);
 
 
 	@Test
@@ -60,8 +53,8 @@ void multipartFile() {
 		String originalFileName = "originalTestFileName";
 		MultipartFile testFile = new MockMultipartFile(fileName, originalFileName, "text/plain", "test".getBytes());
 
-		this.client.postMultipartFile(testFile);
-		Object value = this.clientAdapter.getRequestValues().getBodyValue();
+		this.multipartService.postMultipartFile(testFile);
+		Object value = this.client.getRequestValues().getBodyValue();
 
 		assertThat(value).isInstanceOf(MultiValueMap.class);
 		MultiValueMap<String, HttpEntity<?>> map = (MultiValueMap<String, HttpEntity<?>>) value;
@@ -80,8 +73,8 @@ void multipartFile() {
 
 	@Test
 	void optionalMultipartFile() {
-		this.client.postOptionalMultipartFile(Optional.empty(), "anotherPart");
-		Object value = clientAdapter.getRequestValues().getBodyValue();
+		this.multipartService.postOptionalMultipartFile(Optional.empty(), "anotherPart");
+		Object value = client.getRequestValues().getBodyValue();
 
 		assertThat(value).isInstanceOf(MultiValueMap.class);
 		MultiValueMap<String, HttpEntity<?>> map = (MultiValueMap<String, HttpEntity<?>>) value;
@@ -90,7 +83,7 @@ void optionalMultipartFile() {
 
 
 	@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-	private interface TestClient {
+	private interface MultipartService {
 
 		@PostExchange
 		void postMultipartFile(MultipartFile file);

spring-web/src/test/java/org/springframework/web/service/invoker/MultipartFileArgumentResolverTests.java

@@ -27,7 +27,6 @@
 import java.util.Optional;
 
 import org.apache.groovy.util.Maps;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
@@ -52,21 +51,14 @@
  */
 class NamedValueArgumentResolverTests {
 
-	private final TestHttpClientAdapter client = new TestHttpClientAdapter();
+	private final TestExchangeAdapter client = new TestExchangeAdapter();
 
 	private final TestNamedValueArgumentResolver argumentResolver = new TestNamedValueArgumentResolver();
 
-	private Service service;
-
-
-	@BeforeEach
-	void setUp() throws Exception {
-		HttpServiceProxyFactory proxyFactory = HttpServiceProxyFactory.builder(this.client)
-				.customArgumentResolver(this.argumentResolver)
-				.build();
-
-		this.service = proxyFactory.createClient(Service.class);
-	}
+	private final Service service = HttpServiceProxyFactory.builderFor(this.client)
+			.customArgumentResolver(this.argumentResolver)
+			.build()
+			.createClient(Service.class);
 
 
 	@Test

spring-web/src/test/java/org/springframework/web/service/invoker/NamedValueArgumentResolverTests.java

@@ -34,9 +34,10 @@
  */
 class PathVariableArgumentResolverTests {
 
-	private final TestHttpClientAdapter client = new TestHttpClientAdapter();
+	private final TestExchangeAdapter client = new TestExchangeAdapter();
 
-	private final Service service = HttpServiceProxyFactory.builder(this.client).build().createClient(Service.class);
+	private final Service service =
+			HttpServiceProxyFactory.builderFor(this.client).build().createClient(Service.class);
 
 
 	@Test

spring-web/src/test/java/org/springframework/web/service/invoker/PathVariableArgumentResolverTests.java

@@ -33,8 +33,7 @@
 
 /**
  * Base class for testing reactive scenarios in {@link HttpServiceMethod} with
- * a test {@link TestHttpClientAdapter} and a test {@link TestHttpExchangeAdapter}
- * that stub the client invocations.
+ * a test {@link TestReactorExchangeAdapter} that stub the client invocations.
  *
  * <p>
  * The tests do not create or invoke {@code HttpServiceMethod} directly but rather use
@@ -52,33 +51,33 @@ void reactorService() {
 
 		Mono<Void> voidMono = service.execute();
 		StepVerifier.create(voidMono).verifyComplete();
-		verifyClientInvocation("void", null);
+		verifyClientInvocation("exchangeForMono", null);
 
 		Mono<HttpHeaders> headersMono = service.getHeaders();
 		StepVerifier.create(headersMono).expectNextCount(1).verifyComplete();
-		verifyClientInvocation("headers", null);
+		verifyClientInvocation("exchangeForHeadersMono", null);
 
 		Mono<String> body = service.getBody();
-		StepVerifier.create(body).expectNext("body").verifyComplete();
-		verifyClientInvocation("body", BODY_TYPE);
+		StepVerifier.create(body).expectNext("exchangeForBodyMono").verifyComplete();
+		verifyClientInvocation("exchangeForBodyMono", BODY_TYPE);
 
 		Flux<String> fluxBody = service.getFluxBody();
-		StepVerifier.create(fluxBody).expectNext("request", "To", "Body", "Flux").verifyComplete();
-		verifyClientInvocation("bodyFlux", BODY_TYPE);
+		StepVerifier.create(fluxBody).expectNext("exchange", "For", "Body", "Flux").verifyComplete();
+		verifyClientInvocation("exchangeForBodyFlux", BODY_TYPE);
 
 		Mono<ResponseEntity<Void>> voidEntity = service.getVoidEntity();
 		StepVerifier.create(voidEntity).expectNext(ResponseEntity.ok().build()).verifyComplete();
-		verifyClientInvocation("bodilessEntity", null);
+		verifyClientInvocation("exchangeForBodilessEntityMono", null);
 
 		Mono<ResponseEntity<String>> entity = service.getEntity();
-		StepVerifier.create(entity).expectNext(ResponseEntity.ok("requestToEntity"));
-		verifyClientInvocation("entity", BODY_TYPE);
+		StepVerifier.create(entity).expectNext(ResponseEntity.ok("exchangeForEntityMono"));
+		verifyClientInvocation("exchangeForEntityMono", BODY_TYPE);
 
 		Mono<ResponseEntity<Flux<String>>> fluxEntity = service.getFluxEntity();
 		StepVerifier.create(fluxEntity.flatMapMany(HttpEntity::getBody))
-				.expectNext("request", "To", "Entity", "Flux")
+				.expectNext("exchange", "For", "Entity", "Flux")
 				.verifyComplete();
-		verifyClientInvocation("entityFlux", BODY_TYPE);
+		verifyClientInvocation("exchangeForEntityFlux", BODY_TYPE);
 
 		assertThat(service.getDefaultMethodValue()).isEqualTo("default value");
 	}
@@ -93,20 +92,20 @@ void rxJavaService() {
 		assertThat(headersSingle.blockingGet()).isNotNull();
 
 		Single<String> bodySingle = service.getBody();
-		assertThat(bodySingle.blockingGet()).isEqualTo("body");
+		assertThat(bodySingle.blockingGet()).isEqualTo("exchangeForBodyMono");
 
 		Flowable<String> bodyFlow = service.getFlowableBody();
-		assertThat(bodyFlow.toList().blockingGet()).asList().containsExactly("request", "To", "Body", "Flux");
+		assertThat(bodyFlow.toList().blockingGet()).asList().containsExactly("exchange", "For", "Body", "Flux");
 
 		Single<ResponseEntity<Void>> voidEntity = service.getVoidEntity();
 		assertThat(voidEntity.blockingGet().getBody()).isNull();
 
 		Single<ResponseEntity<String>> entitySingle = service.getEntity();
-		assertThat(entitySingle.blockingGet().getBody()).isEqualTo("entity");
+		assertThat(entitySingle.blockingGet().getBody()).isEqualTo("exchangeForEntityMono");
 
 		Single<ResponseEntity<Flowable<String>>> entityFlow = service.getFlowableEntity();
 		Flowable<String> body = (entityFlow.blockingGet()).getBody();
-		assertThat(body.toList().blockingGet()).containsExactly("request", "To", "Entity", "Flux");
+		assertThat(body.toList().blockingGet()).containsExactly("exchange", "For", "Entity", "Flux");
 	}
 
 	private interface ReactorService {

spring-web/src/test/java/org/springframework/web/service/invoker/ReactiveHttpServiceMethodTests.java

@@ -20,7 +20,7 @@
 
 /**
  * Tests for {@link HttpServiceMethod} with an {@link HttpExchangeAdapter}
- * build from a test {@link TestHttpClientAdapter} that stubs the client invocations.
+ * build from a test {@link TestReactorExchangeAdapter} that stubs the client invocations.
  * <p>
  * The tests do not create or invoke {@code HttpServiceMethod} directly but rather use
  * {@link HttpServiceProxyFactory} to create a service proxy in order to use a strongly
@@ -32,10 +32,8 @@ public class ReactorExchangeAdapterHttpServiceMethodTests extends ReactiveHttpSe
 
 	@BeforeEach
 	void setUp() {
-		this.client = new TestHttpClientAdapter();
-		this.proxyFactory = HttpServiceProxyFactory.builder()
-			.exchangeAdapter(((HttpClientAdapter) this.client).asHttpExchangeAdapter())
-			.build();
+		this.client = new TestReactorExchangeAdapter();
+		this.proxyFactory = HttpServiceProxyFactory.builder().exchangeAdapter(this.client).build();
 	}
 
 }

spring-web/src/test/java/org/springframework/web/service/invoker/ReactorExchangeAdapterHttpServiceMethodTests.java

@@ -32,9 +32,10 @@
  */
 class RequestAttributeArgumentResolverTests {
 
-	private final TestHttpClientAdapter client = new TestHttpClientAdapter();
+	private final TestExchangeAdapter client = new TestExchangeAdapter();
 
-	private final Service service = HttpServiceProxyFactory.builder(this.client).build().createClient(Service.class);
+	private final Service service =
+			HttpServiceProxyFactory.builderFor(this.client).build().createClient(Service.class);
 
 
 	@Test

spring-web/src/test/java/org/springframework/web/service/invoker/RequestAttributeArgumentResolverTests.java

@@ -37,9 +37,10 @@
  */
 class RequestBodyArgumentResolverTests {
 
-	private final TestHttpClientAdapter client = new TestHttpClientAdapter();
+	private final TestExchangeAdapter client = new TestExchangeAdapter();
 
-	private final Service service = HttpServiceProxyFactory.builder(this.client).build().createClient(Service.class);
+	private final Service service =
+			HttpServiceProxyFactory.builderFor(this.client).build().createClient(Service.class);
 
 
 	@Test