From ee9f2d92677a0dd0f15ca67c5ec9532c81a4d2c7 Mon Sep 17 00:00:00 2001 From: Stephane Maldini Date: Tue, 24 Oct 2017 15:28:09 -0700 Subject: [PATCH] Rename WS implementations --- .../ipc/netty/http/client/HttpClientOperations.java | 13 +++++++------ ...erations.java => WebsocketClientOperations.java} | 8 ++++---- .../ipc/netty/http/server/HttpServerOperations.java | 4 ++-- ...erations.java => WebsocketServerOperations.java} | 9 ++++----- ...Test.java => WebsocketClientOperationsTest.java} | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) rename src/main/java/reactor/ipc/netty/http/client/{HttpClientWSOperations.java => WebsocketClientOperations.java} (96%) rename src/main/java/reactor/ipc/netty/http/server/{HttpServerWSOperations.java => WebsocketServerOperations.java} (94%) rename src/test/java/reactor/ipc/netty/http/client/{HttpClientWSOperationsTest.java => WebsocketClientOperationsTest.java} (98%) diff --git a/src/main/java/reactor/ipc/netty/http/client/HttpClientOperations.java b/src/main/java/reactor/ipc/netty/http/client/HttpClientOperations.java index 9a1d1e6235..159a448965 100644 --- a/src/main/java/reactor/ipc/netty/http/client/HttpClientOperations.java +++ b/src/main/java/reactor/ipc/netty/http/client/HttpClientOperations.java @@ -297,7 +297,7 @@ public boolean isKeepAlive() { @Override public boolean isWebsocket() { return get(channel()).getClass() - .equals(HttpClientWSOperations.class); + .equals(WebsocketClientOperations.class); } @Override @@ -399,8 +399,8 @@ public ByteBufAllocator alloc() { @Override public String selectedSubprotocol() { if (isWebsocket()) { - HttpClientWSOperations ops = - (HttpClientWSOperations) get(channel()); + WebsocketClientOperations ops = + (WebsocketClientOperations) get(channel()); assert ops != null; return ops.selectedSubprotocol(); @@ -671,7 +671,8 @@ final Mono withWebsocketSupport(URI url, if (markSentHeaders()) { addHandlerFirst(NettyPipeline.HttpAggregator, new HttpObjectAggregator(8192)); - HttpClientWSOperations ops = new HttpClientWSOperations(url, protocols, this); + WebsocketClientOperations + ops = new WebsocketClientOperations(url, protocols, this); if (replace(ops)) { Mono handshake = FutureMono.from(ops.handshakerResult) @@ -685,8 +686,8 @@ final Mono withWebsocketSupport(URI url, } } else if (isWebsocket()) { - HttpClientWSOperations ops = - (HttpClientWSOperations) get(channel()); + WebsocketClientOperations ops = + (WebsocketClientOperations) get(channel()); if(ops != null) { Mono handshake = FutureMono.from(ops.handshakerResult); diff --git a/src/main/java/reactor/ipc/netty/http/client/HttpClientWSOperations.java b/src/main/java/reactor/ipc/netty/http/client/WebsocketClientOperations.java similarity index 96% rename from src/main/java/reactor/ipc/netty/http/client/HttpClientWSOperations.java rename to src/main/java/reactor/ipc/netty/http/client/WebsocketClientOperations.java index 16e088ba9b..324e47403a 100644 --- a/src/main/java/reactor/ipc/netty/http/client/HttpClientWSOperations.java +++ b/src/main/java/reactor/ipc/netty/http/client/WebsocketClientOperations.java @@ -42,7 +42,7 @@ * @author Stephane Maldini * @author Simon Baslé */ -final class HttpClientWSOperations extends HttpClientOperations +final class WebsocketClientOperations extends HttpClientOperations implements WebsocketInbound, WebsocketOutbound, BiConsumer { final WebSocketClientHandshaker handshaker; @@ -50,7 +50,7 @@ final class HttpClientWSOperations extends HttpClientOperations volatile int closeSent; - HttpClientWSOperations(URI currentURI, + WebsocketClientOperations(URI currentURI, String protocols, HttpClientOperations replaced) { super(replaced.channel(), replaced); @@ -228,7 +228,7 @@ public void accept(Void aVoid, Throwable throwable) { } } - static final AtomicIntegerFieldUpdater CLOSE_SENT = - AtomicIntegerFieldUpdater.newUpdater(HttpClientWSOperations.class, + static final AtomicIntegerFieldUpdater CLOSE_SENT = + AtomicIntegerFieldUpdater.newUpdater(WebsocketClientOperations.class, "closeSent"); } diff --git a/src/main/java/reactor/ipc/netty/http/server/HttpServerOperations.java b/src/main/java/reactor/ipc/netty/http/server/HttpServerOperations.java index 3ce6c4d122..508c14ca24 100644 --- a/src/main/java/reactor/ipc/netty/http/server/HttpServerOperations.java +++ b/src/main/java/reactor/ipc/netty/http/server/HttpServerOperations.java @@ -48,7 +48,6 @@ import io.netty.handler.codec.http.LastHttpContent; import io.netty.handler.codec.http.cookie.Cookie; import io.netty.handler.codec.http.cookie.ServerCookieEncoder; -import io.netty.handler.codec.http.websocketx.WebSocketHandshakeException; import io.netty.util.AsciiString; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; @@ -463,7 +462,8 @@ final Mono withWebsocketSupport(String url, BiFunction> websocketHandler) { Objects.requireNonNull(websocketHandler, "websocketHandler"); if (markSentHeaders()) { - HttpServerWSOperations ops = new HttpServerWSOperations(url, protocols, this); + WebsocketServerOperations + ops = new WebsocketServerOperations(url, protocols, this); if (replace(ops)) { return FutureMono.from(ops.handshakerResult) diff --git a/src/main/java/reactor/ipc/netty/http/server/HttpServerWSOperations.java b/src/main/java/reactor/ipc/netty/http/server/WebsocketServerOperations.java similarity index 94% rename from src/main/java/reactor/ipc/netty/http/server/HttpServerWSOperations.java rename to src/main/java/reactor/ipc/netty/http/server/WebsocketServerOperations.java index 1faec0a989..f36ba2ed0f 100644 --- a/src/main/java/reactor/ipc/netty/http/server/HttpServerWSOperations.java +++ b/src/main/java/reactor/ipc/netty/http/server/WebsocketServerOperations.java @@ -34,7 +34,6 @@ import io.netty.handler.codec.http.websocketx.PongWebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory; -import io.netty.util.ReferenceCountUtil; import reactor.ipc.netty.NettyPipeline; import reactor.ipc.netty.http.HttpOperations; import reactor.ipc.netty.http.websocket.WebsocketInbound; @@ -46,7 +45,7 @@ * @author Stephane Maldini * @author Simon Baslé */ -final class HttpServerWSOperations extends HttpServerOperations +final class WebsocketServerOperations extends HttpServerOperations implements WebsocketInbound, WebsocketOutbound, BiConsumer { final WebSocketServerHandshaker handshaker; @@ -54,7 +53,7 @@ final class HttpServerWSOperations extends HttpServerOperations volatile int closeSent; - HttpServerWSOperations(String wsUrl, + WebsocketServerOperations(String wsUrl, @Nullable String protocols, HttpServerOperations replaced) { super(replaced.channel(), replaced); @@ -155,7 +154,7 @@ public String selectedSubprotocol() { return handshaker.selectedSubprotocol(); } - static final AtomicIntegerFieldUpdater CLOSE_SENT = - AtomicIntegerFieldUpdater.newUpdater(HttpServerWSOperations.class, + static final AtomicIntegerFieldUpdater CLOSE_SENT = + AtomicIntegerFieldUpdater.newUpdater(WebsocketServerOperations.class, "closeSent"); } diff --git a/src/test/java/reactor/ipc/netty/http/client/HttpClientWSOperationsTest.java b/src/test/java/reactor/ipc/netty/http/client/WebsocketClientOperationsTest.java similarity index 98% rename from src/test/java/reactor/ipc/netty/http/client/HttpClientWSOperationsTest.java rename to src/test/java/reactor/ipc/netty/http/client/WebsocketClientOperationsTest.java index 8e100dcf6b..6d5a3aabae 100644 --- a/src/test/java/reactor/ipc/netty/http/client/HttpClientWSOperationsTest.java +++ b/src/test/java/reactor/ipc/netty/http/client/WebsocketClientOperationsTest.java @@ -31,7 +31,7 @@ /** * @author Violeta Georgieva */ -public class HttpClientWSOperationsTest { +public class WebsocketClientOperationsTest { @Test public void requestError() {