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

Changed variable names from path to pattern

This commit is contained in:
Arjen Poutsma 2009-04-17 08:26:18 +00:00
parent b98c7e48ef
commit 02e96e01af
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
View File

@ -110,19 +110,19 @@ public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandler
// @RequestMapping found at type level // @RequestMapping found at type level
this.cachedMappings.put(handlerType, mapping); this.cachedMappings.put(handlerType, mapping);
Set<String> urls = new LinkedHashSet<String>(); Set<String> urls = new LinkedHashSet<String>();
String[] typeLevelPaths = mapping.value(); String[] typeLevelPatterns = mapping.value();
if (typeLevelPaths.length > 0) { if (typeLevelPatterns.length > 0) {
// @RequestMapping specifies paths at type level // @RequestMapping specifies paths at type level
String[] methodLevelPaths = determineUrlsForHandlerMethods(handlerType); String[] methodLevelPatterns = determineUrlsForHandlerMethods(handlerType);
for (String typeLevelPath : typeLevelPaths) { for (String typeLevelPattern : typeLevelPatterns) {
if (!typeLevelPath.startsWith("/")) { if (!typeLevelPattern.startsWith("/")) {
typeLevelPath = "/" + typeLevelPath; typeLevelPattern = "/" + typeLevelPattern;
} }
for (String methodLevelPath : methodLevelPaths) { for (String methodLevelPattern : methodLevelPatterns) {
String combinedPath = getPathMatcher().combine(typeLevelPath, methodLevelPath); String combinedPattern = getPathMatcher().combine(typeLevelPattern, methodLevelPattern);
addUrlsForPath(urls, combinedPath); addUrlsForPath(urls, combinedPattern);
} }
addUrlsForPath(urls, typeLevelPath); addUrlsForPath(urls, typeLevelPattern);
} }
return StringUtils.toStringArray(urls); return StringUtils.toStringArray(urls);
} }