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

SPR-5631 - Implicit /** mapping on type-level @RequestMapping

Browse Source
This commit is contained in:
Arjen Poutsma
2009-04-17 09:28:08 +00:00
parent 02e96e01af
commit acc84925d3
4 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
org.springframework.core/src/main/java/org/springframework/util/AntPathMatcher.java
View File

@@ -319,8 +319,7 @@ public class AntPathMatcher implements PathMatcher {
}
else {
int dotPos1 = pattern1.indexOf('.');
int dotPos2 = pattern2.indexOf('.');
if (dotPos1 == -1 && dotPos2 == -1) {
if (dotPos1 == -1) {
// simply concatenate the two patterns
if (pattern1.endsWith("/") || pattern2.startsWith("/")) {
return pattern1 + pattern2;
@@ -329,25 +328,20 @@ public class AntPathMatcher implements PathMatcher {
return pattern1 + "/" + pattern2;
}
}
String fileName1 = "";
String extension1 = "";
if (dotPos1 != -1) {
fileName1 = pattern1.substring(0, dotPos1);
extension1 = pattern1.substring(dotPos1);
}
else {
fileName1 = pattern1;
}
String fileName2 = "";
String extension2 = "";
String fileName1 = pattern1.substring(0, dotPos1);
String extension1 = pattern1.substring(dotPos1);
String fileName2;
String extension2;
int dotPos2 = pattern2.indexOf('.');
if (dotPos2 != -1) {
fileName2 = pattern2.substring(0, dotPos2);
extension2 = pattern2.substring(dotPos2);
}
else {
fileName2 = pattern2;
extension2 = "";
}
String fileName = fileName1.endsWith("*") ? fileName2 : fileName2;
String fileName = fileName1.endsWith("*") ? fileName2 : fileName1;
String extension = extension1.startsWith("*") ? extension2 : extension1;
return fileName + extension;

1
org.springframework.core/src/test/java/org/springframework/util/AntPathMatcherTests.java
View File

@@ -348,6 +348,7 @@ public class AntPathMatcherTests {
assertEquals("/hotels/{hotel}", pathMatcher.combine("/hotels/*", "{hotel}"));
assertEquals("/hotels/**/{hotel}", pathMatcher.combine("/hotels/**", "{hotel}"));
assertEquals("/hotels/{hotel}", pathMatcher.combine("/hotels", "{hotel}"));
assertEquals("/hotels/{hotel}.*", pathMatcher.combine("/hotels", "{hotel}.*"));
assertEquals("/hotels/*/booking/{booking}", pathMatcher.combine("/hotels/*/booking", "{booking}"));
assertEquals("/hotel.html", pathMatcher.combine("/*.html", "/hotel.html"));
assertEquals("/hotel.html", pathMatcher.combine("/*.html", "/hotel"));