Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Execute HandlerInterceptors in registration order
Prior to this commit, registering `HandlerInterceptor`s using the `InterceptorRegistry` would not guarantee their order of execution. In fact, `HandlerInterceptor`s would always be executed before `MappedInterceptor`s. This change makes `MappedInterceptor` implement the `HandlerInterceptor` interface, in order to register all interceptors in a single ordered list. The order of execution of interceptors is now guaranteed in the `HandlerExecutionChain` built by `AbstractHandlerMapping`. Issue: SPR-12673
- Loading branch information
Showing
4 changed files
with
190 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
...vc/src/test/java/org/springframework/web/servlet/handler/AbstractHandlerMappingTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Copyright 2002-2015 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.web.servlet.handler; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
|
|
||
| import org.hamcrest.Matchers; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| 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; | ||
| import org.springframework.web.servlet.HandlerInterceptor; | ||
| import org.springframework.web.servlet.support.WebContentGenerator; | ||
|
|
||
| /** | ||
| * @author Brian Clozel | ||
| */ | ||
| public class AbstractHandlerMappingTests { | ||
|
|
||
| private MockHttpServletRequest request; | ||
| private AbstractHandlerMapping handlerMapping; | ||
| private StaticWebApplicationContext context; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| this.context = new StaticWebApplicationContext(); | ||
| this.handlerMapping = new TestHandlerMapping(); | ||
| this.request = new MockHttpServletRequest(); | ||
| } | ||
|
|
||
| @Test | ||
| public void orderedInterceptors() throws Exception { | ||
| MappedInterceptor firstMappedInterceptor = new MappedInterceptor(new String[]{"/**"}, Mockito.mock(HandlerInterceptor.class)); | ||
| HandlerInterceptor secondHandlerInterceptor = Mockito.mock(HandlerInterceptor.class); | ||
| MappedInterceptor thirdMappedInterceptor = new MappedInterceptor(new String[]{"/**"}, Mockito.mock(HandlerInterceptor.class)); | ||
| HandlerInterceptor fourthHandlerInterceptor = Mockito.mock(HandlerInterceptor.class); | ||
|
|
||
| this.handlerMapping.setInterceptors(new Object[]{firstMappedInterceptor, secondHandlerInterceptor, | ||
| thirdMappedInterceptor, fourthHandlerInterceptor}); | ||
| this.handlerMapping.setApplicationContext(this.context); | ||
| HandlerExecutionChain chain = this.handlerMapping.getHandlerExecutionChain(new SimpleHandler(), this.request); | ||
| Assert.assertThat(chain.getInterceptors(), | ||
| Matchers.arrayContaining(firstMappedInterceptor, secondHandlerInterceptor, thirdMappedInterceptor, fourthHandlerInterceptor)); | ||
| } | ||
|
|
||
| class TestHandlerMapping extends AbstractHandlerMapping { | ||
|
|
||
| @Override | ||
| protected Object getHandlerInternal(HttpServletRequest request) throws Exception { | ||
| return new SimpleHandler(); | ||
| } | ||
| } | ||
|
|
||
| class SimpleHandler extends WebContentGenerator implements HttpRequestHandler { | ||
|
|
||
| public SimpleHandler() { | ||
| super(METHOD_GET); | ||
| } | ||
|
|
||
| @Override | ||
| public void handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { | ||
| response.setStatus(HttpStatus.OK.value()); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters