Replace Void with void on exchange method

See gh-30117
spring-projects · Jul 10, 2023 · 3be4c0a · 3be4c0a
1 parent 268f3c8
commit 3be4c0a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/spring-web/src/main/java/org/springframework/web/client/support/RestTemplateAdapter.java b/spring-web/src/main/java/org/springframework/web/client/support/RestTemplateAdapter.java
@@ -54,9 +54,8 @@ private RestTemplateAdapter(RestTemplate restTemplate) {
 	}
 
 	@Override
-	public Void exchange(HttpRequestValues requestValues) {
+	public void exchange(HttpRequestValues requestValues) {
 		this.restTemplate.exchange(newRequest(requestValues), Void.class);
-		return null;
 	}
 
 	@Override

diff --git a/...main/java/org/springframework/web/service/invoker/AbstractReactorHttpExchangeAdapter.java b/...main/java/org/springframework/web/service/invoker/AbstractReactorHttpExchangeAdapter.java
@@ -91,12 +91,12 @@ public Duration getBlockTimeout() {
 	}
 
 	@Override
-	public Void exchange(HttpRequestValues requestValues) {
+	public void exchange(HttpRequestValues requestValues) {
 		if (this.blockTimeout != null) {
-			return exchangeForMono(requestValues).block(this.blockTimeout);
+			exchangeForMono(requestValues).block(this.blockTimeout);
 		}
 		else {
-			return exchangeForMono(requestValues).block();
+			exchangeForMono(requestValues).block();
 		}
 	}
 

diff --git a/spring-web/src/main/java/org/springframework/web/service/invoker/HttpExchangeAdapter.java b/spring-web/src/main/java/org/springframework/web/service/invoker/HttpExchangeAdapter.java
@@ -34,7 +34,7 @@ public interface HttpExchangeAdapter {
 	 * Perform the given request, and release the response content, if any.
 	 * @param requestValues the request to perform
 	 */
-	Void exchange(HttpRequestValues requestValues);
+	void exchange(HttpRequestValues requestValues);
 
 	/**
 	 * Perform the given request, release the response content, and return the

diff --git a/spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceMethod.java b/spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceMethod.java
@@ -301,7 +301,10 @@ public static ResponseFunction create(HttpExchangeAdapter client, Method method)
 
 			Function<HttpRequestValues, Object> responseFunction;
 			if (actualReturnType.equals(void.class) || actualReturnType.equals(Void.class)) {
-				responseFunction = client::exchange;
+				responseFunction = requestValues -> {
+					client.exchange(requestValues);
+					return null;
+				};
 			}
 			else if (actualReturnType.equals(HttpHeaders.class)) {
 				responseFunction = request -> processResponse(client.exchangeForHeaders(request),

diff --git a/...ng-web/src/test/java/org/springframework/web/service/invoker/TestHttpExchangeAdapter.java b/...ng-web/src/test/java/org/springframework/web/service/invoker/TestHttpExchangeAdapter.java
@@ -59,9 +59,8 @@ public ParameterizedTypeReference<?> getBodyType() {
 	}
 
 	@Override
-	public Void exchange(HttpRequestValues requestValues) {
+	public void exchange(HttpRequestValues requestValues) {
 		saveInput("void", requestValues, null);
-		return null;
 	}
 
 	@Override