diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/DispatcherHttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java similarity index 91% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/DispatcherHttpHandler.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java index 781edd006b..84cb8cfb7f 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/DispatcherHttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/DispatcherHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.dispatch; import java.util.ArrayList; import java.util.List; @@ -26,11 +26,14 @@ import reactor.rx.Streams; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.context.ApplicationContext; import org.springframework.http.HttpStatus; +import org.springframework.reactive.web.http.ServerHttpHandler; +import org.springframework.reactive.web.http.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpResponse; /** * @author Rossen Stoyanchev */ -public class DispatcherHttpHandler implements HttpHandler { +public class DispatcherHandler implements ServerHttpHandler { private List handlerMappings; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerAdapter.java similarity index 82% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerAdapter.java index d745ef6dfb..49f778540a 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerAdapter.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.dispatch; import org.reactivestreams.Publisher; +import org.springframework.reactive.web.http.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpResponse; + /** * @author Rossen Stoyanchev */ diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerMapping.java similarity index 86% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerMapping.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerMapping.java index 018e33002c..e3472eba53 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerMapping.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.dispatch; + +import org.springframework.reactive.web.http.ServerHttpRequest; /** * @author Rossen Stoyanchev diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerResult.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerResult.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java index a5403b5961..29a02c00e8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerResult.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.dispatch; /** * @author Rossen Stoyanchev diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResultHandler.java similarity index 83% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerResultHandler.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResultHandler.java index ae18cff9b3..46257e3ec4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HandlerResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/HandlerResultHandler.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.dispatch; import org.reactivestreams.Publisher; +import org.springframework.reactive.web.http.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpResponse; + /** * @author Rossen Stoyanchev */ diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpMessage.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpMessage.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpMessage.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpMessage.java index 6871fcc3b5..0c5477c077 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpMessage.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import java.net.URI; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpRequest.java similarity index 90% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpRequest.java index bffe2f4344..96767fe2fe 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpRequest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import java.net.URI; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpHandler.java similarity index 79% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpHandler.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpHandler.java index 7065344567..d393e45f3d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpHandler.java @@ -14,15 +14,18 @@ * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import org.reactivestreams.Publisher; +import org.springframework.reactive.web.http.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpResponse; + /** * @author Arjen Poutsma * @author Rossen Stoyanchev */ -public interface HttpHandler { +public interface ServerHttpHandler { Publisher handle(ServerHttpRequest request, ServerHttpResponse response); diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/ServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpRequest.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/ServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpRequest.java index 060e2cfd4b..c2e24d2f9c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/ServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import org.reactivestreams.Publisher; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/ServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpResponse.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/ServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpResponse.java index 7ff7c6af5f..a485b898eb 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/ServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/ServerHttpResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import org.reactivestreams.Publisher; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RequestHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RequestHandlerAdapter.java similarity index 87% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RequestHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RequestHandlerAdapter.java index 2a7b7d7413..ec79fa3b4e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RequestHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/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.rxnetty; +package org.springframework.reactive.web.http.rxnetty; import io.netty.buffer.ByteBuf; import io.reactivex.netty.protocol.http.server.HttpServerRequest; @@ -23,7 +23,7 @@ import org.reactivestreams.Publisher; import rx.Observable; import rx.RxReactiveStreams; -import org.springframework.reactive.web.HttpHandler; +import org.springframework.reactive.web.http.ServerHttpHandler; import org.springframework.util.Assert; /** @@ -31,10 +31,10 @@ import org.springframework.util.Assert; */ public class RequestHandlerAdapter implements RequestHandler { - private final HttpHandler httpHandler; + private final ServerHttpHandler httpHandler; - public RequestHandlerAdapter(HttpHandler httpHandler) { + public RequestHandlerAdapter(ServerHttpHandler httpHandler) { Assert.notNull(httpHandler, "'httpHandler' is required."); this.httpHandler = httpHandler; } diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RxNettyServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpRequest.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RxNettyServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpRequest.java index 5dd01a400f..4c80e78c50 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RxNettyServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.rxnetty; +package org.springframework.reactive.web.http.rxnetty; import java.net.URI; import java.net.URISyntaxException; @@ -25,7 +25,7 @@ import rx.Observable; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.reactive.web.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpRequest; import org.springframework.util.Assert; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RxNettyServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java similarity index 94% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RxNettyServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java index d40c07463a..9c41996801 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/rxnetty/RxNettyServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.rxnetty; +package org.springframework.reactive.web.http.rxnetty; import io.netty.handler.codec.http.HttpResponseStatus; import io.reactivex.netty.protocol.http.server.HttpServerResponse; @@ -23,7 +23,7 @@ import rx.RxReactiveStreams; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.reactive.web.ServerHttpResponse; +import org.springframework.reactive.web.http.ServerHttpResponse; import org.springframework.util.Assert; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizer.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizer.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizer.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizer.java index cbb0427e9a..064a12456c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizer.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/HttpHandlerServlet.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/HttpHandlerServlet.java similarity index 93% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/HttpHandlerServlet.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/HttpHandlerServlet.java index 31ff0a7f17..a43a21ceed 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/HttpHandlerServlet.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/HttpHandlerServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import java.io.IOException; import javax.servlet.AsyncContext; @@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import org.springframework.reactive.web.HttpHandler; +import org.springframework.reactive.web.http.ServerHttpHandler; /** * @author Arjen Poutsma @@ -43,10 +43,10 @@ public class HttpHandlerServlet extends HttpServlet { private static Log logger = LogFactory.getLog(HttpHandlerServlet.class); - private HttpHandler handler; + private ServerHttpHandler handler; - public void setHandler(HttpHandler handler) { + public void setHandler(ServerHttpHandler handler) { this.handler = handler; } diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/RequestBodyPublisher.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/RequestBodyPublisher.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/RequestBodyPublisher.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/RequestBodyPublisher.java index 05bf19828c..385efe326e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/RequestBodyPublisher.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/RequestBodyPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import java.io.IOException; import java.nio.charset.Charset; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ResponseBodySubscriber.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ResponseBodySubscriber.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ResponseBodySubscriber.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ResponseBodySubscriber.java index c4a6eefd37..39aaf86974 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ResponseBodySubscriber.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ResponseBodySubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import java.io.IOException; import javax.servlet.ServletOutputStream; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ServletServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpRequest.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ServletServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpRequest.java index f2b1596a30..484d8bd0d8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ServletServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import java.net.URI; import java.net.URISyntaxException; @@ -28,7 +28,7 @@ import org.reactivestreams.Publisher; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.springframework.reactive.web.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpRequest; import org.springframework.util.Assert; import org.springframework.util.LinkedCaseInsensitiveMap; import org.springframework.util.StringUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ServletServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ServletServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java index 6b8b42c536..f4c43fada8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ServletServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import java.util.List; import java.util.Map; @@ -23,7 +23,7 @@ import org.reactivestreams.Publisher; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.reactive.web.ServerHttpResponse; +import org.springframework.reactive.web.http.ServerHttpResponse; import org.springframework.util.Assert; /** diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/DispatcherApp.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/DispatcherApp.java similarity index 91% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/DispatcherApp.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/DispatcherApp.java index 6fac51f692..5004d620b6 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/DispatcherApp.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/DispatcherApp.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.dispatch; import java.nio.charset.Charset; import java.util.HashMap; @@ -25,7 +25,9 @@ import org.reactivestreams.Publisher; import reactor.rx.Streams; import org.springframework.http.MediaType; -import org.springframework.reactive.web.rxnetty.RequestHandlerAdapter; +import org.springframework.reactive.web.http.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpResponse; +import org.springframework.reactive.web.http.rxnetty.RequestHandlerAdapter; import org.springframework.web.context.support.StaticWebApplicationContext; /** @@ -44,7 +46,7 @@ public class DispatcherApp { SimpleUrlHandlerMapping handlerMapping = wac.getBean(SimpleUrlHandlerMapping.class); handlerMapping.addHandler("/text", new HelloWorldTextHandler()); - DispatcherHttpHandler dispatcherHandler = new DispatcherHttpHandler(); + DispatcherHandler dispatcherHandler = new DispatcherHandler(); dispatcherHandler.initStrategies(wac); RequestHandlerAdapter requestHandler = new RequestHandlerAdapter(dispatcherHandler); diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/AbstractHttpHandlerIntegrationTestCase.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTestCase.java similarity index 98% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/AbstractHttpHandlerIntegrationTestCase.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTestCase.java index d818fde298..ff3694992a 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/AbstractHttpHandlerIntegrationTestCase.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import java.net.URI; import java.util.Random; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/CountingHttpHandler.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/CountingHandler.java similarity index 89% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/CountingHttpHandler.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/http/CountingHandler.java index e82512b3b5..f25c994072 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/CountingHttpHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/CountingHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,9 +25,9 @@ import org.reactivestreams.Subscription; /** * @author Arjen Poutsma */ -public class CountingHttpHandler implements HttpHandler { +public class CountingHandler implements ServerHttpHandler { - private static final Log logger = LogFactory.getLog(CountingHttpHandler.class); + private static final Log logger = LogFactory.getLog(CountingHandler.class); @Override public Publisher handle(ServerHttpRequest request, ServerHttpResponse response) { diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/EchoHandler.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java similarity index 74% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/EchoHandler.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java index fd4f94a510..3649b384ed 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/EchoHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java @@ -14,14 +14,18 @@ * limitations under the License. */ -package org.springframework.reactive.web; +package org.springframework.reactive.web.http; import org.reactivestreams.Publisher; +import org.springframework.reactive.web.http.ServerHttpHandler; +import org.springframework.reactive.web.http.ServerHttpRequest; +import org.springframework.reactive.web.http.ServerHttpResponse; + /** * @author Arjen Poutsma */ -public class EchoHandler implements HttpHandler { +public class EchoHandler implements ServerHttpHandler { @Override public Publisher handle(ServerHttpRequest request, ServerHttpResponse response) { diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/rxnetty/HttpHandlerRxNettyIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/rxnetty/HttpHandlerRxNettyIntegrationTests.java similarity index 86% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/rxnetty/HttpHandlerRxNettyIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/http/rxnetty/HttpHandlerRxNettyIntegrationTests.java index eef884033d..8cd0276f22 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/rxnetty/HttpHandlerRxNettyIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/rxnetty/HttpHandlerRxNettyIntegrationTests.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.reactive.web.rxnetty; +package org.springframework.reactive.web.http.rxnetty; import io.netty.buffer.ByteBuf; import io.reactivex.netty.protocol.http.server.HttpServer; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.springframework.reactive.web.EchoHandler; -import org.springframework.reactive.web.AbstractHttpHandlerIntegrationTestCase; +import org.springframework.reactive.web.http.EchoHandler; +import org.springframework.reactive.web.http.AbstractHttpHandlerIntegrationTestCase; /** * @author Rossen Stoyanchev diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizerTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizerTests.java similarity index 96% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizerTests.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizerTests.java index 0003f99608..5dc40c306a 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/AsyncContextSynchronizerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import javax.servlet.AsyncContext; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerJettyIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/HttpHandlerJettyIntegrationTests.java similarity index 90% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerJettyIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/HttpHandlerJettyIntegrationTests.java index df1c945b85..f68c4eef8a 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerJettyIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/HttpHandlerJettyIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -23,8 +23,8 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.springframework.reactive.web.AbstractHttpHandlerIntegrationTestCase; -import org.springframework.reactive.web.EchoHandler; +import org.springframework.reactive.web.http.AbstractHttpHandlerIntegrationTestCase; +import org.springframework.reactive.web.http.EchoHandler; /** * @author Arjen Poutsma diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerTomcatIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/HttpHandlerTomcatIntegrationTests.java similarity index 90% rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerTomcatIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/HttpHandlerTomcatIntegrationTests.java index 3482bfe50a..9c8bb0b6d7 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerTomcatIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/servlet/HttpHandlerTomcatIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.servlet; +package org.springframework.reactive.web.http.servlet; import java.io.File; @@ -24,8 +24,8 @@ import org.apache.catalina.startup.Tomcat; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.springframework.reactive.web.AbstractHttpHandlerIntegrationTestCase; -import org.springframework.reactive.web.EchoHandler; +import org.springframework.reactive.web.http.AbstractHttpHandlerIntegrationTestCase; +import org.springframework.reactive.web.http.EchoHandler; /** * @author Arjen Poutsma