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).

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

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;
 

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;
 

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;

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;
 

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;
 

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

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<Void>} value.

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

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;
 

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;

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;
 

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;
 
 

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;
 
 /**

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;
 
 /**

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;

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;
 

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;

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

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;

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;

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;

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;

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;
 

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;

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);
 

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;

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;

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)

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

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
  */

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

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

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;
 
 
 /**

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;
 
 
 /**

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;

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

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;

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;
 

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;

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

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;
 

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;
 

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

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;
 

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;

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;

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;