Skip to content

Commit 3be4c0a

Browse files
committed
Replace Void with void on exchange method
See gh-30117
1 parent 268f3c8 commit 3be4c0a

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

spring-web/src/main/java/org/springframework/web/client/support/RestTemplateAdapter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ private RestTemplateAdapter(RestTemplate restTemplate) {
5454
}
5555

5656
@Override
57-
public Void exchange(HttpRequestValues requestValues) {
57+
public void exchange(HttpRequestValues requestValues) {
5858
this.restTemplate.exchange(newRequest(requestValues), Void.class);
59-
return null;
6059
}
6160

6261
@Override

spring-web/src/main/java/org/springframework/web/service/invoker/AbstractReactorHttpExchangeAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ public Duration getBlockTimeout() {
9191
}
9292

9393
@Override
94-
public Void exchange(HttpRequestValues requestValues) {
94+
public void exchange(HttpRequestValues requestValues) {
9595
if (this.blockTimeout != null) {
96-
return exchangeForMono(requestValues).block(this.blockTimeout);
96+
exchangeForMono(requestValues).block(this.blockTimeout);
9797
}
9898
else {
99-
return exchangeForMono(requestValues).block();
99+
exchangeForMono(requestValues).block();
100100
}
101101
}
102102

spring-web/src/main/java/org/springframework/web/service/invoker/HttpExchangeAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface HttpExchangeAdapter {
3434
* Perform the given request, and release the response content, if any.
3535
* @param requestValues the request to perform
3636
*/
37-
Void exchange(HttpRequestValues requestValues);
37+
void exchange(HttpRequestValues requestValues);
3838

3939
/**
4040
* Perform the given request, release the response content, and return the

spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceMethod.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,10 @@ public static ResponseFunction create(HttpExchangeAdapter client, Method method)
301301

302302
Function<HttpRequestValues, Object> responseFunction;
303303
if (actualReturnType.equals(void.class) || actualReturnType.equals(Void.class)) {
304-
responseFunction = client::exchange;
304+
responseFunction = requestValues -> {
305+
client.exchange(requestValues);
306+
return null;
307+
};
305308
}
306309
else if (actualReturnType.equals(HttpHeaders.class)) {
307310
responseFunction = request -> processResponse(client.exchangeForHeaders(request),

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ public ParameterizedTypeReference<?> getBodyType() {
5959
}
6060

6161
@Override
62-
public Void exchange(HttpRequestValues requestValues) {
62+
public void exchange(HttpRequestValues requestValues) {
6363
saveInput("void", requestValues, null);
64-
return null;
6564
}
6665

6766
@Override

0 commit comments

Comments
 (0)