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

Clean up path variables after non match

Browse Source 
This commit makes sure the nested path variables are only commited to
the attributes when all predicates match.

Issue: SPR-16692
This commit is contained in:
Arjen Poutsma
2018-05-03 09:41:14 +02:00
parent 03af55a363
commit 51325afbcc
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,10 +362,7 @@ public abstract class RequestPredicates {
@Override
public Optional<ServerRequest> nest(ServerRequest request) {
return Optional.ofNullable(this.pattern.matchStartOfPath(request.pathContainer()))
.map(info -> {
mergeTemplateVariables(request, info.getUriVariables());
return new SubPathServerRequestWrapper(request, info);
});
.map(info -> new SubPathServerRequestWrapper(request, info));
}
private void mergeTemplateVariables(ServerRequest request, Map<String, String> variables) {
@@ -475,10 +472,21 @@ public abstract class RequestPredicates {
private final PathContainer subPathContainer;
private final Map<String, String> pathVariables;
public SubPathServerRequestWrapper(ServerRequest request, PathPattern.PathRemainingMatchInfo info) {
this.request = request;
this.subPathContainer = new SubPathContainer(info.getPathRemaining());
this.pathVariables = mergePathVariables(request, info.getUriVariables());
}
private static Map<String, String> mergePathVariables(ServerRequest request,
Map<String, String> pathVariables) {
Map<String, String> result = new LinkedHashMap<>(request.pathVariables());
result.putAll(pathVariables);
return Collections.unmodifiableMap(result);
}
@Override
@@ -581,14 +589,9 @@ public abstract class RequestPredicates {
return this.request.queryParams();
}
@Override
public String pathVariable(String name) {
return this.request.pathVariable(name);
}
@Override
public Map<String, String> pathVariables() {
return this.request.pathVariables();
return this.pathVariables;
}
@Override