diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/http/server/ReactiveHttpHandler.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/HttpHandler.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/ReactiveHttpHandler.java index 9f97ce023d4..fc683451dd7 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/ReactiveHttpHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import org.reactivestreams.Publisher; @@ -33,7 +33,7 @@ import org.springframework.http.server.ReactiveServerHttpResponse; * @see ReactiveServerHttpRequest#getBody() * @see ReactiveServerHttpResponse#setBody(Publisher) */ -public interface HttpHandler { +public interface ReactiveHttpHandler { /** * Process the given request, generating a response in an asynchronous non blocking way. diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/PublisherReactorServerHttpRequest.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/reactor/PublisherReactorServerHttpRequest.java index d0c319216c4..16d883089fb 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/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.web.reactive.server.reactor; +package org.springframework.http.server.reactor; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/PublisherReactorServerHttpResponse.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/reactor/PublisherReactorServerHttpResponse.java index 78a820a2da0..ad7193f528c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/PublisherReactorServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/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.web.reactive.server.reactor; +package org.springframework.http.server.reactor; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/RequestHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorHttpHandlerAdapter.java similarity index 86% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/RequestHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorHttpHandlerAdapter.java index 1b70426bbb0..e85564f92e8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/RequestHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorHttpHandlerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.web.reactive.server.reactor; +package org.springframework.http.server.reactor; import org.reactivestreams.Publisher; import reactor.core.publisher.convert.DependencyUtils; @@ -21,19 +21,19 @@ import reactor.io.buffer.Buffer; import reactor.io.net.ReactiveChannelHandler; import reactor.io.net.http.HttpChannel; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; import org.springframework.util.Assert; /** * @author Stephane Maldini */ -public class RequestHandlerAdapter +public class ReactorHttpHandlerAdapter implements ReactiveChannelHandler> { - private final HttpHandler httpHandler; + private final ReactiveHttpHandler httpHandler; - public RequestHandlerAdapter(HttpHandler httpHandler) { + public ReactorHttpHandlerAdapter(ReactiveHttpHandler httpHandler) { Assert.notNull(httpHandler, "'httpHandler' is required."); this.httpHandler = httpHandler; } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorServerHttpRequest.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorServerHttpRequest.java index ad6913d3331..71fff0002b5 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.reactor; +package org.springframework.http.server.reactor; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorServerHttpResponse.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorServerHttpResponse.java index fdf8c4bf3ea..ece8e23cd21 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/reactor/ReactorServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactor/ReactorServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.reactor; +package org.springframework.http.server.reactor; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RequestHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyHttpHandlerAdapter.java similarity index 83% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RequestHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyHttpHandlerAdapter.java index 0448e99be4d..3d6dde0e486 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RequestHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyHttpHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.rxnetty; +package org.springframework.http.server.rxnetty; import io.netty.buffer.ByteBuf; import io.reactivex.netty.protocol.http.server.HttpServerRequest; @@ -24,18 +24,18 @@ import org.reactivestreams.Publisher; import reactor.core.publisher.convert.RxJava1Converter; import rx.Observable; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; import org.springframework.util.Assert; /** * @author Rossen Stoyanchev */ -public class RequestHandlerAdapter implements RequestHandler { +public class RxNettyHttpHandlerAdapter implements RequestHandler { - private final HttpHandler httpHandler; + private final ReactiveHttpHandler httpHandler; - public RequestHandlerAdapter(HttpHandler httpHandler) { + public RxNettyHttpHandlerAdapter(ReactiveHttpHandler httpHandler) { Assert.notNull(httpHandler, "'httpHandler' is required."); this.httpHandler = httpHandler; } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyServerHttpRequest.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyServerHttpRequest.java index 48be0c222d0..d69683ca2c6 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.rxnetty; +package org.springframework.http.server.rxnetty; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyServerHttpResponse.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyServerHttpResponse.java index 9a51590e52c..d3017994082 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/rxnetty/RxNettyServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/rxnetty/RxNettyServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.rxnetty; +package org.springframework.http.server.rxnetty; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/AsyncContextSynchronizer.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizer.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/AsyncContextSynchronizer.java index 8bb6d360044..3900fbfbb57 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/AsyncContextSynchronizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.servlet; +package org.springframework.http.server.servlet31; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/RequestBodyPublisher.java b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/RequestBodyPublisher.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/RequestBodyPublisher.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/RequestBodyPublisher.java index e22560d3252..f79d4d98767 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/RequestBodyPublisher.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/RequestBodyPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.servlet; +package org.springframework.http.server.servlet31; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ResponseBodySubscriber.java b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/ResponseBodySubscriber.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ResponseBodySubscriber.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/ResponseBodySubscriber.java index 028e4aa4ba1..75b49a28663 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ResponseBodySubscriber.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/ResponseBodySubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.servlet; +package org.springframework.http.server.servlet31; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/HttpHandlerServlet.java b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31HttpHandlerAdapter.java similarity index 81% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/HttpHandlerServlet.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31HttpHandlerAdapter.java index 0b91603becb..47668092617 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/HttpHandlerServlet.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31HttpHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.servlet; +package org.springframework.http.server.servlet31; import java.io.IOException; import javax.servlet.AsyncContext; @@ -30,24 +30,24 @@ import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import org.springframework.http.HttpStatus; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; /** * @author Arjen Poutsma * @author Rossen Stoyanchev */ @WebServlet(asyncSupported = true) -public class HttpHandlerServlet extends HttpServlet { +public class Servlet31HttpHandlerAdapter extends HttpServlet { private static final int BUFFER_SIZE = 8192; - private static Log logger = LogFactory.getLog(HttpHandlerServlet.class); + private static Log logger = LogFactory.getLog(Servlet31HttpHandlerAdapter.class); - private HttpHandler handler; + private ReactiveHttpHandler handler; - public void setHandler(HttpHandler handler) { + public void setHandler(ReactiveHttpHandler handler) { this.handler = handler; } @@ -61,11 +61,11 @@ public class HttpHandlerServlet extends HttpServlet { RequestBodyPublisher requestPublisher = new RequestBodyPublisher(synchronizer, BUFFER_SIZE); request.getInputStream().setReadListener(requestPublisher); - ServletServerHttpRequest httpRequest = new ServletServerHttpRequest(request, requestPublisher); + Servlet31ServerHttpRequest httpRequest = new Servlet31ServerHttpRequest(request, requestPublisher); ResponseBodySubscriber responseSubscriber = new ResponseBodySubscriber(synchronizer); response.getOutputStream().setWriteListener(responseSubscriber); - ServletServerHttpResponse httpResponse = new ServletServerHttpResponse(response, responseSubscriber); + Servlet31ServerHttpResponse httpResponse = new Servlet31ServerHttpResponse(response, responseSubscriber); HandlerResultSubscriber resultSubscriber = new HandlerResultSubscriber(synchronizer, httpResponse); this.handler.handle(httpRequest, httpResponse).subscribe(resultSubscriber); @@ -76,11 +76,11 @@ public class HttpHandlerServlet extends HttpServlet { private final AsyncContextSynchronizer synchronizer; - private final ServletServerHttpResponse response; + private final Servlet31ServerHttpResponse response; public HandlerResultSubscriber(AsyncContextSynchronizer synchronizer, - ServletServerHttpResponse response) { + Servlet31ServerHttpResponse response) { this.synchronizer = synchronizer; this.response = response; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31ServerHttpRequest.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31ServerHttpRequest.java index 407474a4e89..5ad43ed4448 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31ServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.servlet; +package org.springframework.http.server.servlet31; import java.net.URI; import java.net.URISyntaxException; @@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; /** * @author Rossen Stoyanchev */ -public class ServletServerHttpRequest implements ReactiveServerHttpRequest { +public class Servlet31ServerHttpRequest implements ReactiveServerHttpRequest { private final HttpServletRequest servletRequest; @@ -46,7 +46,7 @@ public class ServletServerHttpRequest implements ReactiveServerHttpRequest { private HttpHeaders headers; - public ServletServerHttpRequest(HttpServletRequest servletRequest, + public Servlet31ServerHttpRequest(HttpServletRequest servletRequest, Publisher requestBodyPublisher) { Assert.notNull(servletRequest, "HttpServletRequest must not be null"); diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31ServerHttpResponse.java similarity index 93% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31ServerHttpResponse.java index 25709e40005..dde179cd47e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/servlet/ServletServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/servlet31/Servlet31ServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.servlet; +package org.springframework.http.server.servlet31; import java.nio.ByteBuffer; import java.nio.charset.Charset; @@ -34,7 +34,7 @@ import org.springframework.util.Assert; /** * @author Rossen Stoyanchev */ -public class ServletServerHttpResponse implements ReactiveServerHttpResponse { +public class Servlet31ServerHttpResponse implements ReactiveServerHttpResponse { private final HttpServletResponse response; @@ -45,7 +45,7 @@ public class ServletServerHttpResponse implements ReactiveServerHttpResponse { private boolean headersWritten = false; - public ServletServerHttpResponse(HttpServletResponse response, + public Servlet31ServerHttpResponse(HttpServletResponse response, ResponseBodySubscriber subscriber) { Assert.notNull(response, "'response' must not be null"); diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/RequestBodyPublisher.java b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/RequestBodyPublisher.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/RequestBodyPublisher.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/undertow/RequestBodyPublisher.java index 5c1b567b20c..6234e906428 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/RequestBodyPublisher.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/RequestBodyPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.undertow; +package org.springframework.http.server.undertow; import static org.xnio.IoUtils.safeClose; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/ResponseBodySubscriber.java b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/ResponseBodySubscriber.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/ResponseBodySubscriber.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/undertow/ResponseBodySubscriber.java index d3620850955..b809e439ed5 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/ResponseBodySubscriber.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/ResponseBodySubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.undertow; +package org.springframework.http.server.undertow; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowHttpHandlerAdapter.java similarity index 91% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowHttpHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowHttpHandlerAdapter.java index 365aed0054e..040e208765c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowHttpHandlerAdapter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.undertow; +package org.springframework.http.server.undertow; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; import org.springframework.util.Assert; import io.undertow.server.HttpServerExchange; @@ -37,10 +37,10 @@ public class UndertowHttpHandlerAdapter implements io.undertow.server.HttpHandle private static Log logger = LogFactory.getLog(UndertowHttpHandlerAdapter.class); - private final HttpHandler delegate; + private final ReactiveHttpHandler delegate; - public UndertowHttpHandlerAdapter(HttpHandler delegate) { + public UndertowHttpHandlerAdapter(ReactiveHttpHandler delegate) { Assert.notNull(delegate, "'delegate' is required."); this.delegate = delegate; } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowServerHttpRequest.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpRequest.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowServerHttpRequest.java index 4d68be46bab..25094d3f5fd 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowServerHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.undertow; +package org.springframework.http.server.undertow; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowServerHttpResponse.java similarity index 97% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpResponse.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowServerHttpResponse.java index 0897492291e..506b2ff1817 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/server/undertow/UndertowServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/undertow/UndertowServerHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.undertow; +package org.springframework.http.server.undertow; import java.nio.ByteBuffer; import java.util.List; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java index eabcfcf16d3..48a1b180b8f 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java @@ -31,6 +31,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.http.HttpStatus; +import org.springframework.http.server.ReactiveHttpHandler; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; @@ -52,7 +53,7 @@ import org.springframework.http.server.ReactiveServerHttpResponse; * @author Rossen Stoyanchev * @author Sebastien Deleuze */ -public class DispatcherHandler implements HttpHandler, ApplicationContextAware { +public class DispatcherHandler implements ReactiveHttpHandler, ApplicationContextAware { private static final Log logger = LogFactory.getLog(DispatcherHandler.class); diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerAdapter.java index 22f3375203f..7d987049562 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerAdapter.java @@ -24,11 +24,11 @@ import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; import org.springframework.web.reactive.HandlerAdapter; import org.springframework.web.reactive.HandlerResult; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; import org.springframework.web.reactive.DispatcherHandler; /** - * Support use of {@link HttpHandler} with + * Support use of {@link ReactiveHttpHandler} with * {@link DispatcherHandler * DispatcherHandler} (which implements the same contract). * The use of {@code DispatcherHandler} this way enables routing requests to @@ -46,14 +46,14 @@ public class HttpHandlerAdapter implements HandlerAdapter { @Override public boolean supports(Object handler) { - return HttpHandler.class.isAssignableFrom(handler.getClass()); + return ReactiveHttpHandler.class.isAssignableFrom(handler.getClass()); } @Override public Publisher handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response, Object handler) { - HttpHandler httpHandler = (HttpHandler)handler; + ReactiveHttpHandler httpHandler = (ReactiveHttpHandler)handler; Publisher completion = httpHandler.handle(request, response); return Publishers.just(new HandlerResult(httpHandler, completion, PUBLISHER_VOID)); } diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/AbstractHttpHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/AbstractHttpHandlerIntegrationTests.java similarity index 76% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/AbstractHttpHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/AbstractHttpHandlerIntegrationTests.java index 96b694bdac6..5a53e0b496e 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/AbstractHttpHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/AbstractHttpHandlerIntegrationTests.java @@ -14,21 +14,14 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import org.junit.After; import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -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) @@ -61,7 +54,7 @@ public abstract class AbstractHttpHandlerIntegrationTests { this.server.start(); } - protected abstract HttpHandler createHttpHandler(); + protected abstract ReactiveHttpHandler createHttpHandler(); @After public void tearDown() throws Exception { diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandler.java b/spring-web-reactive/src/test/java/org/springframework/http/server/EchoHandler.java similarity index 86% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandler.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/EchoHandler.java index a3013c131ab..bf3874b360a 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/EchoHandler.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.http.server; import org.reactivestreams.Publisher; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; /** * @author Arjen Poutsma */ -public class EchoHandler implements HttpHandler { +public class EchoHandler implements ReactiveHttpHandler { @Override public Publisher handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) { diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/EchoHandlerIntegrationTests.java similarity index 95% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/EchoHandlerIntegrationTests.java index 811d53f8126..8d4b114843f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/EchoHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/EchoHandlerIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.http.server; import java.net.URI; import java.util.Random; @@ -24,7 +24,6 @@ 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/web/reactive/HttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServer.java similarity index 85% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/HttpServer.java index f869d33b044..695609328ff 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.Lifecycle; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; /** * @author Rossen Stoyanchev @@ -28,6 +28,6 @@ public interface HttpServer extends InitializingBean, Lifecycle { void setPort(int port); - void setHandler(HttpHandler handler); + void setHandler(ReactiveHttpHandler handler); } diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServerSupport.java b/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServerSupport.java similarity index 78% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServerSupport.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/HttpServerSupport.java index 71704f408e7..8c8358d8727 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/HttpServerSupport.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServerSupport.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.ReactiveHttpHandler; /** * @author Rossen Stoyanchev @@ -26,7 +26,7 @@ public class HttpServerSupport { private int port = -1; - private HttpHandler httpHandler; + private ReactiveHttpHandler httpHandler; public void setPort(int port) { @@ -37,11 +37,11 @@ public class HttpServerSupport { return this.port; } - public void setHandler(HttpHandler handler) { + public void setHandler(ReactiveHttpHandler handler) { this.httpHandler = handler; } - public HttpHandler getHttpHandler() { + public ReactiveHttpHandler getHttpHandler() { return this.httpHandler; } diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/JettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/JettyHttpServer.java similarity index 92% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/JettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/JettyHttpServer.java index a7f5ec75240..f34221bcd33 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/JettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/JettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -24,7 +24,7 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; import org.springframework.util.SocketUtils; -import org.springframework.web.reactive.server.servlet.HttpHandlerServlet; +import org.springframework.http.server.servlet31.Servlet31HttpHandlerAdapter; /** * @author Rossen Stoyanchev @@ -51,7 +51,7 @@ public class JettyHttpServer extends HttpServerSupport implements InitializingBe this.jettyServer = new Server(); Assert.notNull(getHttpHandler()); - HttpHandlerServlet servlet = new HttpHandlerServlet(); + Servlet31HttpHandlerAdapter servlet = new Servlet31HttpHandlerAdapter(); servlet.setHandler(getHttpHandler()); ServletHolder servletHolder = new ServletHolder(servlet); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandler.java b/spring-web-reactive/src/test/java/org/springframework/http/server/RandomHandler.java similarity index 88% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandler.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/RandomHandler.java index 53f300686ce..cc94febae49 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/RandomHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.http.server; import java.nio.ByteBuffer; import java.util.Random; @@ -27,16 +27,12 @@ import org.reactivestreams.Subscription; import reactor.io.buffer.Buffer; 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; /** * @author Arjen Poutsma */ -public class RandomHandler implements HttpHandler { +public class RandomHandler implements ReactiveHttpHandler { private static final Log logger = LogFactory.getLog(RandomHandler.class); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/RandomHandlerIntegrationTests.java similarity index 93% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/RandomHandlerIntegrationTests.java index 383eb5dfc11..ba3f76a5d08 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/RandomHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/RandomHandlerIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.http.server; import java.net.URI; import java.util.Random; @@ -24,7 +24,6 @@ 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/web/reactive/ReactorHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/ReactorHttpServer.java similarity index 87% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/ReactorHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/ReactorHttpServer.java index a824f856866..30e2edf75e8 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/ReactorHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/ReactorHttpServer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import reactor.io.buffer.Buffer; import reactor.io.net.ReactiveNet; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import org.springframework.web.reactive.server.reactor.RequestHandlerAdapter; +import org.springframework.http.server.reactor.ReactorHttpHandlerAdapter; /** * @author Stephane Maldini @@ -29,7 +29,7 @@ import org.springframework.web.reactive.server.reactor.RequestHandlerAdapter; public class ReactorHttpServer extends HttpServerSupport implements InitializingBean, HttpServer { - private RequestHandlerAdapter reactorHandler; + private ReactorHttpHandlerAdapter reactorHandler; private reactor.io.net.http.HttpServer reactorServer; @@ -44,7 +44,7 @@ public class ReactorHttpServer extends HttpServerSupport public void afterPropertiesSet() throws Exception { Assert.notNull(getHttpHandler()); - this.reactorHandler = new RequestHandlerAdapter(getHttpHandler()); + this.reactorHandler = new ReactorHttpHandlerAdapter(getHttpHandler()); this.reactorServer = (getPort() != -1 ? ReactiveNet.httpServer(getPort()) : ReactiveNet.httpServer()); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/RxNettyHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/RxNettyHttpServer.java similarity index 87% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/RxNettyHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/RxNettyHttpServer.java index a7cc2fc2a81..44f3f4a2289 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/RxNettyHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/RxNettyHttpServer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import io.netty.buffer.ByteBuf; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import org.springframework.web.reactive.server.rxnetty.RequestHandlerAdapter; +import org.springframework.http.server.rxnetty.RxNettyHttpHandlerAdapter; /** @@ -28,7 +28,7 @@ import org.springframework.web.reactive.server.rxnetty.RequestHandlerAdapter; */ public class RxNettyHttpServer extends HttpServerSupport implements InitializingBean, HttpServer { - private RequestHandlerAdapter rxNettyHandler; + private RxNettyHttpHandlerAdapter rxNettyHandler; private io.reactivex.netty.protocol.http.server.HttpServer rxNettyServer; @@ -45,7 +45,7 @@ public class RxNettyHttpServer extends HttpServerSupport implements Initializing public void afterPropertiesSet() throws Exception { Assert.notNull(getHttpHandler()); - this.rxNettyHandler = new RequestHandlerAdapter(getHttpHandler()); + this.rxNettyHandler = new RxNettyHttpHandlerAdapter(getHttpHandler()); this.rxNettyServer = (getPort() != -1 ? io.reactivex.netty.protocol.http.server.HttpServer.newServer(getPort()) : diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/TomcatHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/TomcatHttpServer.java similarity index 91% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/TomcatHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/TomcatHttpServer.java index c1c588696c5..2dc89f2d794 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/TomcatHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/TomcatHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import java.io.File; @@ -25,7 +25,7 @@ import org.apache.catalina.startup.Tomcat; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; import org.springframework.util.SocketUtils; -import org.springframework.web.reactive.server.servlet.HttpHandlerServlet; +import org.springframework.http.server.servlet31.Servlet31HttpHandlerAdapter; /** @@ -54,7 +54,7 @@ public class TomcatHttpServer extends HttpServerSupport implements InitializingB this.tomcatServer.setPort(getPort()); Assert.notNull(getHttpHandler()); - HttpHandlerServlet servlet = new HttpHandlerServlet(); + Servlet31HttpHandlerAdapter servlet = new Servlet31HttpHandlerAdapter(); servlet.setHandler(getHttpHandler()); File base = new File(System.getProperty("java.io.tmpdir")); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/UndertowHttpServer.java b/spring-web-reactive/src/test/java/org/springframework/http/server/UndertowHttpServer.java similarity index 92% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/UndertowHttpServer.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/UndertowHttpServer.java index 511490ab865..6248bdb085a 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/UndertowHttpServer.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/UndertowHttpServer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.web.reactive; +package org.springframework.http.server; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import org.springframework.web.reactive.server.undertow.UndertowHttpHandlerAdapter; +import org.springframework.http.server.undertow.UndertowHttpHandlerAdapter; import io.undertow.Undertow; import io.undertow.server.HttpHandler; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandler.java b/spring-web-reactive/src/test/java/org/springframework/http/server/XmlHandler.java similarity index 89% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandler.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/XmlHandler.java index 382759767c0..ea069de7ccb 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/XmlHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.http.server; import javax.xml.bind.JAXBContext; import javax.xml.bind.Marshaller; @@ -27,18 +27,15 @@ import reactor.io.buffer.Buffer; import reactor.rx.Streams; import org.springframework.http.MediaType; -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; /** * @author Arjen Poutsma */ -public class XmlHandler implements HttpHandler { +public class XmlHandler implements ReactiveHttpHandler { private static final Log logger = LogFactory.getLog(XmlHandler.class); diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/XmlHandlerIntegrationTests.java similarity index 89% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/XmlHandlerIntegrationTests.java index 4dc9347f0df..54777283ed1 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/XmlHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/XmlHandlerIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.http.server; import java.net.URI; import javax.xml.bind.annotation.XmlRootElement; @@ -24,8 +24,6 @@ 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 @@ -33,7 +31,7 @@ import org.springframework.web.reactive.HttpHandler; public class XmlHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTests { @Override - protected HttpHandler createHttpHandler() { + protected ReactiveHttpHandler createHttpHandler() { return new XmlHandler(); } diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizerTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/servlet31/AsyncContextSynchronizerTests.java similarity index 90% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizerTests.java rename to spring-web-reactive/src/test/java/org/springframework/http/server/servlet31/AsyncContextSynchronizerTests.java index f9897fdb5d2..9271dd6c618 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/server/servlet/AsyncContextSynchronizerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/servlet31/AsyncContextSynchronizerTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.web.reactive.server.servlet; +package org.springframework.http.server.servlet31; import javax.servlet.AsyncContext; import org.junit.Before; import org.junit.Test; -import org.springframework.web.reactive.server.servlet.AsyncContextSynchronizer; +import org.springframework.http.server.servlet31.AsyncContextSynchronizer; import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.verify; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java index 2e35c4c0ceb..15788670b3b 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java @@ -32,8 +32,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; import org.springframework.web.reactive.DispatcherHandler; -import org.springframework.web.reactive.AbstractHttpHandlerIntegrationTests; -import org.springframework.web.reactive.HttpHandler; +import org.springframework.http.server.AbstractHttpHandlerIntegrationTests; +import org.springframework.http.server.ReactiveHttpHandler; import org.springframework.web.client.RestTemplate; import org.springframework.web.context.support.StaticWebApplicationContext; @@ -50,7 +50,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler @Override - protected HttpHandler createHttpHandler() { + protected ReactiveHttpHandler createHttpHandler() { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.registerSingleton("hm", TestHandlerMapping.class); @@ -100,7 +100,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler } } - private static class FooHandler implements HttpHandler { + private static class FooHandler implements ReactiveHttpHandler { @Override public Publisher handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) { @@ -108,7 +108,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler } } - private static class BarHandler implements HttpHandler { + private static class BarHandler implements ReactiveHttpHandler { @Override public Publisher handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) { diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java index a1887e0390d..3987d9b12ba 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java @@ -53,8 +53,8 @@ import org.springframework.reactive.codec.encoder.JsonObjectEncoder; import org.springframework.reactive.codec.encoder.StringEncoder; 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.http.server.AbstractHttpHandlerIntegrationTests; +import org.springframework.http.server.ReactiveHttpHandler; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -76,7 +76,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati @Override - protected HttpHandler createHttpHandler() { + protected ReactiveHttpHandler createHttpHandler() { this.wac = new AnnotationConfigWebApplicationContext(); this.wac.register(FrameworkConfig.class, ApplicationConfig.class); this.wac.refresh();