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

Use PathRemainingMatchInfo in RequestPredicates

Browse Source 
This commit uses the newly introduced PathRemainingMatchInfo
(316a680577) in path-based
RequestPredicates.

Issue: SPR-15419
This commit is contained in:
Arjen Poutsma
2017-04-19 10:39:51 +02:00
parent 09fcfb510c
commit b897f96e0f
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,6 @@ import org.springframework.web.server.WebSession;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.patterns.PathPattern;
import org.springframework.web.util.patterns.PathPatternParser;
import org.springframework.web.util.patterns.PathRemainingMatchInfo;
/**
* Implementations of {@link RequestPredicate} that implement various useful
@@ -344,7 +343,7 @@ public abstract class RequestPredicates {
boolean match = this.pattern.matches(path);
traceMatch("Pattern", this.pattern.getPatternString(), path, match);
if (match) {
mergeTemplateVariables(request);
mergeTemplateVariables(request, this.pattern.matchAndExtract(request.path()));
return true;
}
else {
@@ -354,25 +353,24 @@ public abstract class RequestPredicates {
@Override
public Optional<ServerRequest> nest(ServerRequest request) {
PathRemainingMatchInfo info = this.pattern.getPathRemaining(request.path());
String remainingPath = (info == null ? null : info.getPathRemaining());
return Optional.ofNullable(remainingPath)
.map(path -> !path.startsWith("/") ? "/" + path : path)
.map(path -> {
// TODO: re-enable when SPR-15419 has been fixed.
// mergeTemplateVariables(request);
return Optional.ofNullable(this.pattern.getPathRemaining(request.path()))
.map(info -> {
mergeTemplateVariables(request, info.getMatchingVariables());
String path = info.getPathRemaining();
if (!path.startsWith("/")) {
path = "/" + path;
}
return new SubPathServerRequestWrapper(request, path);
});
}
private void mergeTemplateVariables(ServerRequest request) {
Map<String, String> newVariables = this.pattern.matchAndExtract(request.path());
if (!newVariables.isEmpty()) {
private void mergeTemplateVariables(ServerRequest request, Map<String, String> variables) {
if (!variables.isEmpty()) {
Map<String, String> oldVariables = request.pathVariables();
Map<String, String> variables = new LinkedHashMap<>(oldVariables);
variables.putAll(newVariables);
Map<String, String> mergedVariables = new LinkedHashMap<>(oldVariables);
mergedVariables.putAll(variables);
request.attributes().put(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE,
Collections.unmodifiableMap(variables));
Collections.unmodifiableMap(mergedVariables));
}
}

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

@@ -16,7 +16,6 @@
package org.springframework.web.reactive.function.server;
import org.junit.Ignore;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -71,7 +70,6 @@ public class NestedRouteIntegrationTests extends AbstractRouterFunctionIntegrati
}
@Test
@Ignore("SPR-15419")
public void variables() throws Exception {
ResponseEntity<String> result =
restTemplate.getForEntity("http://localhost:" + port + "/1/2/3", String.class);