Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WebHttpHandlerBuilder retains ApplicationContext in copy constructor

Browse Source 
Issue: SPR-16972
This commit is contained in:
Juergen Hoeller
2018-06-25 18:12:12 +02:00
parent 853d30df26
commit 2a15962d7f
2 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -36,10 +36,8 @@ import org.springframework.web.server.WebExceptionHandler;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebHandler;
import static java.time.Duration.ofMillis;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static java.time.Duration.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link WebHttpHandlerBuilder}.
@@ -48,13 +46,12 @@ import static org.junit.Assert.assertTrue;
public class WebHttpHandlerBuilderTests {
@Test // SPR-15074
public void orderedWebFilterBeans() throws Exception {
public void orderedWebFilterBeans() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
context.register(OrderedWebFilterBeanConfig.class);
context.refresh();
HttpHandler httpHandler = WebHttpHandlerBuilder.applicationContext(context).build();
assertTrue(httpHandler instanceof HttpWebHandlerAdapter);
assertSame(context, ((HttpWebHandlerAdapter) httpHandler).getApplicationContext());
@@ -66,13 +63,12 @@ public class WebHttpHandlerBuilderTests {
}
@Test // SPR-15074
public void orderedWebExceptionHandlerBeans() throws Exception {
public void orderedWebExceptionHandlerBeans() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
context.register(OrderedExceptionHandlerBeanConfig.class);
context.refresh();
HttpHandler httpHandler = WebHttpHandlerBuilder.applicationContext(context).build();
MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
MockServerHttpResponse response = new MockServerHttpResponse();
httpHandler.handle(request, response).block(ofMillis(5000));
@@ -81,13 +77,12 @@ public class WebHttpHandlerBuilderTests {
}
@Test
public void configWithoutFilters() throws Exception {
public void configWithoutFilters() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
context.register(NoFilterConfig.class);
context.refresh();
HttpHandler httpHandler = WebHttpHandlerBuilder.applicationContext(context).build();
MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
MockServerHttpResponse response = new MockServerHttpResponse();
httpHandler.handle(request, response).block(ofMillis(5000));
@@ -95,6 +90,17 @@ public class WebHttpHandlerBuilderTests {
assertEquals("handled", response.getBodyAsString().block(ofMillis(5000)));
}
@Test // SPR-16972
public void cloneWithApplicationContext() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
context.register(NoFilterConfig.class);
context.refresh();
WebHttpHandlerBuilder builder = WebHttpHandlerBuilder.applicationContext(context);
assertSame(context, ((HttpWebHandlerAdapter) builder.build()).getApplicationContext());
assertSame(context, ((HttpWebHandlerAdapter) builder.clone().build()).getApplicationContext());
}
private static Mono<Void> writeToResponse(ServerWebExchange exchange, String value) {
byte[] bytes = value.getBytes(StandardCharsets.UTF_8);