spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 21:39:05 +00:00
Code Issues Projects Releases Wiki Activity

Changed variable names from path to pattern

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1016 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma
2009-04-17 08:26:18 +00:00
parent a0493f5a20
commit 6cafb84b9e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+10 -10
View File
@@ -110,19 +110,19 @@ public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandler
// @RequestMapping found at type level
this.cachedMappings.put(handlerType, mapping);
Set<String> urls = new LinkedHashSet<String>();
String[] typeLevelPaths = mapping.value();
if (typeLevelPaths.length > 0) {
String[] typeLevelPatterns = mapping.value();
if (typeLevelPatterns.length > 0) {
// @RequestMapping specifies paths at type level
String[] methodLevelPaths = determineUrlsForHandlerMethods(handlerType);
for (String typeLevelPath : typeLevelPaths) {
if (!typeLevelPath.startsWith("/")) {
typeLevelPath = "/" + typeLevelPath;
String[] methodLevelPatterns = determineUrlsForHandlerMethods(handlerType);
for (String typeLevelPattern : typeLevelPatterns) {
if (!typeLevelPattern.startsWith("/")) {
typeLevelPattern = "/" + typeLevelPattern;
}
for (String methodLevelPath : methodLevelPaths) {
String combinedPath = getPathMatcher().combine(typeLevelPath, methodLevelPath);
addUrlsForPath(urls, combinedPath);
for (String methodLevelPattern : methodLevelPatterns) {
String combinedPattern = getPathMatcher().combine(typeLevelPattern, methodLevelPattern);
addUrlsForPath(urls, combinedPattern);
}
addUrlsForPath(urls, typeLevelPath);
addUrlsForPath(urls, typeLevelPattern);
}
return StringUtils.toStringArray(urls);
}