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

Use PathPattern in PathResourceLookupFunction

This commit is contained in:
Arjen Poutsma 2017-05-10 10:12:55 +02:00
parent 64c0ec3d5e
commit f0f3df5cc0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,10 +26,10 @@ import reactor.core.publisher.Mono;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.util.AntPathMatcher;
import org.springframework.util.PathMatcher;
import org.springframework.util.ResourceUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.util.patterns.PathPattern;
import org.springframework.web.util.patterns.PathPatternParser;
/**
* Lookup function used by {@link RouterFunctions#resources(String, Resource)}.
@ -39,15 +39,15 @@ import org.springframework.util.StringUtils;
*/
class PathResourceLookupFunction implements Function<ServerRequest, Mono<Resource>> {
private static final PathMatcher PATH_MATCHER = new AntPathMatcher();
private static final PathPatternParser PATTERN_PARSER = new PathPatternParser();
private final String pattern;
private final PathPattern pattern;
private final Resource location;
public PathResourceLookupFunction(String pattern, Resource location) {
this.pattern = pattern;
this.pattern = PATTERN_PARSER.parse(pattern);
this.location = location;
}
@ -61,11 +61,11 @@ class PathResourceLookupFunction implements Function<ServerRequest, Mono<Resourc
if (!StringUtils.hasLength(path) || isInvalidPath(path)) {
return Mono.empty();
}
if (!PATH_MATCHER.match(this.pattern, path)) {
if (!this.pattern.matches(path)) {
return Mono.empty();
}
else {
path = PATH_MATCHER.extractPathWithinPattern(this.pattern, path);
path = this.pattern.extractPathWithinPattern(path);
}
try {
Resource resource = this.location.createRelative(path);