Skip to content

Commit

Permalink
DefaultWebTestClient internal refactoring
Browse files Browse the repository at this point in the history 
Use the ClientResponse methods bodyToMono and bodyToFlux rather than
passing in a BodyExtractor so that WebTestclient now also benefits from
the recently improved handling of Void.class.
  • Loading branch information
@rstoyanchev
rstoyanchev committed Oct 4, 2017
1 parent 66a6fda commit decb632
Showing 1 changed file with 34 additions and 58 deletions.
92 changes: 34 additions & 58 deletions ...test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.io.ByteArrayResource;
Expand All @@ -40,14 +39,11 @@
import org.springframework.http.MediaType;
import org.springframework.http.client.reactive.ClientHttpConnector;
import org.springframework.http.client.reactive.ClientHttpRequest;
import org.springframework.http.client.reactive.ClientHttpResponse;
import org.springframework.lang.Nullable;
import org.springframework.test.util.JsonExpectationsHelper;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
import org.springframework.util.MultiValueMap;
import org.springframework.web.reactive.function.BodyExtractor;
import org.springframework.web.reactive.function.BodyExtractors;
import org.springframework.web.reactive.function.BodyInserter;
import org.springframework.web.reactive.function.client.ClientResponse;
import org.springframework.web.reactive.function.client.WebClient;
Expand All @@ -56,8 +52,6 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.springframework.test.util.AssertionErrors.assertEquals;
import static org.springframework.test.util.AssertionErrors.assertTrue;
import static org.springframework.web.reactive.function.BodyExtractors.toFlux;
import static org.springframework.web.reactive.function.BodyExtractors.toMono;

