Polish

Issue: SPR-12673

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java

@@ -77,9 +77,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 
 	private final List<Object> interceptors = new ArrayList<Object>();
 
-	private final List<HandlerInterceptor> handlerInterceptors = new ArrayList<HandlerInterceptor>();
-
-	private final List<MappedInterceptor> detectedMappedInterceptors = new ArrayList<MappedInterceptor>();
+	private final List<HandlerInterceptor> adaptedInterceptors = new ArrayList<HandlerInterceptor>();
 
 	private CorsProcessor corsProcessor = new DefaultCorsProcessor();
 	
@@ -245,7 +243,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	@Override
 	protected void initApplicationContext() throws BeansException {
 		extendInterceptors(this.interceptors);
-		detectMappedInterceptors(this.detectedMappedInterceptors);
+		detectMappedInterceptors(this.adaptedInterceptors);
 		initInterceptors();
 	}
 
@@ -268,7 +266,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	 * from the current context and its ancestors. Subclasses can override and refine this policy.
 	 * @param mappedInterceptors an empty list to add {@link MappedInterceptor} instances to
 	 */
-	protected void detectMappedInterceptors(List<MappedInterceptor> mappedInterceptors) {
+	protected void detectMappedInterceptors(List<HandlerInterceptor> mappedInterceptors) {
 		mappedInterceptors.addAll(
 				BeanFactoryUtils.beansOfTypeIncludingAncestors(
 						getApplicationContext(), MappedInterceptor.class, true, false).values());
@@ -287,11 +285,9 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 				if (interceptor == null) {
 					throw new IllegalArgumentException("Entry number " + i + " in interceptors array is null");
 				}
-				this.handlerInterceptors.add(adaptInterceptor(interceptor));
+				this.adaptedInterceptors.add(adaptInterceptor(interceptor));
 			}
 		}
-		this.handlerInterceptors.addAll(this.detectedMappedInterceptors);
-		this.interceptors.clear();
 	}
 
 	/**
@@ -323,14 +319,8 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	 * @return the array of {@link HandlerInterceptor}s, or {@code null} if none
 	 */
 	protected final HandlerInterceptor[] getAdaptedInterceptors() {
-		List<HandlerInterceptor> adaptedInterceptors = new ArrayList<HandlerInterceptor>();
-		for (HandlerInterceptor interceptor : this.handlerInterceptors) {
-			if (!(interceptor instanceof MappedInterceptor)) {
-				adaptedInterceptors.add(interceptor);
-			}
-		}
-		int count = adaptedInterceptors.size();
-		return (count > 0 ? adaptedInterceptors.toArray(new HandlerInterceptor[count]) : null);
+		int count = this.adaptedInterceptors.size();
+		return (count > 0 ? this.adaptedInterceptors.toArray(new HandlerInterceptor[count]) : null);
 	}
 
 	/**
@@ -339,7 +329,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	 */
 	protected final MappedInterceptor[] getMappedInterceptors() {
 		List<MappedInterceptor> mappedInterceptors = new ArrayList<MappedInterceptor>();
-		for (HandlerInterceptor interceptor : this.handlerInterceptors) {
+		for (HandlerInterceptor interceptor : this.adaptedInterceptors) {
 			if (interceptor instanceof MappedInterceptor) {
 				mappedInterceptors.add((MappedInterceptor) interceptor);
 			}
@@ -425,7 +415,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 				(HandlerExecutionChain) handler : new HandlerExecutionChain(handler));
 
 		String lookupPath = this.urlPathHelper.getLookupPathForRequest(request);
-		for (HandlerInterceptor interceptor : this.handlerInterceptors) {
+		for (HandlerInterceptor interceptor : this.adaptedInterceptors) {
 			if (interceptor instanceof MappedInterceptor) {
 				MappedInterceptor mappedInterceptor = (MappedInterceptor) interceptor;
 				if (mappedInterceptor.matches(lookupPath, this.pathMatcher)) {

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java

@@ -30,7 +30,6 @@ import org.mockito.Mockito;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.test.MockHttpServletRequest;
-import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.servlet.HandlerExecutionChain;
@@ -38,9 +37,11 @@ import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.support.WebContentGenerator;
 
 /**
+ * Unit tests for
+ * {@link org.springframework.web.servlet.handler.HandlerMappingTests}.
  * @author Brian Clozel
  */
-public class AbstractHandlerMappingTests {
+public class HandlerMappingTests {
 
 	private MockHttpServletRequest request;
 	private AbstractHandlerMapping handlerMapping;
@@ -65,7 +66,8 @@ public class AbstractHandlerMappingTests {
 		this.handlerMapping.setApplicationContext(this.context);
 		HandlerExecutionChain chain = this.handlerMapping.getHandlerExecutionChain(new SimpleHandler(), this.request);
 		Assert.assertThat(chain.getInterceptors(),
-				Matchers.arrayContaining(firstMappedInterceptor, secondHandlerInterceptor, thirdMappedInterceptor, fourthHandlerInterceptor));
+				Matchers.arrayContaining(firstMappedInterceptor.getInterceptor(), secondHandlerInterceptor,
+						thirdMappedInterceptor.getInterceptor(), fourthHandlerInterceptor));
 	}
 
 	class TestHandlerMapping extends AbstractHandlerMapping {