Move WebSocket implementation to io.vertx.core.http.impl.websocket package

Author: vietj

vertx-core/src/main/java/io/vertx/core/http/WebSocketFrame.java

@@ -13,9 +13,8 @@
 
 import io.vertx.codegen.annotations.CacheReturn;
 import io.vertx.codegen.annotations.DataObject;
-import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.buffer.Buffer;
-import io.vertx.core.http.impl.ws.WebSocketFrameImpl;
+import io.vertx.core.http.impl.websocket.WebSocketFrameImpl;
 
 /**
  * A WebSocket frame that represents either text or binary data.

vertx-core/src/main/java/io/vertx/core/http/impl/HttpConnectParams.java

@@ -1,15 +1,12 @@
 package io.vertx.core.http.impl;
 
-import io.vertx.core.http.HttpClientOptions;
-import io.vertx.core.http.HttpVersion;
 import io.vertx.core.net.ClientSSLOptions;
-import io.vertx.core.net.HostAndPort;
 import io.vertx.core.net.ProxyOptions;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.core.spi.metrics.HttpClientMetrics;
 
-class HttpConnectParams {
+public class HttpConnectParams {
 
   ClientSSLOptions sslOptions;
   ProxyOptions proxyOptions;

vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketClientImpl.java

@@ -15,6 +15,7 @@
 import io.vertx.core.MultiMap;
 import io.vertx.core.Promise;
 import io.vertx.core.http.*;
+import io.vertx.core.http.impl.websocket.ClientWebSocketImpl;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
 import io.vertx.core.internal.VertxInternal;
@@ -63,7 +64,7 @@ public Future<WebSocket> connect(WebSocketConnectOptions options) {
     return webSocket(options);
   }
 
-  void webSocket(ContextInternal ctx, WebSocketConnectOptions connectOptions, Promise<WebSocket> promise) {
+  public void webSocket(ContextInternal ctx, WebSocketConnectOptions connectOptions, Promise<WebSocket> promise) {
     int port = getPort(connectOptions);
     String host = getHost(connectOptions);
     SocketAddress addr = SocketAddress.inetSocketAddress(port, host);

vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketGroup.java

@@ -15,6 +15,7 @@
 import io.vertx.core.http.WebSocketClientOptions;
 import io.vertx.core.http.WebSocketConnectOptions;
 import io.vertx.core.http.impl.http1x.Http1xClientConnection;
+import io.vertx.core.http.impl.websocket.WebSocketImpl;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
 import io.vertx.core.internal.resource.ManagedResource;

vertx-core/src/main/java/io/vertx/core/http/impl/http1x/Http1xClientConnection.java

@@ -40,6 +40,9 @@
 import io.vertx.core.http.impl.HttpRequestHead;
 import io.vertx.core.http.impl.headers.HeadersAdaptor;
 import io.vertx.core.http.impl.headers.Http1xHeaders;
+import io.vertx.core.http.impl.websocket.WebSocketConnectionImpl;
+import io.vertx.core.http.impl.websocket.WebSocketHandshakeInboundHandler;
+import io.vertx.core.http.impl.websocket.WebSocketImpl;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
 import io.vertx.core.internal.buffer.BufferInternal;

vertx-core/src/main/java/io/vertx/core/http/impl/http1x/Http1xServerConnection.java

@@ -30,6 +30,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.ServerWebSocketHandshake;
 import io.vertx.core.http.impl.*;
+import io.vertx.core.http.impl.websocket.ServerWebSocketHandshaker;
 import io.vertx.core.internal.buffer.BufferInternal;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.http.HttpServerRequest;

vertx-core/src/main/java/io/vertx/core/http/impl/http1x/Http1xServerRequestHandler.java

@@ -15,7 +15,7 @@
 import io.vertx.core.http.ServerWebSocket;
 import io.vertx.core.http.ServerWebSocketHandshake;
 import io.vertx.core.http.impl.HttpServerConnectionHandler;
-import io.vertx.core.http.impl.ServerWebSocketHandshaker;
+import io.vertx.core.http.impl.websocket.ServerWebSocketHandshaker;
 
 import static io.vertx.core.http.HttpHeaders.UPGRADE;
 import static io.vertx.core.http.HttpHeaders.WEBSOCKET;

vertx-core/src/main/java/io/vertx/core/http/impl/ClientWebSocketImpl.java renamed to vertx-core/src/main/java/io/vertx/core/http/impl/websocket/ClientWebSocketImpl.java

@@ -8,13 +8,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-package io.vertx.core.http.impl;
+package io.vertx.core.http.impl.websocket;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.vertx.codegen.annotations.Nullable;
 import io.vertx.core.*;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.*;
+import io.vertx.core.http.impl.WebSocketClientImpl;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.http.ClientWebSocketInternal;
 import io.vertx.core.internal.http.WebSocketInternal;
@@ -46,7 +47,7 @@ public class ClientWebSocketImpl implements ClientWebSocketInternal {
   private Handler<Buffer> binaryMessageHandler;
   private Handler<Buffer> pongHandler;
 
-  ClientWebSocketImpl(WebSocketClientImpl client) {
+  public ClientWebSocketImpl(WebSocketClientImpl client) {
     this.client = client;
   }
 

vertx-core/src/main/java/io/vertx/core/http/impl/ServerWebSocketHandshaker.java renamed to vertx-core/src/main/java/io/vertx/core/http/impl/websocket/ServerWebSocketHandshaker.java

@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-package io.vertx.core.http.impl;
+package io.vertx.core.http.impl.websocket;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;

vertx-core/src/main/java/io/vertx/core/http/impl/ServerWebSocketImpl.java renamed to vertx-core/src/main/java/io/vertx/core/http/impl/websocket/ServerWebSocketImpl.java

@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
-package io.vertx.core.http.impl;
+package io.vertx.core.http.impl.websocket;
 
 import io.vertx.core.http.ServerWebSocket;
 import io.vertx.core.http.impl.http1x.Http1xServerRequest;