From 81867fa4237643ca3eae24a8f085bc4b5f9443b3 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 13 Nov 2015 17:49:31 -0500 Subject: [PATCH] Refactor package structure for web The web related code is now under org.springframework.web.reactive. This is parallel to org.springframework.web (the top-level package of spring-webmvc). --- .../reactive}/DispatcherHandler.java | 3 +-- .../dispatch => web/reactive}/HandlerAdapter.java | 2 +- .../dispatch => web/reactive}/HandlerMapping.java | 2 +- .../dispatch => web/reactive}/HandlerResult.java | 2 +- .../reactive}/HandlerResultHandler.java | 2 +- .../web/http => web/reactive}/HttpHandler.java | 2 +- .../reactive}/handler/HttpHandlerAdapter.java | 11 ++++++----- .../handler}/SimpleHandlerResultHandler.java | 4 +++- .../reactive}/handler/SimpleUrlHandlerMapping.java | 4 ++-- .../method/HandlerMethodArgumentResolver.java | 2 +- .../reactive}/method/InvocableHandlerMethod.java | 2 +- .../annotation/RequestBodyArgumentResolver.java | 4 ++-- .../annotation/RequestMappingHandlerAdapter.java | 10 +++++----- .../annotation/RequestMappingHandlerMapping.java | 5 ++--- .../annotation/RequestParamArgumentResolver.java | 4 ++-- .../annotation/ResponseBodyResultHandler.java | 6 +++--- .../reactor/PublisherReactorServerHttpRequest.java | 2 +- .../PublisherReactorServerHttpResponse.java | 2 +- .../server}/reactor/ReactorServerHttpRequest.java | 2 +- .../server}/reactor/ReactorServerHttpResponse.java | 2 +- .../server}/reactor/RequestHandlerAdapter.java | 4 ++-- .../server}/rxnetty/RequestHandlerAdapter.java | 4 ++-- .../server}/rxnetty/RxNettyServerHttpRequest.java | 2 +- .../server}/rxnetty/RxNettyServerHttpResponse.java | 2 +- .../server}/servlet/AsyncContextSynchronizer.java | 2 +- .../server}/servlet/HttpHandlerServlet.java | 4 ++-- .../server}/servlet/RequestBodyPublisher.java | 2 +- .../server}/servlet/ResponseBodySubscriber.java | 2 +- .../server}/servlet/ServletServerHttpRequest.java | 2 +- .../server}/servlet/ServletServerHttpResponse.java | 2 +- .../server}/undertow/RequestBodyPublisher.java | 2 +- .../server}/undertow/ResponseBodySubscriber.java | 2 +- .../undertow/UndertowHttpHandlerAdapter.java | 6 +++--- .../undertow/UndertowServerHttpRequest.java | 2 +- .../undertow/UndertowServerHttpResponse.java | 2 +- .../AbstractHttpHandlerIntegrationTests.java | 14 ++++++++------ .../springframework/web/reactive}/HttpServer.java | 3 ++- .../web/reactive}/HttpServerSupport.java | 4 +++- .../web/reactive}/JettyHttpServer.java | 5 ++--- .../web/reactive}/ReactorHttpServer.java | 5 ++--- .../web/reactive}/RxNettyHttpServer.java | 5 ++--- .../web/reactive}/TomcatHttpServer.java | 5 ++--- .../web/reactive}/UndertowHttpServer.java | 5 ++--- .../http => web/reactive/handler}/EchoHandler.java | 3 ++- .../handler}/EchoHandlerIntegrationTests.java | 3 ++- .../reactive/handler}/RandomHandler.java | 3 ++- .../handler}/RandomHandlerIntegrationTests.java | 3 ++- .../handler}/SimpleHandlerResultHandlerTests.java | 4 +++- .../SimpleUrlHandlerMappingIntegrationTests.java | 9 ++++----- .../http => web/reactive/handler}/XmlHandler.java | 3 ++- .../handler}/XmlHandlerIntegrationTests.java | 4 +++- .../RequestMappingHandlerMappingTests.java | 3 ++- .../annotation/RequestMappingIntegrationTests.java | 10 +++++----- .../annotation/ResponseBodyResultHandlerTests.java | 5 +++-- .../servlet/AsyncContextSynchronizerTests.java | 4 +++- 55 files changed, 113 insertions(+), 100 deletions(-) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/DispatcherHandler.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/HandlerAdapter.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/HandlerMapping.java (94%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/HandlerResult.java (96%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/HandlerResultHandler.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive}/HttpHandler.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/handler/HttpHandlerAdapter.java (85%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive/handler}/SimpleHandlerResultHandler.java (92%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/handler/SimpleUrlHandlerMapping.java (90%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/HandlerMethodArgumentResolver.java (95%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/InvocableHandlerMethod.java (99%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/RequestBodyArgumentResolver.java (95%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/RequestMappingHandlerAdapter.java (90%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/RequestMappingHandlerMapping.java (96%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/RequestParamArgumentResolver.java (92%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/ResponseBodyResultHandler.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/reactor/PublisherReactorServerHttpRequest.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/reactor/PublisherReactorServerHttpResponse.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/reactor/ReactorServerHttpRequest.java (95%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/reactor/ReactorServerHttpResponse.java (95%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/reactor/RequestHandlerAdapter.java (94%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/rxnetty/RequestHandlerAdapter.java (93%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/rxnetty/RxNettyServerHttpRequest.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/rxnetty/RxNettyServerHttpResponse.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/servlet/AsyncContextSynchronizer.java (98%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/servlet/HttpHandlerServlet.java (96%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/servlet/RequestBodyPublisher.java (98%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/servlet/ResponseBodySubscriber.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/servlet/ServletServerHttpRequest.java (98%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/servlet/ServletServerHttpResponse.java (98%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/undertow/RequestBodyPublisher.java (98%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/undertow/ResponseBodySubscriber.java (98%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/undertow/UndertowHttpHandlerAdapter.java (92%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/undertow/UndertowServerHttpRequest.java (97%) rename spring-web-reactive/src/main/java/org/springframework/{reactive/web/http => web/reactive/server}/undertow/UndertowServerHttpResponse.java (97%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive}/AbstractHttpHandlerIntegrationTests.java (78%) rename spring-web-reactive/src/{main/java/org/springframework/reactive/web/http => test/java/org/springframework/web/reactive}/HttpServer.java (90%) rename spring-web-reactive/src/{main/java/org/springframework/reactive/web/http => test/java/org/springframework/web/reactive}/HttpServerSupport.java (91%) rename spring-web-reactive/src/{main/java/org/springframework/reactive/web/http/servlet => test/java/org/springframework/web/reactive}/JettyHttpServer.java (92%) rename spring-web-reactive/src/{main/java/org/springframework/reactive/web/http/reactor => test/java/org/springframework/web/reactive}/ReactorHttpServer.java (91%) rename spring-web-reactive/src/{main/java/org/springframework/reactive/web/http/rxnetty => test/java/org/springframework/web/reactive}/RxNettyHttpServer.java (90%) rename spring-web-reactive/src/{main/java/org/springframework/reactive/web/http/servlet => test/java/org/springframework/web/reactive}/TomcatHttpServer.java (92%) rename spring-web-reactive/src/{main/java/org/springframework/reactive/web/http/undertow => test/java/org/springframework/web/reactive}/UndertowHttpServer.java (90%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive/handler}/EchoHandler.java (91%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive/handler}/EchoHandlerIntegrationTests.java (95%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive/handler}/RandomHandler.java (95%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive/handler}/RandomHandlerIntegrationTests.java (93%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/dispatch => web/reactive/handler}/SimpleHandlerResultHandlerTests.java (92%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/dispatch => web/reactive}/handler/SimpleUrlHandlerMappingIntegrationTests.java (91%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive/handler}/XmlHandler.java (96%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive/handler}/XmlHandlerIntegrationTests.java (91%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/RequestMappingHandlerMappingTests.java (96%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/RequestMappingIntegrationTests.java (97%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/dispatch => web/reactive}/method/annotation/ResponseBodyResultHandlerTests.java (92%) rename spring-web-reactive/src/test/java/org/springframework/{reactive/web/http => web/reactive/server}/servlet/AsyncContextSynchronizerTests.java (90%) diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java index 51c9945e81..eabcfcf16d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch; +package org.springframework.web.reactive; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,6 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.http.HttpStatus; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; -import org.springframework.reactive.web.http.HttpHandler; /** * Central dispatcher for HTTP request handlers/controllers. Dispatches to registered diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java index f9788ffb15..605676a56b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch; +package org.springframework.web.reactive; import org.reactivestreams.Publisher; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerMapping.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java index 2a087989a7..89e11f6521 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch; +package org.springframework.web.reactive; import org.springframework.http.server.ReactiveServerHttpRequest; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java index 7fa18753a4..b2e921e143 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch; +package org.springframework.web.reactive; import org.springframework.core.ResolvableType; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResultHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java index 3f3b593dca..91a3cb3535 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch; +package org.springframework.web.reactive; import org.reactivestreams.Publisher; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HttpHandler.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/HttpHandler.java index ff86a9a722..9f97ce023d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HttpHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive; import org.reactivestreams.Publisher; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerAdapter.java similarity index 85% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerAdapter.java index 9e23b256b1..22f3375203 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/HttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.handler; +package org.springframework.web.reactive.handler; import org.reactivestreams.Publisher; import reactor.Publishers; @@ -22,13 +22,14 @@ import reactor.Publishers; import org.springframework.core.ResolvableType; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; -import org.springframework.reactive.web.dispatch.HandlerAdapter; -import org.springframework.reactive.web.dispatch.HandlerResult; -import org.springframework.reactive.web.http.HttpHandler; +import org.springframework.web.reactive.HandlerAdapter; +import org.springframework.web.reactive.HandlerResult; +import org.springframework.web.reactive.HttpHandler; +import org.springframework.web.reactive.DispatcherHandler; /** * Support use of {@link HttpHandler} with - * {@link org.springframework.reactive.web.dispatch.DispatcherHandler + * {@link DispatcherHandler * DispatcherHandler} (which implements the same contract). * The use of {@code DispatcherHandler} this way enables routing requests to * one of many {@code HttpHandler} instances depending on the configured diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java index 86e130f0db..628ac443b5 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch; +package org.springframework.web.reactive.handler; import java.util.Arrays; @@ -25,6 +25,8 @@ import org.springframework.core.Ordered; import org.springframework.core.ResolvableType; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; +import org.springframework.web.reactive.HandlerResult; +import org.springframework.web.reactive.HandlerResultHandler; /** * Supports {@link HandlerResult} with a {@code Publisher} value. diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java similarity index 90% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMapping.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java index c49f9fa0c5..8e1c906dd2 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.handler; +package org.springframework.web.reactive.handler; import java.util.HashMap; import java.util.Map; import org.springframework.http.server.ReactiveServerHttpRequest; -import org.springframework.reactive.web.dispatch.HandlerMapping; +import org.springframework.web.reactive.HandlerMapping; /** * @author Rossen Stoyanchev diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/HandlerMethodArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/HandlerMethodArgumentResolver.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java index a7b5b16f95..b2b018904c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/HandlerMethodArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method; +package org.springframework.web.reactive.method; import org.reactivestreams.Publisher; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/InvocableHandlerMethod.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java similarity index 99% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/InvocableHandlerMethod.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java index 29dc84358e..b996faf811 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/InvocableHandlerMethod.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method; +package org.springframework.web.reactive.method; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestBodyArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestBodyArgumentResolver.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java index fab1615b35..853494d410 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestBodyArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.nio.ByteBuffer; import java.util.List; @@ -28,7 +28,7 @@ import org.springframework.core.convert.ConversionService; import org.springframework.http.MediaType; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.reactive.codec.decoder.Decoder; -import org.springframework.reactive.web.dispatch.method.HandlerMethodArgumentResolver; +import org.springframework.web.reactive.method.HandlerMethodArgumentResolver; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.RequestBody; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java similarity index 90% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java index f840cc5b78..e58f894289 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.util.ArrayList; import java.util.Arrays; @@ -33,10 +33,10 @@ import org.springframework.reactive.codec.decoder.Decoder; import org.springframework.reactive.codec.decoder.JacksonJsonDecoder; import org.springframework.reactive.codec.decoder.JsonObjectDecoder; import org.springframework.reactive.codec.decoder.StringDecoder; -import org.springframework.reactive.web.dispatch.HandlerAdapter; -import org.springframework.reactive.web.dispatch.HandlerResult; -import org.springframework.reactive.web.dispatch.method.HandlerMethodArgumentResolver; -import org.springframework.reactive.web.dispatch.method.InvocableHandlerMethod; +import org.springframework.web.reactive.HandlerAdapter; +import org.springframework.web.reactive.HandlerResult; +import org.springframework.web.reactive.method.HandlerMethodArgumentResolver; +import org.springframework.web.reactive.method.InvocableHandlerMethod; import org.springframework.web.method.HandlerMethod; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMapping.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java index c67acd65cf..8fa2c682be 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.util.Arrays; import java.util.Collection; @@ -32,9 +32,8 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.http.HttpMethod; import org.springframework.http.server.ReactiveServerHttpRequest; -import org.springframework.reactive.web.dispatch.HandlerMapping; +import org.springframework.web.reactive.HandlerMapping; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestParamArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestParamArgumentResolver.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java index 124f840b13..909adb598b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestParamArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.util.Optional; @@ -24,7 +24,7 @@ import reactor.Publishers; import org.springframework.core.MethodParameter; import org.springframework.http.server.ReactiveServerHttpRequest; -import org.springframework.reactive.web.dispatch.method.HandlerMethodArgumentResolver; +import org.springframework.web.reactive.method.HandlerMethodArgumentResolver; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java index df6d3e764f..95e511979a 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.lang.reflect.Method; import java.util.ArrayList; @@ -35,8 +35,8 @@ import org.springframework.http.MediaType; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; import org.springframework.reactive.codec.encoder.Encoder; -import org.springframework.reactive.web.dispatch.HandlerResult; -import org.springframework.reactive.web.dispatch.HandlerResultHandler; +import org.springframework.web.reactive.HandlerResult; +import org.springframework.web.reactive.HandlerResultHandler; import org.springframework.util.Assert; import org.springframework.util.MimeType; import org.springframework.web.HttpMediaTypeNotAcceptableException; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpRequest.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpRequest.java index 81c761230b..d0c319216c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.http.reactor; +package org.springframework.web.reactive.server.reactor; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpResponse.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpResponse.java index d6b25ba454..78a820a2da 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.http.reactor; +package org.springframework.web.reactive.server.reactor; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpRequest.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpRequest.java index 7dff1f2b7c..ad6913d333 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.reactor; +package org.springframework.web.reactive.server.reactor; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpResponse.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpResponse.java index 831e0f2478..fdf8c4bf3e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.reactor; +package org.springframework.web.reactive.server.reactor; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/RequestHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/RequestHandlerAdapter.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/RequestHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/RequestHandlerAdapter.java index 2e6d120794..1b70426bbb 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/RequestHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/RequestHandlerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.http.reactor; +package org.springframework.web.reactive.server.reactor; import org.reactivestreams.Publisher; import reactor.core.publisher.convert.DependencyUtils; @@ -21,7 +21,7 @@ import reactor.io.buffer.Buffer; import reactor.io.net.ReactiveChannelHandler; import reactor.io.net.http.HttpChannel; -import org.springframework.reactive.web.http.HttpHandler; +import org.springframework.web.reactive.HttpHandler; import org.springframework.util.Assert; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RequestHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RequestHandlerAdapter.java similarity index 93% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RequestHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RequestHandlerAdapter.java index 1a8fea2b8f..0448e99be4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RequestHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RequestHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.rxnetty; +package org.springframework.web.reactive.server.rxnetty; import io.netty.buffer.ByteBuf; import io.reactivex.netty.protocol.http.server.HttpServerRequest; @@ -24,7 +24,7 @@ import org.reactivestreams.Publisher; import reactor.core.publisher.convert.RxJava1Converter; import rx.Observable; -import org.springframework.reactive.web.http.HttpHandler; +import org.springframework.web.reactive.HttpHandler; import org.springframework.util.Assert; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpRequest.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpRequest.java index 5f3be593e6..48be0c222d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.rxnetty; +package org.springframework.web.reactive.server.rxnetty; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpResponse.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpResponse.java index 4233be995c..9a51590e52 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.rxnetty; +package org.springframework.web.reactive.server.rxnetty; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizer.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizer.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizer.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizer.java index 65240b963c..8bb6d36004 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizer.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive.server.servlet; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/HttpHandlerServlet.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/HttpHandlerServlet.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/HttpHandlerServlet.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/HttpHandlerServlet.java index 63563aba43..0b91603bec 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/HttpHandlerServlet.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/HttpHandlerServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive.server.servlet; import java.io.IOException; import javax.servlet.AsyncContext; @@ -30,7 +30,7 @@ import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import org.springframework.http.HttpStatus; -import org.springframework.reactive.web.http.HttpHandler; +import org.springframework.web.reactive.HttpHandler; /** * @author Arjen Poutsma diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/RequestBodyPublisher.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/RequestBodyPublisher.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/RequestBodyPublisher.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/RequestBodyPublisher.java index 12368fc183..e22560d325 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/RequestBodyPublisher.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/RequestBodyPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive.server.servlet; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ResponseBodySubscriber.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ResponseBodySubscriber.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ResponseBodySubscriber.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ResponseBodySubscriber.java index 4d7ca62011..028e4aa4ba 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ResponseBodySubscriber.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ResponseBodySubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive.server.servlet; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpRequest.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpRequest.java index 34aca4ee29..407474a4e8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive.server.servlet; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpResponse.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpResponse.java index 3a9949eb5b..25709e4000 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive.server.servlet; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/RequestBodyPublisher.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/RequestBodyPublisher.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/RequestBodyPublisher.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/RequestBodyPublisher.java index db0a0e89e7..5c1b567b20 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/RequestBodyPublisher.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/RequestBodyPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.undertow; +package org.springframework.web.reactive.server.undertow; import static org.xnio.IoUtils.safeClose; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/ResponseBodySubscriber.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/ResponseBodySubscriber.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/ResponseBodySubscriber.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/ResponseBodySubscriber.java index b78a687fa6..d362085095 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/ResponseBodySubscriber.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/ResponseBodySubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.undertow; +package org.springframework.web.reactive.server.undertow; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowHttpHandlerAdapter.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowHttpHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowHttpHandlerAdapter.java index 92ad9ff3f0..365aed0054 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowHttpHandlerAdapter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.undertow; +package org.springframework.web.reactive.server.undertow; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; -import org.springframework.reactive.web.http.HttpHandler; +import org.springframework.web.reactive.HttpHandler; import org.springframework.util.Assert; import io.undertow.server.HttpServerExchange; @@ -32,7 +32,7 @@ import org.reactivestreams.Subscription; * @author Marek Hawrylczak * @author Rossen Stoyanchev */ -class UndertowHttpHandlerAdapter implements io.undertow.server.HttpHandler { +public class UndertowHttpHandlerAdapter implements io.undertow.server.HttpHandler { private static Log logger = LogFactory.getLog(UndertowHttpHandlerAdapter.class); diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpRequest.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpRequest.java index 6f856595f3..4d68be46ba 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.undertow; +package org.springframework.web.reactive.server.undertow; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpResponse.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpResponse.java index 5efe890de1..0897492291 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.undertow; +package org.springframework.web.reactive.server.undertow; import java.nio.ByteBuffer; import java.util.List; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/AbstractHttpHandlerIntegrationTests.java similarity index 78% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/AbstractHttpHandlerIntegrationTests.java index 41136ac8b0..96b694bdac 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/AbstractHttpHandlerIntegrationTests.java @@ -14,19 +14,21 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive; import org.junit.After; import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.springframework.reactive.web.http.reactor.ReactorHttpServer; -import org.springframework.reactive.web.http.rxnetty.RxNettyHttpServer; -import org.springframework.reactive.web.http.servlet.JettyHttpServer; -import org.springframework.reactive.web.http.servlet.TomcatHttpServer; -import org.springframework.reactive.web.http.undertow.UndertowHttpServer; +import org.springframework.web.reactive.HttpServer; +import org.springframework.web.reactive.ReactorHttpServer; +import org.springframework.web.reactive.RxNettyHttpServer; +import org.springframework.web.reactive.JettyHttpServer; +import org.springframework.web.reactive.TomcatHttpServer; +import org.springframework.web.reactive.UndertowHttpServer; import org.springframework.util.SocketUtils; +import org.springframework.web.reactive.HttpHandler; @RunWith(Parameterized.class) diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServer.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServer.java similarity index 90% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServer.java index 6006e97422..f869d33b04 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServer.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.Lifecycle; +import org.springframework.web.reactive.HttpHandler; /** * @author Rossen Stoyanchev diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServerSupport.java similarity index 91% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServerSupport.java index f7aa9aae8b..71704f408e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServerSupport.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive; +import org.springframework.web.reactive.HttpHandler; + /** * @author Rossen Stoyanchev */ diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/JettyHttpServer.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/JettyHttpServer.java index 4acad5dfe7..a7f5ec7524 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/JettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -22,10 +22,9 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.springframework.beans.factory.InitializingBean; -import org.springframework.reactive.web.http.HttpServer; -import org.springframework.reactive.web.http.HttpServerSupport; import org.springframework.util.Assert; import org.springframework.util.SocketUtils; +import org.springframework.web.reactive.server.servlet.HttpHandlerServlet; /** * @author Rossen Stoyanchev diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/ReactorHttpServer.java similarity index 91% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/ReactorHttpServer.java index 5528fea3a8..a824f85686 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/ReactorHttpServer.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.reactor; +package org.springframework.web.reactive; import reactor.io.buffer.Buffer; import reactor.io.net.ReactiveNet; import org.springframework.beans.factory.InitializingBean; -import org.springframework.reactive.web.http.HttpServer; -import org.springframework.reactive.web.http.HttpServerSupport; import org.springframework.util.Assert; +import org.springframework.web.reactive.server.reactor.RequestHandlerAdapter; /** * @author Stephane Maldini diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/RxNettyHttpServer.java similarity index 90% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/RxNettyHttpServer.java index 21dc109a2a..a7cc2fc2a8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/RxNettyHttpServer.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.rxnetty; +package org.springframework.web.reactive; import io.netty.buffer.ByteBuf; import org.springframework.beans.factory.InitializingBean; -import org.springframework.reactive.web.http.HttpServer; -import org.springframework.reactive.web.http.HttpServerSupport; import org.springframework.util.Assert; +import org.springframework.web.reactive.server.rxnetty.RequestHandlerAdapter; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/TomcatHttpServer.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/TomcatHttpServer.java index 472a74afc3..c1c588696c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/TomcatHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive; import java.io.File; @@ -23,10 +23,9 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.startup.Tomcat; import org.springframework.beans.factory.InitializingBean; -import org.springframework.reactive.web.http.HttpServer; -import org.springframework.reactive.web.http.HttpServerSupport; import org.springframework.util.Assert; import org.springframework.util.SocketUtils; +import org.springframework.web.reactive.server.servlet.HttpHandlerServlet; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/UndertowHttpServer.java similarity index 90% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/UndertowHttpServer.java index b55fa2201f..511490ab86 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/UndertowHttpServer.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.undertow; +package org.springframework.web.reactive; import org.springframework.beans.factory.InitializingBean; -import org.springframework.reactive.web.http.HttpServer; -import org.springframework.reactive.web.http.HttpServerSupport; import org.springframework.util.Assert; +import org.springframework.web.reactive.server.undertow.UndertowHttpHandlerAdapter; import io.undertow.Undertow; import io.undertow.server.HttpHandler; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandler.java similarity index 91% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandler.java index 907191b95f..a3013c131a 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandler.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive.handler; import org.reactivestreams.Publisher; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; +import org.springframework.web.reactive.HttpHandler; /** * @author Arjen Poutsma diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandlerIntegrationTests.java similarity index 95% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandlerIntegrationTests.java index 270aa1a9da..811d53f812 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandlerIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive.handler; import java.net.URI; import java.util.Random; @@ -24,6 +24,7 @@ import org.junit.Test; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; +import org.springframework.web.reactive.AbstractHttpHandlerIntegrationTests; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandler.java similarity index 95% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandler.java index 79a87fd76e..53f300686c 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive.handler; import java.nio.ByteBuffer; import java.util.Random; @@ -29,6 +29,7 @@ import reactor.rx.Streams; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; +import org.springframework.web.reactive.HttpHandler; import static org.junit.Assert.assertEquals; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandlerIntegrationTests.java similarity index 93% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandlerIntegrationTests.java index 3d3e0fdf45..383eb5dfc1 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandlerIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive.handler; import java.net.URI; import java.util.Random; @@ -24,6 +24,7 @@ import org.junit.Test; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; +import org.springframework.web.reactive.AbstractHttpHandlerIntegrationTests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandlerTests.java similarity index 92% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandlerTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandlerTests.java index fbb7bd2d6d..51c0a80ee5 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/SimpleHandlerResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch; +package org.springframework.web.reactive.handler; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -23,6 +23,8 @@ import org.reactivestreams.Publisher; import org.springframework.core.ResolvableType; import org.springframework.web.method.HandlerMethod; +import org.springframework.web.reactive.HandlerResult; +import org.springframework.web.reactive.handler.SimpleHandlerResultHandler; /** * @author Sebastien Deleuze diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java similarity index 91% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java index 34353f8bd4..2e35c4c0ce 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.handler; +package org.springframework.web.reactive.handler; import java.net.URI; import java.nio.charset.Charset; @@ -31,10 +31,9 @@ import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; -import org.springframework.reactive.web.dispatch.DispatcherHandler; -import org.springframework.reactive.web.dispatch.SimpleHandlerResultHandler; -import org.springframework.reactive.web.http.AbstractHttpHandlerIntegrationTests; -import org.springframework.reactive.web.http.HttpHandler; +import org.springframework.web.reactive.DispatcherHandler; +import org.springframework.web.reactive.AbstractHttpHandlerIntegrationTests; +import org.springframework.web.reactive.HttpHandler; import org.springframework.web.client.RestTemplate; import org.springframework.web.context.support.StaticWebApplicationContext; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandler.java similarity index 96% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandler.java index 490cbd4c1b..382759767c 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive.handler; import javax.xml.bind.JAXBContext; import javax.xml.bind.Marshaller; @@ -31,6 +31,7 @@ import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; import org.springframework.reactive.io.BufferOutputStream; import org.springframework.reactive.io.ByteBufferPublisherInputStream; +import org.springframework.web.reactive.HttpHandler; import static org.junit.Assert.fail; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandlerIntegrationTests.java similarity index 91% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandlerIntegrationTests.java index 004cf6fc4a..4dc9347f0d 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandlerIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.http; +package org.springframework.web.reactive.handler; import java.net.URI; import javax.xml.bind.annotation.XmlRootElement; @@ -24,6 +24,8 @@ import org.junit.Test; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; +import org.springframework.web.reactive.AbstractHttpHandlerIntegrationTests; +import org.springframework.web.reactive.HttpHandler; /** * @author Arjen Poutsma diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMappingTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java similarity index 96% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMappingTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java index 9ff435f2b6..c97ac45701 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.net.URI; import java.net.URISyntaxException; @@ -32,6 +32,7 @@ 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 org.springframework.web.reactive.method.annotation.RequestMappingHandlerMapping; import static org.junit.Assert.assertEquals; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java index 180aad81cd..a1887e0390 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.net.URI; @@ -51,10 +51,10 @@ import org.springframework.reactive.codec.encoder.ByteBufferEncoder; import org.springframework.reactive.codec.encoder.JacksonJsonEncoder; import org.springframework.reactive.codec.encoder.JsonObjectEncoder; import org.springframework.reactive.codec.encoder.StringEncoder; -import org.springframework.reactive.web.dispatch.DispatcherHandler; -import org.springframework.reactive.web.dispatch.SimpleHandlerResultHandler; -import org.springframework.reactive.web.http.AbstractHttpHandlerIntegrationTests; -import org.springframework.reactive.web.http.HttpHandler; +import org.springframework.web.reactive.DispatcherHandler; +import org.springframework.web.reactive.handler.SimpleHandlerResultHandler; +import org.springframework.web.reactive.AbstractHttpHandlerIntegrationTests; +import org.springframework.web.reactive.HttpHandler; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandlerTests.java similarity index 92% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandlerTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandlerTests.java index 7bab9e20ca..c8212a0301 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.web.reactive.method.annotation; import java.util.Collections; @@ -24,9 +24,10 @@ import org.reactivestreams.Publisher; import org.springframework.core.ResolvableType; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.reactive.codec.encoder.StringEncoder; -import org.springframework.reactive.web.dispatch.HandlerResult; +import org.springframework.web.reactive.HandlerResult; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.method.HandlerMethod; +import org.springframework.web.reactive.method.annotation.ResponseBodyResultHandler; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizerTests.java similarity index 90% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizerTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizerTests.java index 5dc40c306a..f9897fdb5d 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizerTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.reactive.web.http.servlet; +package org.springframework.web.reactive.server.servlet; import javax.servlet.AsyncContext; import org.junit.Before; import org.junit.Test; +import org.springframework.web.reactive.server.servlet.AsyncContextSynchronizer; + import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.verify;