/**
* Default implementation of {@link WebTestClient}.
Expand Down Expand Up @@ -266,11 +260,6 @@ public RequestBodySpec ifNoneMatch(String... ifNoneMatches) {
return this;
}

@Override
public ResponseSpec exchange() {
return toResponseSpec(this.bodySpec.exchange());
}

@Override
public RequestHeadersSpec<?> body(BodyInserter<?, ? super ClientHttpRequest> inserter) {
this.bodySpec.body(inserter);
Expand All @@ -289,63 +278,33 @@ public RequestHeadersSpec<?> syncBody(Object body) {
return this;
}

private DefaultResponseSpec toResponseSpec(Mono<ClientResponse> mono) {
ClientResponse clientResponse = mono.block(getTimeout());
@Override
public ResponseSpec exchange() {
ClientResponse clientResponse = this.bodySpec.exchange().block(getTimeout());
Assert.state(clientResponse != null, "No ClientResponse");
ExchangeResult exchangeResult = wiretapConnector.claimRequest(this.requestId);
return new DefaultResponseSpec(exchangeResult, clientResponse, this.uriTemplate, getTimeout());
}
}


private static class UndecodedExchangeResult extends ExchangeResult {
private static class DefaultResponseSpec implements ResponseSpec {

private final ExchangeResult result;

private final ClientResponse response;

private final Duration timeout;

UndecodedExchangeResult(ExchangeResult result, ClientResponse response,

DefaultResponseSpec(ExchangeResult result, ClientResponse response,
@Nullable String uriTemplate, Duration timeout) {

super(result, uriTemplate);
this.result = new ExchangeResult(result, uriTemplate);
this.response = response;
this.timeout = timeout;
}

public <T> EntityExchangeResult<T> decode(BodyExtractor<Mono<T>, ? super ClientHttpResponse> extractor) {
T body = this.response.body(extractor).block(this.timeout);
return new EntityExchangeResult<>(this, body);
}

public <T> EntityExchangeResult<List<T>> decodeToList(BodyExtractor<Flux<T>, ? super ClientHttpResponse> extractor) {
Flux<T> flux = this.response.body(extractor);
List<T> body = flux.collectList().block(this.timeout);
return new EntityExchangeResult<>(this, body);
}

public <T> FluxExchangeResult<T> decodeToFlux(BodyExtractor<Flux<T>, ? super ClientHttpResponse> extractor) {
Flux<T> body = this.response.body(extractor);
return new FluxExchangeResult<>(this, body, this.timeout);
}

public EntityExchangeResult<byte[]> decodeToByteArray() {
ByteArrayResource resource = this.response.body(toMono(ByteArrayResource.class)).block(this.timeout);
byte[] body = (resource != null ? resource.getByteArray() : null);
return new EntityExchangeResult<>(this, body);
}
}


private static class DefaultResponseSpec implements ResponseSpec {

private final UndecodedExchangeResult result;

DefaultResponseSpec(
ExchangeResult result, ClientResponse response, @Nullable String uriTemplate, Duration timeout) {

this.result = new UndecodedExchangeResult(result, response, uriTemplate, timeout);
}

@Override
public StatusAssertions expectStatus() {
return new StatusAssertions(this.result, this);
Expand All @@ -358,42 +317,59 @@ public HeaderAssertions expectHeader() {

@Override
public <B> BodySpec<B, ?> expectBody(Class<B> bodyType) {
return new DefaultBodySpec<>(this.result.decode(toMono(bodyType)));
B body = this.response.bodyToMono(bodyType).block(this.timeout);
EntityExchangeResult<B> entityResult = new EntityExchangeResult<>(this.result, body);
return new DefaultBodySpec<>(entityResult);
}

@Override
public <B> BodySpec<B, ?> expectBody(ParameterizedTypeReference<B> bodyType) {
return new DefaultBodySpec<>(this.result.decode(toMono(bodyType)));
B body = this.response.bodyToMono(bodyType).block(this.timeout);
EntityExchangeResult<B> entityResult = new EntityExchangeResult<>(this.result, body);
return new DefaultBodySpec<>(entityResult);
}

@Override
public <E> ListBodySpec<E> expectBodyList(Class<E> elementType) {
return new DefaultListBodySpec<>(this.result.decodeToList(toFlux(elementType)));
return getListBodySpec(this.response.bodyToFlux(elementType));
}

@Override
public <E> ListBodySpec<E> expectBodyList(ParameterizedTypeReference<E> elementType) {
return new DefaultListBodySpec<>(this.result.decodeToList(toFlux(elementType)));
Flux<E> flux = this.response.bodyToFlux(elementType);
return getListBodySpec(flux);
}

private <E> ListBodySpec<E> getListBodySpec(Flux<E> flux) {
List<E> body = flux.collectList().block(this.timeout);
EntityExchangeResult<List<E>> entityResult = new EntityExchangeResult<>(this.result, body);
return new DefaultListBodySpec<>(entityResult);
}

@Override
public BodyContentSpec expectBody() {
return new DefaultBodyContentSpec(this.result.decodeToByteArray());
ByteArrayResource resource = this.response.bodyToMono(ByteArrayResource.class).block(this.timeout);
byte[] body = (resource != null ? resource.getByteArray() : null);
EntityExchangeResult<byte[]> entityResult = new EntityExchangeResult<>(this.result, body);
return new DefaultBodyContentSpec(entityResult);
}

@Override
public FluxExchangeResult<DataBuffer> returnResult() {
return this.result.decodeToFlux(BodyExtractors.toDataBuffers());
Flux<DataBuffer> body = this.response.bodyToFlux(DataBuffer.class);
return new FluxExchangeResult<>(this.result, body, this.timeout);
}

@Override
public <T> FluxExchangeResult<T> returnResult(Class<T> elementType) {
return this.result.decodeToFlux(toFlux(elementType));
Flux<T> body = this.response.bodyToFlux(elementType);
return new FluxExchangeResult<>(this.result, body, this.timeout);
}

@Override
public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementType) {
return this.result.decodeToFlux(toFlux(elementType));
Flux<T> body = this.response.bodyToFlux(elementType);
return new FluxExchangeResult<>(this.result, body, this.timeout);
}
}

Expand Down

0 comments on commit decb632

Please sign in to comment.