root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #304 from antonio-marrero/master 

# By Antonio Marrero
* pull304:
  Assign lowest priority to `/**` pattern
This commit is contained in:
Phillip Webb 2013-08-28 17:21:25 -07:00
parent c1dafed886 57f7b14b49
commit 744e1ed203
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
View File

@ -391,15 +391,16 @@ public class AntPathMatcher implements PathMatcher {
@Override @Override
public int compare(String pattern1, String pattern2) { public int compare(String pattern1, String pattern2) {
if (pattern1 == null && pattern2 == null) { if (isNullOrCaptureAllPattern(pattern1) && isNullOrCaptureAllPattern(pattern2)) {
return 0; return 0;
} }
else if (pattern1 == null) { else if (isNullOrCaptureAllPattern(pattern1)) {
return 1; return 1;
} }
else if (pattern2 == null) { else if (isNullOrCaptureAllPattern(pattern2)) {
return -1; return -1;
} }
boolean pattern1EqualsPath = pattern1.equals(path); boolean pattern1EqualsPath = pattern1.equals(path);
boolean pattern2EqualsPath = pattern2.equals(path); boolean pattern2EqualsPath = pattern2.equals(path);
if (pattern1EqualsPath && pattern2EqualsPath) { if (pattern1EqualsPath && pattern2EqualsPath) {
@ -411,6 +412,7 @@ public class AntPathMatcher implements PathMatcher {
else if (pattern2EqualsPath) { else if (pattern2EqualsPath) {
return 1; return 1;
} }
int wildCardCount1 = getWildCardCount(pattern1); int wildCardCount1 = getWildCardCount(pattern1);
int wildCardCount2 = getWildCardCount(pattern2); int wildCardCount2 = getWildCardCount(pattern2);
@ -448,6 +450,10 @@ public class AntPathMatcher implements PathMatcher {
return 0; return 0;
} }
private boolean isNullOrCaptureAllPattern(String pattern) {
return pattern == null || "/**".equals(pattern);
}
private int getWildCardCount(String pattern) { private int getWildCardCount(String pattern) {
if (pattern.endsWith(".*")) { if (pattern.endsWith(".*")) {
pattern = pattern.substring(0, pattern.length() - 2); pattern = pattern.substring(0, pattern.length() - 2);

5
spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
View File

@ -437,6 +437,11 @@ public class AntPathMatcherTests {
assertEquals(-1, comparator.compare("/hotels/{hotel}/booking", "/hotels/{hotel}/bookings/{booking}")); assertEquals(-1, comparator.compare("/hotels/{hotel}/booking", "/hotels/{hotel}/bookings/{booking}"));
assertEquals(1, comparator.compare("/hotels/{hotel}/bookings/{booking}", "/hotels/{hotel}/booking")); assertEquals(1, comparator.compare("/hotels/{hotel}/bookings/{booking}", "/hotels/{hotel}/booking"));
//SPR-10550
assertEquals(-1, comparator.compare("/hotels/{hotel}/bookings/{booking}/cutomers/{customer}", "/**"));
assertEquals(1, comparator.compare("/**","/hotels/{hotel}/bookings/{booking}/cutomers/{customer}"));
assertEquals(0, comparator.compare("/**","/**"));
assertEquals(-1, comparator.compare("/hotels/{hotel}", "/hotels/*")); assertEquals(-1, comparator.compare("/hotels/{hotel}", "/hotels/*"));
assertEquals(1, comparator.compare("/hotels/*", "/hotels/{hotel}")); assertEquals(1, comparator.compare("/hotels/*", "/hotels/{hotel}"));