WiretapConnector.Info is private

The claimRequest method was not intended to be public and couldn't
have been used since the Info type it returned was package private.
This change completely hides the Info.

See gh-19647

Author: rstoyanchev

spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -306,8 +306,8 @@ public RequestHeadersSpec<?> syncBody(Object body) {
 		public ResponseSpec exchange() {
 			ClientResponse clientResponse = this.bodySpec.exchange().block(getTimeout());
 			Assert.state(clientResponse != null, "No ClientResponse");
-			WiretapConnector.Info info = wiretapConnector.claimRequest(this.requestId);
-			return new DefaultResponseSpec(info, clientResponse, this.uriTemplate, getTimeout());
+			ExchangeResult result = wiretapConnector.getExchangeResult(this.requestId, this.uriTemplate, getTimeout());
+			return new DefaultResponseSpec(result, clientResponse, getTimeout());
 		}
 	}
 
@@ -321,10 +321,8 @@ private static class DefaultResponseSpec implements ResponseSpec {
 		private final Duration timeout;
 
 
-		DefaultResponseSpec(WiretapConnector.Info wiretapInfo, ClientResponse response,
-				@Nullable String uriTemplate, Duration timeout) {
-
-			this.exchangeResult = wiretapInfo.createExchangeResult(timeout, uriTemplate);
+		DefaultResponseSpec(ExchangeResult exchangeResult, ClientResponse response, Duration timeout) {
+			this.exchangeResult = exchangeResult;
 			this.response = response;
 			this.timeout = timeout;
 		}

spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -53,7 +53,7 @@ class WiretapConnector implements ClientHttpConnector {
 
 	private final ClientHttpConnector delegate;
 
-	private final Map<String, Info> exchanges = new ConcurrentHashMap<>();
+	private final Map<String, ClientExchangeInfo> exchanges = new ConcurrentHashMap<>();
 
 
 	WiretapConnector(ClientHttpConnector delegate) {
@@ -79,43 +79,47 @@ public Mono<ClientHttpResponse> connect(HttpMethod method, URI uri,
 					String requestId = wrappedRequest.getHeaders().getFirst(header);
 					Assert.state(requestId != null, () -> "No \"" + header + "\" header");
 					WiretapClientHttpResponse wrappedResponse = new WiretapClientHttpResponse(response);
-					this.exchanges.put(requestId, new Info(wrappedRequest, wrappedResponse));
+					this.exchanges.put(requestId, new ClientExchangeInfo(wrappedRequest, wrappedResponse));
 					return wrappedResponse;
 				});
 	}
 
 	/**
-	 * Retrieve the {@link Info} for the given "request-id" header value.
+	 * Create the {@link ExchangeResult} for the given "request-id" header value.
 	 */
-	public Info claimRequest(String requestId) {
-		Info info = this.exchanges.remove(requestId);
+	ExchangeResult getExchangeResult(String requestId, @Nullable String uriTemplate, Duration timeout) {
+		ClientExchangeInfo info = this.exchanges.remove(requestId);
 		Assert.state(info != null, () -> {
 			String header = WebTestClient.WEBTESTCLIENT_REQUEST_ID;
 			return "No match for " + header + "=" + requestId;
 		});
-		return info;
+		return new ExchangeResult(info.getRequest(), info.getResponse(),
+				info.getRequest().getRecorder().getContent(),
+				info.getResponse().getRecorder().getContent(),
+				timeout, uriTemplate);
 	}
 
 
 	/**
 	 * Holder for {@link WiretapClientHttpRequest} and {@link WiretapClientHttpResponse}.
 	 */
-	class Info {
+	private static class ClientExchangeInfo {
 
 		private final WiretapClientHttpRequest request;
 
 		private final WiretapClientHttpResponse response;
 
-
-		public Info(WiretapClientHttpRequest request, WiretapClientHttpResponse response) {
+		public ClientExchangeInfo(WiretapClientHttpRequest request, WiretapClientHttpResponse response) {
 			this.request = request;
 			this.response = response;
 		}
 
+		public WiretapClientHttpRequest getRequest() {
+			return this.request;
+		}
 
-		public ExchangeResult createExchangeResult(Duration timeout, @Nullable String uriTemplate) {
-			return new ExchangeResult(this.request, this.response, this.request.getRecorder().getContent(),
-					this.response.getRecorder().getContent(), timeout, uriTemplate);
+		public WiretapClientHttpResponse getResponse() {
+			return this.response;
 		}
 	}
 

spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -57,8 +57,7 @@ public void captureAndClaim() {
 		ExchangeFunction function = ExchangeFunctions.create(wiretapConnector);
 		function.exchange(clientRequest).block(ofMillis(0));
 
-		WiretapConnector.Info actual = wiretapConnector.claimRequest("1");
-		ExchangeResult result = actual.createExchangeResult(Duration.ZERO, null);
+		ExchangeResult result = wiretapConnector.getExchangeResult("1", null, Duration.ZERO);
 		assertThat(result.getMethod()).isEqualTo(HttpMethod.GET);
 		assertThat(result.getUrl().toString()).isEqualTo("/test");
 	}