Browse Source

Merge branch '6.1.x'

pull/33412/head
Sébastien Deleuze 2 years ago
parent
commit
94d8fc7af8
  1. 10
      spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java

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

@ -71,6 +71,7 @@ import org.springframework.web.util.UriBuilderFactory;
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Sam Brannen * @author Sam Brannen
* @author Michał Rowicki * @author Michał Rowicki
* @author Sebastien Deleuze
* @since 5.0 * @since 5.0
*/ */
class DefaultWebTestClient implements WebTestClient { class DefaultWebTestClient implements WebTestClient {
@ -506,7 +507,14 @@ class DefaultWebTestClient implements WebTestClient {
@Override @Override
public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef) { public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef) {
Flux<T> body = this.response.bodyToFlux(elementTypeRef); Flux<T> body;
if (elementTypeRef.getType().equals(Void.class)) {
this.response.releaseBody().block();
body = Flux.empty();
}
else {
body = this.response.bodyToFlux(elementTypeRef);
}
return new FluxExchangeResult<>(this.exchangeResult, body); return new FluxExchangeResult<>(this.exchangeResult, body);
} }

Loading…
Cancel
Save