Rename reactor.io.netty -> reactor.ipc.netty

Author: bclozel

build.gradle

@@ -779,7 +779,7 @@ project("spring-web-reactive") {
 		testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 		testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
 		testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
-		testCompile("io.projectreactor:reactor-netty:${reactorNettyVersion}")
+		testCompile("io.projectreactor.ipc:reactor-netty:${reactorNettyVersion}")
 		testCompile("io.reactivex:rxnetty-http:0.5.2-SNAPSHOT") {
 			exclude group: 'io.reactivex', module: 'rxjava'
 		}

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

@@ -22,14 +22,14 @@
 import org.springframework.http.HttpMethod;
 
 import reactor.core.publisher.Mono;
-import reactor.io.netty.http.HttpException;
-import reactor.io.netty.http.HttpInbound;
+import reactor.ipc.netty.http.HttpException;
+import reactor.ipc.netty.http.HttpInbound;
 
 /**
  * Reactor-Netty implementation of {@link ClientHttpConnector}
  *
  * @author Brian Clozel
- * @see reactor.io.netty.http.HttpClient
+ * @see reactor.ipc.netty.http.HttpClient
  * @since 5.0
  */
 public class ReactorClientHttpConnector implements ClientHttpConnector {
@@ -38,7 +38,7 @@ public class ReactorClientHttpConnector implements ClientHttpConnector {
 	public Mono<ClientHttpResponse> connect(HttpMethod method, URI uri,
 			Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
 
-		return reactor.io.netty.http.HttpClient.create(uri.toString())
+		return reactor.ipc.netty.http.HttpClient.create(uri.toString())
 				.request(io.netty.handler.codec.http.HttpMethod.valueOf(method.name()),
 						uri.toString(),
 						httpClientRequest -> requestCallback

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

@@ -24,7 +24,7 @@
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.io.netty.http.HttpClientRequest;
+import reactor.ipc.netty.http.HttpClientRequest;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
@@ -36,7 +36,7 @@
  *
  * @author Brian Clozel
  * @since 5.0
- * @see reactor.io.netty.http.HttpClient
+ * @see reactor.ipc.netty.http.HttpClient
  */
 public class ReactorClientHttpRequest extends AbstractClientHttpRequest {
 

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

@@ -19,7 +19,7 @@
 import java.util.Collection;
 
 import reactor.core.publisher.Flux;
-import reactor.io.netty.http.HttpInbound;
+import reactor.ipc.netty.http.HttpInbound;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.NettyDataBufferFactory;
@@ -34,7 +34,7 @@
  * {@link ClientHttpResponse} implementation for the Reactor-Netty HTTP client.
  *
  * @author Brian Clozel
- * @see reactor.io.netty.http.HttpClient
+ * @see reactor.ipc.netty.http.HttpClient
  * @since 5.0
  */
 public class ReactorClientHttpResponse implements ClientHttpResponse {

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

@@ -19,7 +19,7 @@
 import java.util.function.Function;
 
 import reactor.core.publisher.Mono;
-import reactor.io.netty.http.HttpChannel;
+import reactor.ipc.netty.http.HttpChannel;
 
 import org.springframework.core.io.buffer.NettyDataBufferFactory;
 import org.springframework.util.Assert;

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

@@ -21,7 +21,7 @@
 
 import io.netty.handler.codec.http.cookie.Cookie;
 import reactor.core.publisher.Flux;
-import reactor.io.netty.http.HttpChannel;
+import reactor.ipc.netty.http.HttpChannel;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.NettyDataBufferFactory;

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

@@ -25,7 +25,7 @@
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.io.netty.http.HttpChannel;
+import reactor.ipc.netty.http.HttpChannel;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;

spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java

@@ -28,7 +28,7 @@ public class ReactorHttpServer extends HttpServerSupport implements HttpServer,
 
 	private ReactorHttpHandlerAdapter reactorHandler;
 
-	private reactor.io.netty.http.HttpServer reactorServer;
+	private reactor.ipc.netty.http.HttpServer reactorServer;
 
 	private boolean running;
 
@@ -38,7 +38,7 @@ public void afterPropertiesSet() throws Exception {
 
 		Assert.notNull(getHttpHandler());
 		this.reactorHandler = new ReactorHttpHandlerAdapter(getHttpHandler());
-		this.reactorServer = reactor.io.netty.http.HttpServer.create(getHost(), getPort());
+		this.reactorServer = reactor.ipc.netty.http.HttpServer.create(getHost(), getPort());
 	}