DefaultWebFilterChain is a top-level, public class
Issue: SPR-15348
This commit is contained in:
@@ -16,18 +16,16 @@
|
||||
|
||||
package org.springframework.web.server.handler;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.server.reactive.HttpHandler;
|
||||
import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
|
||||
import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
|
||||
import org.springframework.web.server.ServerWebExchange;
|
||||
@@ -49,89 +47,86 @@ public class FilteringWebHandlerTests {
|
||||
|
||||
private static Log logger = LogFactory.getLog(FilteringWebHandlerTests.class);
|
||||
|
||||
private MockServerHttpRequest request;
|
||||
|
||||
private MockServerHttpResponse response;
|
||||
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
this.request = MockServerHttpRequest.get("http://localhost").build();
|
||||
this.response = new MockServerHttpResponse();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void multipleFilters() throws Exception {
|
||||
StubWebHandler webHandler = new StubWebHandler();
|
||||
|
||||
TestFilter filter1 = new TestFilter();
|
||||
TestFilter filter2 = new TestFilter();
|
||||
TestFilter filter3 = new TestFilter();
|
||||
HttpHandler httpHandler = createHttpHandler(webHandler, filter1, filter2, filter3);
|
||||
httpHandler.handle(this.request, this.response).block();
|
||||
StubWebHandler targetHandler = new StubWebHandler();
|
||||
|
||||
new FilteringWebHandler(targetHandler, Arrays.asList(filter1, filter2, filter3))
|
||||
.handle(MockServerHttpRequest.get("/").toExchange())
|
||||
.block(Duration.ZERO);
|
||||
|
||||
assertTrue(filter1.invoked());
|
||||
assertTrue(filter2.invoked());
|
||||
assertTrue(filter3.invoked());
|
||||
assertTrue(webHandler.invoked());
|
||||
assertTrue(targetHandler.invoked());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void zeroFilters() throws Exception {
|
||||
StubWebHandler webHandler = new StubWebHandler();
|
||||
HttpHandler httpHandler = createHttpHandler(webHandler);
|
||||
httpHandler.handle(this.request, this.response).block();
|
||||
|
||||
assertTrue(webHandler.invoked());
|
||||
StubWebHandler targetHandler = new StubWebHandler();
|
||||
|
||||
new FilteringWebHandler(targetHandler, Collections.emptyList())
|
||||
.handle(MockServerHttpRequest.get("/").toExchange())
|
||||
.block(Duration.ZERO);
|
||||
|
||||
assertTrue(targetHandler.invoked());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shortcircuitFilter() throws Exception {
|
||||
StubWebHandler webHandler = new StubWebHandler();
|
||||
|
||||
TestFilter filter1 = new TestFilter();
|
||||
ShortcircuitingFilter filter2 = new ShortcircuitingFilter();
|
||||
TestFilter filter3 = new TestFilter();
|
||||
HttpHandler httpHandler = createHttpHandler(webHandler, filter1, filter2, filter3);
|
||||
httpHandler.handle(this.request, this.response).block();
|
||||
StubWebHandler targetHandler = new StubWebHandler();
|
||||
|
||||
new FilteringWebHandler(targetHandler, Arrays.asList(filter1, filter2, filter3))
|
||||
.handle(MockServerHttpRequest.get("/").toExchange())
|
||||
.block(Duration.ZERO);
|
||||
|
||||
assertTrue(filter1.invoked());
|
||||
assertTrue(filter2.invoked());
|
||||
assertFalse(filter3.invoked());
|
||||
assertFalse(webHandler.invoked());
|
||||
assertFalse(targetHandler.invoked());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void asyncFilter() throws Exception {
|
||||
StubWebHandler webHandler = new StubWebHandler();
|
||||
|
||||
AsyncFilter filter = new AsyncFilter();
|
||||
HttpHandler httpHandler = createHttpHandler(webHandler, filter);
|
||||
httpHandler.handle(this.request, this.response).block();
|
||||
StubWebHandler targetHandler = new StubWebHandler();
|
||||
|
||||
new FilteringWebHandler(targetHandler, Collections.singletonList(filter))
|
||||
.handle(MockServerHttpRequest.get("/").toExchange())
|
||||
.block(Duration.ZERO);
|
||||
|
||||
assertTrue(filter.invoked());
|
||||
assertTrue(webHandler.invoked());
|
||||
assertTrue(targetHandler.invoked());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleErrorFromFilter() throws Exception {
|
||||
|
||||
MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
|
||||
MockServerHttpResponse response = new MockServerHttpResponse();
|
||||
|
||||
TestExceptionHandler exceptionHandler = new TestExceptionHandler();
|
||||
List<ExceptionFilter> filters = Collections.singletonList(new ExceptionFilter());
|
||||
List<WebExceptionHandler> exceptionHandlers = Collections.singletonList(exceptionHandler);
|
||||
|
||||
WebHttpHandlerBuilder.webHandler(new StubWebHandler())
|
||||
.filters(filters).exceptionHandlers(exceptionHandlers).build()
|
||||
.handle(this.request, this.response)
|
||||
.filters(Collections.singletonList(new ExceptionFilter()))
|
||||
.exceptionHandlers(Collections.singletonList(exceptionHandler)).build()
|
||||
.handle(request, response)
|
||||
.block();
|
||||
|
||||
assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, this.response.getStatusCode());
|
||||
|
||||
Throwable savedException = exceptionHandler.ex;
|
||||
assertNotNull(savedException);
|
||||
assertEquals("boo", savedException.getMessage());
|
||||
}
|
||||
|
||||
|
||||
private HttpHandler createHttpHandler(StubWebHandler webHandler, WebFilter... filters) {
|
||||
return WebHttpHandlerBuilder.webHandler(webHandler).filters(Arrays.asList(filters)).build();
|
||||
assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
|
||||
assertNotNull(exceptionHandler.ex);
|
||||
assertEquals("boo", exceptionHandler.ex.getMessage());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user