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

Fix composability issue in ExchangeMutatorWebFilter 

This commit replaces the UnaryOperatory<ServerWebExchange> inputs with
Function<ServerWebExchange, ServerWebExchange> instead. Unfortunately
the composability methods inherited from Function don't work in terms
of generics for composing multiple UnaryOperator's.

Issue: SPR-15599
This commit is contained in:
Rossen Stoyanchev 2017-05-31 09:30:04 -04:00
parent e06c4d5116
commit abcc4ac979
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeMutatorWebFilter.java
View File

@ -18,7 +18,6 @@ package org.springframework.test.web.reactive.server;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import reactor.core.publisher.Mono;
@ -46,16 +45,24 @@ import org.springframework.web.server.WebFilterChain;
* <p>Example usage:
*
* <pre class="code">
* ExchangeMutatorWebFilter mutator = new ExchangeMutatorWebFilter(exchange -> ...);
* Function&lt;ServerWebExchange, ServerWebExchange&gt; fn1 = ...;
* Function&lt;ServerWebExchange, ServerWebExchange&gt; fn2 = ...;
*
* ExchangeMutatorWebFilter mutator = new ExchangeMutatorWebFilter(fn1().andThen(fn2()));
* WebTestClient client = WebTestClient.bindToController(new MyController()).webFilter(mutator).build();
* </pre>
*
*
* <p>It is also possible to apply "per request" transformations:
*
* <pre class="code">
* ExchangeMutatorWebFilter mutator = new ExchangeMutatorWebFilter(exchange -> ...);
* ExchangeMutatorWebFilter mutator = new ExchangeMutatorWebFilter();
* WebTestClient client = WebTestClient.bindToController(new MyController()).webFilter(mutator).build();
* client.filter(mutator.perClient(exchange -> ...)).get().uri("/").exchange();
*
* Function&lt;ServerWebExchange, ServerWebExchange&gt; fn1 = ...;
* Function&lt;ServerWebExchange, ServerWebExchange&gt; fn2 = ...;
*
* client.filter(mutator.perClient(fn1().andThen(fn2()))).get().uri("/").exchange();
* </pre>
*
* @author Rossen Stoyanchev
@ -69,7 +76,11 @@ public class ExchangeMutatorWebFilter implements WebFilter {
new ConcurrentHashMap<>(4);
public ExchangeMutatorWebFilter(UnaryOperator<ServerWebExchange> processor) {
public ExchangeMutatorWebFilter() {
this(exchange -> exchange);
}
public ExchangeMutatorWebFilter(Function<ServerWebExchange, ServerWebExchange> processor) {
Assert.notNull(processor, "'processor' is required");
this.processor = processor;
}
@ -100,7 +111,7 @@ public class ExchangeMutatorWebFilter implements WebFilter {
* @param processor the exchange processor to use
* @return client filter for use with {@link WebTestClient#filter}
*/
public ExchangeFilterFunction perClient(UnaryOperator<ServerWebExchange> processor) {
public ExchangeFilterFunction perClient(Function<ServerWebExchange, ServerWebExchange> processor) {
return (request, next) -> {
String id = getRequestId(request.headers());
this.perRequestProcessors.compute(id,