From b2e848737cc7c5f5e4480bb4ad022f4110cf0ef6 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Sat, 23 Jul 2016 14:34:12 +0200 Subject: [PATCH] Rename reactor.io.netty -> reactor.ipc.netty --- build.gradle | 2 +- .../http/client/reactive/ReactorClientHttpConnector.java | 8 ++++---- .../http/client/reactive/ReactorClientHttpRequest.java | 4 ++-- .../http/client/reactive/ReactorClientHttpResponse.java | 4 ++-- .../http/server/reactive/ReactorHttpHandlerAdapter.java | 2 +- .../http/server/reactive/ReactorServerHttpRequest.java | 2 +- .../http/server/reactive/ReactorServerHttpResponse.java | 2 +- .../http/server/reactive/bootstrap/ReactorHttpServer.java | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 055766d439..a8ddd04efc 100644 --- a/build.gradle +++ b/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' } diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java index 0b010b1008..eec3782778 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java @@ -22,14 +22,14 @@ import java.util.function.Function; 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 connect(HttpMethod method, URI uri, Function> 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 diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java index a1e8e38720..a2c673bc1b 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java @@ -24,7 +24,7 @@ import io.netty.handler.codec.http.cookie.DefaultCookie; 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 @@ import org.springframework.http.HttpMethod; * * @author Brian Clozel * @since 5.0 - * @see reactor.io.netty.http.HttpClient + * @see reactor.ipc.netty.http.HttpClient */ public class ReactorClientHttpRequest extends AbstractClientHttpRequest { diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java index 7af81328e7..d0276a0df7 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java @@ -19,7 +19,7 @@ package org.springframework.http.client.reactive; 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 @@ import org.springframework.util.MultiValueMap; * {@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 { diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java index 37f26a9d58..9d0c4e7dc2 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java @@ -19,7 +19,7 @@ package org.springframework.http.server.reactive; 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; diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java index f81381b59e..ab81ab46b3 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java @@ -21,7 +21,7 @@ import java.net.URISyntaxException; 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; diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java index 6a7194d581..d7a9f3e6ba 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java @@ -25,7 +25,7 @@ import io.netty.handler.codec.http.cookie.DefaultCookie; 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; diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java index 92940f9868..2d5ede7950 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java +++ b/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 class ReactorHttpServer extends HttpServerSupport implements HttpServer, 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()); }