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/reactive/web/http/HttpServer.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.reactive.web.http;
-
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.Lifecycle;
-
-/**
- * @author Rossen Stoyanchev
- */
-public interface HttpServer extends InitializingBean, Lifecycle {
-
-	void setPort(int port);
-
-	void setHandler(HttpHandler handler);
-
-}

spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.reactive.web.http;
-
-
-/**
- * @author Rossen Stoyanchev
- */
-public class HttpServerSupport {
-
-	private int port = -1;
-
-	private HttpHandler httpHandler;
-
-
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	public int getPort() {
-		return this.port;
-	}
-
-	public void setHandler(HttpHandler handler) {
-		this.httpHandler = handler;
-	}
-
-	public HttpHandler getHttpHandler() {
-		return this.httpHandler;
-	}
-
-}

spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java

@@ -1,75 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.reactive.web.http.reactor;
-
-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;
-
-/**
- * @author Stephane Maldini
- */
-public class ReactorHttpServer extends HttpServerSupport
-		implements InitializingBean, HttpServer {
-
-	private RequestHandlerAdapter reactorHandler;
-
-	private reactor.io.net.http.HttpServer<Buffer, Buffer> reactorServer;
-
-	private boolean running;
-
-	@Override
-	public boolean isRunning() {
-		return this.running;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-
-		Assert.notNull(getHttpHandler());
-		this.reactorHandler = new RequestHandlerAdapter(getHttpHandler());
-
-		this.reactorServer = (getPort() != -1 ? ReactiveNet.httpServer(getPort()) :
-				ReactiveNet.httpServer());
-	}
-
-	@Override
-	public void start() {
-		if (!this.running) {
-			try {
-				this.reactorServer.startAndAwait(reactorHandler);
-				this.running = true;
-			}
-			catch (InterruptedException ex) {
-				throw new IllegalStateException(ex);
-			}
-		}
-	}
-
-	@Override
-	public void stop() {
-		if (this.running) {
-			this.reactorServer.shutdown();
-			this.running = false;
-		}
-	}
-
-}

spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java

@@ -1,73 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.reactive.web.http.rxnetty;
-
-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;
-
-
-/**
- * @author Rossen Stoyanchev
- */
-public class RxNettyHttpServer extends HttpServerSupport implements InitializingBean, HttpServer {
-
-	private RequestHandlerAdapter rxNettyHandler;
-
-	private io.reactivex.netty.protocol.http.server.HttpServer<ByteBuf, ByteBuf> rxNettyServer;
-
-	private boolean running;
-
-
-	@Override
-	public boolean isRunning() {
-		return this.running;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-
-		Assert.notNull(getHttpHandler());
-		this.rxNettyHandler = new RequestHandlerAdapter(getHttpHandler());
-
-		this.rxNettyServer = (getPort() != -1 ?
-				io.reactivex.netty.protocol.http.server.HttpServer.newServer(getPort()) :
-				io.reactivex.netty.protocol.http.server.HttpServer.newServer());
-	}
-
-
-	@Override
-	public void start() {
-		if (!this.running) {
-			this.running = true;
-			this.rxNettyServer.start(this.rxNettyHandler);
-		}
-	}
-
-	@Override
-	public void stop() {
-		if (this.running) {
-			this.running = false;
-			this.rxNettyServer.shutdown();
-		}
-	}
-
-}

spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java

