root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Replace Void with void on exchange method 

See gh-30117
This commit is contained in:
rstoyanchev 2023-07-10 09:10:14 +01:00
parent 268f3c853e
commit 3be4c0a893
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,9 +54,8 @@ public final class RestTemplateAdapter implements HttpExchangeAdapter {
} }
@Override @Override
public Void exchange(HttpRequestValues requestValues) { public void exchange(HttpRequestValues requestValues) {
this.restTemplate.exchange(newRequest(requestValues), Void.class); this.restTemplate.exchange(newRequest(requestValues), Void.class);
return null;
} }
@Override @Override

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

@ -91,12 +91,12 @@ public abstract class AbstractReactorHttpExchangeAdapter
} }
@Override @Override
public Void exchange(HttpRequestValues requestValues) { public void exchange(HttpRequestValues requestValues) {
if (this.blockTimeout != null) { if (this.blockTimeout != null) {
return exchangeForMono(requestValues).block(this.blockTimeout); exchangeForMono(requestValues).block(this.blockTimeout);
} }
else { else {
return exchangeForMono(requestValues).block(); exchangeForMono(requestValues).block();
} }
} }

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

@ -34,7 +34,7 @@ public interface HttpExchangeAdapter {
* Perform the given request, and release the response content, if any. * Perform the given request, and release the response content, if any.
* @param requestValues the request to perform * @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 * Perform the given request, release the response content, and return the

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

@ -301,7 +301,10 @@ final class HttpServiceMethod {
Function<HttpRequestValues, Object> responseFunction; Function<HttpRequestValues, Object> responseFunction;
if (actualReturnType.equals(void.class) || actualReturnType.equals(Void.class)) { 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)) { else if (actualReturnType.equals(HttpHeaders.class)) {
responseFunction = request -> processResponse(client.exchangeForHeaders(request), responseFunction = request -> processResponse(client.exchangeForHeaders(request),

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

@ -59,9 +59,8 @@ public class TestHttpExchangeAdapter implements HttpExchangeAdapter, TestAdapter
} }
@Override @Override
public Void exchange(HttpRequestValues requestValues) { public void exchange(HttpRequestValues requestValues) {
saveInput("void", requestValues, null); saveInput("void", requestValues, null);
return null;
} }
@Override @Override