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

Use PathPatternParser in function.server 

Use new PathPatternParser instead of PathMatcher in
web.reactive.function.server.
This commit is contained in:
Arjen Poutsma 2017-02-13 10:18:12 +01:00
parent a31429be2b
commit febed19bf4
3 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultHandlerStrategiesBuilder.java
View File

@ -112,6 +112,7 @@ class DefaultHandlerStrategiesBuilder implements HandlerStrategies.Builder {
applicationContext.getBeansOfType(HttpMessageReader.class).values().forEach(this::messageReader);
applicationContext.getBeansOfType(HttpMessageWriter.class).values().forEach(this::messageWriter);
applicationContext.getBeansOfType(ViewResolver.class).values().forEach(this::viewResolver);
localeResolver(DEFAULT_LOCALE_RESOLVER);
}
@Override

44
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
View File

@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
import reactor.core.publisher.Flux;
@ -32,11 +33,11 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.util.Assert;
import org.springframework.util.PathMatcher;
import org.springframework.web.reactive.function.BodyExtractor;
import org.springframework.web.server.WebSession;
import org.springframework.web.util.ParsingPathMatcher;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.patterns.PathPattern;
import org.springframework.web.util.patterns.PathPatternParser;
/**
* Implementations of {@link RequestPredicate} that implement various useful request matching operations, such as
@ -47,7 +48,7 @@ import org.springframework.web.util.UriUtils;
*/
public abstract class RequestPredicates {
private static final PathMatcher DEFAULT_PATH_MATCHER = new ParsingPathMatcher();
private static final PathPatternParser DEFAULT_PATTERN_PARSER = new PathPatternParser();
/**
* Returns a {@code RequestPredicate} that always matches.
@ -75,21 +76,22 @@ public abstract class RequestPredicates {
* @return a predicate that tests against the given path pattern
*/
public static RequestPredicate path(String pattern) {
return path(pattern, DEFAULT_PATH_MATCHER);
Assert.notNull(pattern, "'pattern' must not be null");
return new PathPatternPredicate(DEFAULT_PATTERN_PARSER.parse(pattern));
}
/**
* Return a {@code RequestPredicate} that tests against the given path pattern using the given matcher.
* Return a function that creates new path-matching {@code RequestPredicates} from pattern
* Strings using the given {@link PathPatternParser}. This method can be used to specify a
* non-default, customized {@code PathPatternParser} when resolving path patterns.
*
* @param pattern the pattern to match to
* @param pathMatcher the path matcher to use
* @return a predicate that tests against the given path pattern
* @param patternParser the parser used to parse patterns given to the returned function
* @return a function that resolves patterns Strings into path-matching
* {@code RequestPredicate}s
*/
public static RequestPredicate path(String pattern, PathMatcher pathMatcher) {
Assert.notNull(pattern, "'pattern' must not be null");
Assert.notNull(pathMatcher, "'pathMatcher' must not be null");
return new PathMatchingPredicate(pattern, pathMatcher);
public static Function<String, RequestPredicate> pathPredicates(PathPatternParser patternParser) {
Assert.notNull(patternParser, "'patternParser' must not be null");
return pattern -> new PathPatternPredicate(patternParser.parse(pattern));
}
/**
@ -324,26 +326,22 @@ public abstract class RequestPredicates {
}
}
private static class PathMatchingPredicate implements RequestPredicate {
private static class PathPatternPredicate implements RequestPredicate {
private final String pattern;
private final PathPattern pattern;
private final PathMatcher pathMatcher;
public PathMatchingPredicate(String pattern, PathMatcher pathMatcher) {
public PathPatternPredicate(PathPattern pattern) {
Assert.notNull(pattern, "'pattern' must not be null");
Assert.notNull(pathMatcher, "'pathMatcher' must not be null");
this.pattern = pattern;
this.pathMatcher = pathMatcher;
}
@Override
public boolean test(ServerRequest request) {
String path = request.path();
if (this.pathMatcher.match(this.pattern, path)) {
if (this.pattern.matches(path)) {
if (request instanceof DefaultServerRequest) {
DefaultServerRequest defaultRequest = (DefaultServerRequest) request;
Map<String, String> uriTemplateVariables = this.pathMatcher.extractUriTemplateVariables(this.pattern, path);
Map<String, String> uriTemplateVariables = this.pattern.matchAndExtract(path);
defaultRequest.exchange().getAttributes().put(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriTemplateVariables);
}
return true;
@ -356,7 +354,7 @@ public abstract class RequestPredicates {
@Override
public ServerRequest subRequest(ServerRequest request) {
String requestPath = request.path();
String subPath = this.pathMatcher.extractPathWithinPattern(this.pattern, requestPath);
String subPath = this.pattern.extractPathWithinPattern(requestPath);
return new SubPathServerRequestWrapper(request, subPath);
}
}

14
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RequestPredicatesTests.java
View File

@ -18,11 +18,13 @@ package org.springframework.web.reactive.function.server;
import java.net.URI;
import java.util.Collections;
import java.util.function.Function;
import org.junit.Test;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.web.util.patterns.PathPatternParser;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@ -94,6 +96,18 @@ public class RequestPredicatesTests {
assertFalse(predicate.test(request));
}
@Test
public void pathPredicates() throws Exception {
PathPatternParser parser = new PathPatternParser();
parser.setCaseSensitive(false);
Function<String, RequestPredicate> pathPredicates = RequestPredicates.pathPredicates(parser);
URI uri = URI.create("http://localhost/path");
RequestPredicate predicate = pathPredicates.apply("/P*");
MockServerRequest request = MockServerRequest.builder().uri(uri).build();
assertTrue(predicate.test(request));
}
@Test
public void headers() throws Exception {
String name = "MyHeader";