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

Improve suffix pattern check

Browse Source 
After this change dots inside URI variables in a request mapping
pattern are ignored and no longer considered an indication that
the pattern contains a suffix itself.

Issue: SPR-11532
This commit is contained in:
Rossen Stoyanchev
2014-03-12 16:38:58 -04:00
parent 4d3ca4319e
commit 3474afb165
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -115,6 +115,26 @@ public class PatternsRequestConditionTests {
assertEquals("/{foo}", match.getPatterns().iterator().next());
}
// SPR-11532
@Test
public void matchSuffixPatternWithUriVariables() {
testSuffixPattern("/employees/{areaOfResponsibility.owner.id}", "/employees/976685.json", false);
testSuffixPattern("/establishments/{establishmentId}", "/establishments/123456789.json", false);
testSuffixPattern("/a.b/c", "/a.b/c.json", false);
testSuffixPattern("/a/b.json", "/a/b.json", true);
testSuffixPattern("/a/{b}.{c}", "/a/b.c", true);
}
public void testSuffixPattern(String pattern, String url, boolean patternHasSuffix) {
MockHttpServletRequest request = new MockHttpServletRequest("GET", url);
PatternsRequestCondition condition = new PatternsRequestCondition(pattern);
PatternsRequestCondition match = condition.getMatchingCondition(request);
assertNotNull(match);
assertEquals((patternHasSuffix ? pattern : pattern + ".*"), match.getPatterns().iterator().next());
}
// SPR-8410
@Test