From 86c39b8a88d86818425a730094864ad365f59006 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Fri, 27 Sep 2024 15:24:09 +0200 Subject: [PATCH] Move WebSocketInternal to internal package --- .../java/io/vertx/core/http/impl/WebSocketImplBase.java | 1 + .../{http/impl => internal/http}/WebSocketInternal.java | 7 ++++--- .../src/test/java/io/vertx/tests/http/WebSocketTest.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename vertx-core/src/main/java/io/vertx/core/{http/impl => internal/http}/WebSocketInternal.java (84%) diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java b/vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java index 8be5c12b5c2..12cc947a231 100644 --- a/vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java +++ b/vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java @@ -33,6 +33,7 @@ import io.vertx.core.http.impl.ws.WebSocketFrameInternal; import io.vertx.core.internal.ContextInternal; import io.vertx.core.internal.PromiseInternal; +import io.vertx.core.internal.http.WebSocketInternal; import io.vertx.core.net.SocketAddress; import io.vertx.core.internal.concurrent.InboundMessageQueue; import io.vertx.core.net.impl.VertxConnection; diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketInternal.java b/vertx-core/src/main/java/io/vertx/core/internal/http/WebSocketInternal.java similarity index 84% rename from vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketInternal.java rename to vertx-core/src/main/java/io/vertx/core/internal/http/WebSocketInternal.java index 3984d0e17f4..3859f30de89 100644 --- a/vertx-core/src/main/java/io/vertx/core/http/impl/WebSocketInternal.java +++ b/vertx-core/src/main/java/io/vertx/core/internal/http/WebSocketInternal.java @@ -8,15 +8,16 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.core.http.impl; +package io.vertx.core.internal.http; import io.netty.channel.ChannelHandlerContext; -import io.vertx.core.http.HttpConnection; import io.vertx.core.http.WebSocket; -import io.vertx.core.http.WebSocketBase; public interface WebSocketInternal extends WebSocket { + /** + * @return the Netty channel handler context + */ ChannelHandlerContext channelHandlerContext(); } diff --git a/vertx-core/src/test/java/io/vertx/tests/http/WebSocketTest.java b/vertx-core/src/test/java/io/vertx/tests/http/WebSocketTest.java index b48756b92d6..b68a4c9f255 100644 --- a/vertx-core/src/test/java/io/vertx/tests/http/WebSocketTest.java +++ b/vertx-core/src/test/java/io/vertx/tests/http/WebSocketTest.java @@ -60,7 +60,7 @@ import io.vertx.core.http.WebsocketVersion; import io.vertx.core.http.impl.Http1xClientConnection; import io.vertx.core.http.impl.Http1xServerConnection; -import io.vertx.core.http.impl.WebSocketInternal; +import io.vertx.core.internal.http.WebSocketInternal; import io.vertx.core.http.impl.ws.WebSocketFrameImpl; import io.vertx.core.internal.VertxInternal; import io.vertx.core.internal.buffer.BufferInternal;