Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WebTestClient (server-less) setup accepts WebFilter's

Browse Source 
Issue: SPR-15349
This commit is contained in:
Rossen Stoyanchev
2017-03-16 15:38:49 -04:00
parent a99fe3eda4
commit 54192cf513
4 changed files with 101 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-test/src/main/java/org/springframework/test/web/reactive/server/AbstractMockServerSpec.java
View File

@@ -16,10 +16,14 @@
package org.springframework.test.web.reactive.server;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.UnaryOperator;
import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
/**
@@ -33,6 +37,13 @@ abstract class AbstractMockServerSpec<B extends WebTestClient.MockServerSpec<B>>
private final ExchangeMutatorWebFilter exchangeMutatorFilter = new ExchangeMutatorWebFilter();
private final List<WebFilter> filters = new ArrayList<>(4);
AbstractMockServerSpec() {
this.filters.add(this.exchangeMutatorFilter);
}
@Override
public <T extends B> T exchangeMutator(UnaryOperator<ServerWebExchange> mutator) {
@@ -40,6 +51,12 @@ abstract class AbstractMockServerSpec<B extends WebTestClient.MockServerSpec<B>>
return self();
}
@Override
public <T extends B> T webFilter(WebFilter... filter) {
this.filters.addAll(Arrays.asList(filter));
return self();
}
@SuppressWarnings("unchecked")
private <T extends B> T self() {
return (T) this;
@@ -48,12 +65,25 @@ abstract class AbstractMockServerSpec<B extends WebTestClient.MockServerSpec<B>>
@Override
public WebTestClient.Builder configureClient() {
HttpHandler handler = initHttpHandlerBuilder().prependFilter(this.exchangeMutatorFilter).build();
return new DefaultWebTestClientBuilder(handler, this.exchangeMutatorFilter);
WebHttpHandlerBuilder builder = initHttpHandlerBuilder();
filtersInReverse().forEach(builder::prependFilter);
return new DefaultWebTestClientBuilder(builder.build(), this.exchangeMutatorFilter);
}
/**
* Sub-classes to create the {@code WebHttpHandlerBuilder} to use.
*/
protected abstract WebHttpHandlerBuilder initHttpHandlerBuilder();
/**
* Return the filters in reverse order for pre-pending.
*/
private List<WebFilter> filtersInReverse() {
List<WebFilter> result = new ArrayList<>(this.filters);
Collections.reverse(result);
return result;
}
@Override
public WebTestClient build() {
return configureClient().build();

7
spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
View File

@@ -50,6 +50,7 @@ import org.springframework.web.reactive.function.client.ExchangeStrategies;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.reactive.function.server.RouterFunction;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.util.UriBuilder;
import org.springframework.web.util.UriBuilderFactory;
@@ -193,6 +194,12 @@ public interface WebTestClient {
*/
<T extends B> T exchangeMutator(UnaryOperator<ServerWebExchange> mutator);
/**
* Configure {@link WebFilter}'s for server request processing.
* @param filter one or more filters
*/
<T extends B> T webFilter(WebFilter... filter);
/**
* Proceed to configure and build the test client.
*/