From 02e96e01af3ef359617c807efcd24ff5e74e6299 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 17 Apr 2009 08:26:18 +0000 Subject: [PATCH] Changed variable names from path to pattern --- .../DefaultAnnotationHandlerMapping.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java index 46b5c62ae53..07c136ffb68 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java @@ -110,19 +110,19 @@ public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandler // @RequestMapping found at type level this.cachedMappings.put(handlerType, mapping); Set urls = new LinkedHashSet(); - 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); }