Properly initialize URI/Matrix vars w/ urlDecode=false

Issue: SPR-16867
This commit is contained in:
Rossen Stoyanchev
2018-05-24 15:08:39 -04:00
parent 2a993bf9ff
commit 85e8634810
3 changed files with 34 additions and 35 deletions

View File

@@ -345,7 +345,7 @@ public class RequestMappingInfoHandlerMappingTests {
assertEquals("", uriVariables.get("params"));
}
@Test
@Test // SPR-10140, SPR-16867
public void handleMatchMatrixVariablesDecoding() {
MockHttpServletRequest request;
@@ -357,14 +357,14 @@ public class RequestMappingInfoHandlerMappingTests {
this.handlerMapping.setUrlPathHelper(urlPathHelper);
request = new MockHttpServletRequest();
handleMatch(request, "/path{filter}", "/path;mvar=a%2fb");
handleMatch(request, "/{cars}", "/cars;mvar=a%2Fb");
MultiValueMap<String, String> matrixVariables = getMatrixVariables(request, "filter");
MultiValueMap<String, String> matrixVariables = getMatrixVariables(request, "cars");
Map<String, String> uriVariables = getUriTemplateVariables(request);
assertNotNull(matrixVariables);
assertEquals(Collections.singletonList("a/b"), matrixVariables.get("mvar"));
assertEquals(";mvar=a/b", uriVariables.get("filter"));
assertEquals("cars", uriVariables.get("cars"));
}