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

34
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
View File

@@ -399,11 +399,11 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
boolean match = false;
if (mappingInfo.paths.length > 0) {
List<String> matchedPaths = new ArrayList<String>(mappingInfo.paths.length);
for (String mappedPath : mappingInfo.paths) {
if (isPathMatch(mappedPath, lookupPath)) {
for (String methodLevelPattern : mappingInfo.paths) {
if (isPathMatch(methodLevelPattern, lookupPath)) {
if (checkParameters(mappingInfo, request)) {
match = true;
matchedPaths.add(mappedPath);
matchedPaths.add(methodLevelPattern);
}
else {
for (RequestMethod requestMethod : mappingInfo.methods) {
@@ -479,17 +479,31 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
}
}
private boolean isPathMatch(String mappedPath, String lookupPath) {
if (mappedPath.equals(lookupPath) || pathMatcher.match(mappedPath, lookupPath)) {
private boolean isPathMatch(String methodLevelPattern, String lookupPath) {
if (isPathMatchInternal(methodLevelPattern, lookupPath)) {
return true;
}
boolean hasSuffix = (mappedPath.indexOf('.') != -1);
if (!hasSuffix && pathMatcher.match(mappedPath + ".*", lookupPath)) {
if (hasTypeLevelMapping()) {
String[] typeLevelPatterns = getTypeLevelMapping().value();
for (String typeLevelPattern : typeLevelPatterns) {
if (!typeLevelPattern.startsWith("/")) {
typeLevelPattern = "/" + typeLevelPattern;
}
String combinedPattern = pathMatcher.combine(typeLevelPattern, methodLevelPattern);
if (isPathMatchInternal(combinedPattern, lookupPath)) {
return true;
}
}
}
return false;
}
private boolean isPathMatchInternal(String pattern, String lookupPath) {
if (pattern.equals(lookupPath) || pathMatcher.match(pattern, lookupPath)) {
return true;
}
return (!mappedPath.startsWith("/") &&
(lookupPath.endsWith(mappedPath) || pathMatcher.match("/**/" + mappedPath, lookupPath) ||
(!hasSuffix && pathMatcher.match("/**/" + mappedPath + ".*", lookupPath))));
return !(pattern.indexOf('.') != -1) && pathMatcher.match(pattern + ".*", lookupPath);
}
private boolean checkParameters(RequestMappingInfo mapping, HttpServletRequest request) {