@@ -1,94 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.reactive.web.http.servlet;
-
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-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;
-
-/**
- * @author Rossen Stoyanchev
- */
-public class JettyHttpServer extends HttpServerSupport implements InitializingBean, HttpServer {
-
-	private Server jettyServer;
-
-	private boolean running;
-
-
-	@Override
-	public boolean isRunning() {
-		return this.running;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-
-		if (getPort() == -1) {
-			setPort(SocketUtils.findAvailableTcpPort(8080));
-		}
-
-		this.jettyServer = new Server();
-
-		Assert.notNull(getHttpHandler());
-		HttpHandlerServlet servlet = new HttpHandlerServlet();
-		servlet.setHandler(getHttpHandler());
-		ServletHolder servletHolder = new ServletHolder(servlet);
-
-		ServletContextHandler contextHandler = new ServletContextHandler(this.jettyServer, "", false, false);
-		contextHandler.addServlet(servletHolder, "/");
-
-		ServerConnector connector = new ServerConnector(this.jettyServer);
-		connector.setPort(getPort());
-		this.jettyServer.addConnector(connector);
-	}
-
-	@Override
-	public void start() {
-		if (!this.running) {
-			try {
-				this.running = true;
-				this.jettyServer.start();
-			}
-			catch (Exception ex) {
-				throw new IllegalStateException(ex);
-			}
-		}
-	}
-
-	@Override
-	public void stop() {
-		if (this.running) {
-			try {
-				this.running = false;
-				jettyServer.stop();
-				jettyServer.destroy();
-			}
-			catch (Exception ex) {
-				throw new IllegalStateException(ex);
-			}
-		}
-	}
-
-}

spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java

@@ -1,95 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.reactive.web.http.servlet;
-
-import java.io.File;
-
-import org.apache.catalina.Context;
-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;
-
-
-/**
- * @author Rossen Stoyanchev
- */
-public class TomcatHttpServer extends HttpServerSupport implements InitializingBean, HttpServer {
-
-	private Tomcat tomcatServer;
-
-	private boolean running;
-
-
-	@Override
-	public boolean isRunning() {
-		return this.running;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-
-		if (getPort() == -1) {
-			setPort(SocketUtils.findAvailableTcpPort(8080));
-		}
-
-		this.tomcatServer = new Tomcat();
-		this.tomcatServer.setPort(getPort());
-
-		Assert.notNull(getHttpHandler());
-		HttpHandlerServlet servlet = new HttpHandlerServlet();
-		servlet.setHandler(getHttpHandler());
-
-		File base = new File(System.getProperty("java.io.tmpdir"));
-		Context rootContext = tomcatServer.addContext("", base.getAbsolutePath());
-		Tomcat.addServlet(rootContext, "httpHandlerServlet", servlet);
-		rootContext.addServletMapping("/", "httpHandlerServlet");
-	}
-
-
-	@Override
-	public void start() {
-		if (!this.running) {
-			try {
-				this.running = true;
-				this.tomcatServer.start();
-			}
-			catch (LifecycleException ex) {
-				throw new IllegalStateException(ex);
-			}
-		}
-	}
-
-	@Override
-	public void stop() {
-		if (this.running) {
-			try {
-				this.running = false;
-				this.tomcatServer.stop();
-				this.tomcatServer.destroy();
-			}
-			catch (LifecycleException ex) {
-				throw new IllegalStateException(ex);
-			}
-		}
-	}
-
-}

spring-web-reactive/src/main/java/org/springframework/reactive/web/http/undertow/UndertowHttpServer.java

@@ -1,68 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.reactive.web.http.undertow;
-
-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 io.undertow.Undertow;
-import io.undertow.server.HttpHandler;
-
-/**
- * @author Marek Hawrylczak
- */
-public class UndertowHttpServer extends HttpServerSupport implements InitializingBean, HttpServer {
-
-	private Undertow server;
-
-	private boolean running;
-
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(getHttpHandler());
-		HttpHandler handler = new UndertowHttpHandlerAdapter(getHttpHandler());
-		int port = (getPort() != -1 ? getPort() : 8080);
-		this.server = Undertow.builder().addHttpListener(port, "localhost")
-				.setHandler(handler).build();
-	}
-
-	@Override
-	public void start() {
-		if (!this.running) {
-			this.server.start();
-			this.running = true;
-		}
-
-	}
-
-	@Override
-	public void stop() {
-		if (this.running) {
-			this.server.stop();
-			this.running = false;
-		}
-	}
-
-	@Override
-	public boolean isRunning() {
-		return this.running;
-	}
-
-}

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;