From ad4be9462bf575ebcb9eacfd03d071a9669049cb Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 8 Dec 2015 12:10:49 -0500 Subject: [PATCH] Drop use of WebApplicationContext in tests It brings along Servlet imports. --- ...mpleUrlHandlerMappingIntegrationTests.java | 10 +++++----- .../RequestMappingHandlerMappingTests.java | 4 ++-- .../RequestMappingIntegrationTests.java | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java index 21a8579e24a..4ffb123a281 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java @@ -27,17 +27,17 @@ import org.reactivestreams.Publisher; import reactor.io.buffer.Buffer; import reactor.rx.Streams; +import org.springframework.context.support.StaticApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; +import org.springframework.http.server.AbstractHttpHandlerIntegrationTests; +import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.reactive.DispatcherHandler; -import org.springframework.http.server.AbstractHttpHandlerIntegrationTests; -import org.springframework.http.server.reactive.HttpHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.web.context.support.StaticWebApplicationContext; +import org.springframework.web.reactive.DispatcherHandler; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -54,7 +54,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler @Override protected HttpHandler createHttpHandler() { - StaticWebApplicationContext wac = new StaticWebApplicationContext(); + StaticApplicationContext wac = new StaticApplicationContext(); wac.registerSingleton("hm", TestHandlerMapping.class); wac.registerSingleton("ha", HttpHandlerAdapter.class); wac.registerSingleton("rh", SimpleHandlerResultHandler.class); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java index 62eb6bf69d7..f3eac335275 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java @@ -27,13 +27,13 @@ import org.junit.Test; import org.reactivestreams.Publisher; import reactor.rx.Streams; +import org.springframework.context.support.StaticApplicationContext; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.support.StaticWebApplicationContext; import org.springframework.web.method.HandlerMethod; import static org.junit.Assert.assertEquals; @@ -49,7 +49,7 @@ public class RequestMappingHandlerMappingTests { @Before public void setup() { - StaticWebApplicationContext wac = new StaticWebApplicationContext(); + StaticApplicationContext wac = new StaticApplicationContext(); wac.registerSingleton("handlerMapping", RequestMappingHandlerMapping.class); wac.registerSingleton("controller", TestController.class); wac.refresh(); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java index 9d062cfb9fb..e10e22fd315 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java @@ -33,10 +33,15 @@ import reactor.rx.Streams; import rx.Observable; import rx.Single; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ResolvableType; +import org.springframework.core.codec.support.ByteBufferEncoder; +import org.springframework.core.codec.support.JacksonJsonEncoder; +import org.springframework.core.codec.support.JsonObjectEncoder; +import org.springframework.core.codec.support.StringEncoder; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.core.convert.support.ReactiveStreamsToCompletableFutureConverter; @@ -46,12 +51,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; -import org.springframework.core.codec.support.ByteBufferEncoder; -import org.springframework.core.codec.support.JacksonJsonEncoder; -import org.springframework.core.codec.support.JsonObjectEncoder; -import org.springframework.core.codec.support.StringEncoder; -import org.springframework.web.reactive.DispatcherHandler; -import org.springframework.web.reactive.handler.SimpleHandlerResultHandler; import org.springframework.http.server.AbstractHttpHandlerIntegrationTests; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.stereotype.Controller; @@ -60,7 +59,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.client.RestTemplate; -import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.reactive.DispatcherHandler; +import org.springframework.web.reactive.handler.SimpleHandlerResultHandler; import static org.junit.Assert.assertEquals; @@ -71,12 +71,12 @@ import static org.junit.Assert.assertEquals; */ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrationTests { - private AnnotationConfigWebApplicationContext wac; + private AnnotationConfigApplicationContext wac; @Override protected HttpHandler createHttpHandler() { - this.wac = new AnnotationConfigWebApplicationContext(); + this.wac = new AnnotationConfigApplicationContext(); this.wac.register(FrameworkConfig.class, ApplicationConfig.class); this.wac.refresh(); @@ -474,7 +474,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati @RequestMapping("/observable-create") public Observable observableCreate(@RequestBody Observable personStream) { - return personStream.toList().doOnNext(p -> persons.addAll(p)).flatMap(document -> Observable.empty()); + return personStream.toList().doOnNext(persons::addAll).flatMap(document -> Observable.empty()); } //TODO add mixed and T request mappings tests