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

PathPattern#matchAndExtract minor refactoring

Browse Source 
Consistent behavior with matches(PathContainer), the two had slightly
different logic for handling of empty paths.

Make matchAndExtract independantly usable without the need to call
matches(PathContainer) first. Essentially no longer raising ISE if the
pattern doesn't match but simply returning null.
This commit is contained in:
Rossen Stoyanchev
2017-08-02 16:31:06 +02:00
parent dccedd5ad5
commit 62fa20fd6f
3 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,10 +343,10 @@ public abstract class RequestPredicates {
@Override
public boolean test(ServerRequest request) {
PathContainer pathContainer = request.pathContainer();
boolean match = this.pattern.matches(pathContainer);
traceMatch("Pattern", this.pattern.getPatternString(), request.path(), match);
if (match) {
mergeTemplateVariables(request, this.pattern.matchAndExtract(pathContainer).getUriVariables());
PathPattern.PathMatchInfo info = this.pattern.matchAndExtract(pathContainer);
traceMatch("Pattern", this.pattern.getPatternString(), request.path(), info != null);
if (info != null) {
mergeTemplateVariables(request, info.getUriVariables());
return true;
}
else {