From 0d9de2822670cee7e2ca16ced238594d2c1ea45f Mon Sep 17 00:00:00 2001 From: Lachlan Date: Tue, 11 Jun 2019 21:08:52 +1000 Subject: [PATCH] Issue #3661 - move WebSocketSessionListener to WebSocket-API Signed-off-by: Lachlan Roberts --- .../jetty/websocket/api}/WebSocketSessionListener.java | 8 ++++---- .../eclipse/jetty/websocket/client/WebSocketClient.java | 2 +- .../eclipse/jetty/websocket/common/SessionTracker.java | 5 +++-- .../jetty/websocket/common/WebSocketContainer.java | 3 ++- .../eclipse/jetty/websocket/common/DummyContainer.java | 1 + .../websocket/server/JettyWebSocketServerContainer.java | 2 +- .../websocket/tests/client/ClientOpenSessionTracker.java | 8 ++++---- .../jetty/websocket/tests/client/ClientSessionsTest.java | 7 +++---- 8 files changed, 19 insertions(+), 17 deletions(-) rename jetty-websocket/{jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common => jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api}/WebSocketSessionListener.java (82%) diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSessionListener.java b/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java similarity index 82% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSessionListener.java rename to jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java index e6e2a4e9526..298102b5bc7 100644 --- a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSessionListener.java +++ b/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.common; +package org.eclipse.jetty.websocket.api; /** - * Interface for Listeners that are interested in knowing about the WebSocketSession history. + * Interface for Listeners that are interested in knowing about the Session history. */ public interface WebSocketSessionListener { - void onWebSocketSessionOpened(WebSocketSession session); + void onWebSocketSessionOpened(Session session); - void onWebSocketSessionClosed(WebSocketSession session); + void onWebSocketSessionClosed(Session session); } diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index 6528a9b5d1e..fb048c6bcf4 100644 --- a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -45,12 +45,12 @@ import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.UpgradeRequest; import org.eclipse.jetty.websocket.api.WebSocketBehavior; import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.api.WebSocketSessionListener; import org.eclipse.jetty.websocket.client.impl.JettyClientUpgradeRequest; import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandler; import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandlerFactory; import org.eclipse.jetty.websocket.common.SessionTracker; import org.eclipse.jetty.websocket.common.WebSocketContainer; -import org.eclipse.jetty.websocket.common.WebSocketSessionListener; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.client.UpgradeListener; diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java b/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java index 1e4589c7a1f..d8ca9cbfd19 100644 --- a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java +++ b/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java @@ -25,6 +25,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.WebSocketSessionListener; public class SessionTracker extends AbstractLifeCycle implements WebSocketSessionListener { @@ -36,13 +37,13 @@ public class SessionTracker extends AbstractLifeCycle implements WebSocketSessio } @Override - public void onWebSocketSessionOpened(WebSocketSession session) + public void onWebSocketSessionOpened(Session session) { sessions.add(session); } @Override - public void onWebSocketSessionClosed(WebSocketSession session) + public void onWebSocketSessionClosed(Session session) { sessions.remove(session); } diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java b/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java index 2b6bfca16ff..f0b027e6b76 100644 --- a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java +++ b/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java @@ -23,9 +23,10 @@ import java.util.concurrent.Executor; import java.util.function.Consumer; import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.WebSocketSessionListener; /** - * Generic interface to the Container (server or client) that jetty-websocket-common can use + * Generic interface to the Container (server or client) */ public interface WebSocketContainer { diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java b/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java index 82b82b2cf2c..e90f6452e98 100644 --- a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java +++ b/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java @@ -27,6 +27,7 @@ import java.util.function.Consumer; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.WebSocketSessionListener; public class DummyContainer extends ContainerLifeCycle implements WebSocketContainer { diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java index 710f5ce01d1..156fe27afaa 100644 --- a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java +++ b/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java @@ -36,9 +36,9 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketBehavior; import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.api.WebSocketSessionListener; import org.eclipse.jetty.websocket.common.SessionTracker; import org.eclipse.jetty.websocket.common.WebSocketContainer; -import org.eclipse.jetty.websocket.common.WebSocketSessionListener; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.WebSocketException; diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java index 59c8bc53b17..3c8a5e6cdb7 100644 --- a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java +++ b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java @@ -21,9 +21,9 @@ package org.eclipse.jetty.websocket.tests.client; import java.util.concurrent.CountDownLatch; import org.eclipse.jetty.io.Connection; +import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.WebSocketSessionListener; import org.eclipse.jetty.websocket.client.WebSocketClient; -import org.eclipse.jetty.websocket.common.WebSocketSession; -import org.eclipse.jetty.websocket.common.WebSocketSessionListener; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -64,12 +64,12 @@ public class ClientOpenSessionTracker implements Connection.Listener, WebSocketS } @Override - public void onWebSocketSessionOpened(WebSocketSession session) + public void onWebSocketSessionOpened(Session session) { } @Override - public void onWebSocketSessionClosed(WebSocketSession session) + public void onWebSocketSessionClosed(Session session) { this.closeSessionLatch.countDown(); } diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java index 7054af27dfd..19e4ba59898 100644 --- a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java +++ b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java @@ -34,11 +34,10 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.websocket.api.RemoteEndpoint; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.StatusCode; +import org.eclipse.jetty.websocket.api.WebSocketSessionListener; import org.eclipse.jetty.websocket.api.util.WSURI; import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.WebSocketClient; -import org.eclipse.jetty.websocket.common.WebSocketSession; -import org.eclipse.jetty.websocket.common.WebSocketSessionListener; import org.eclipse.jetty.websocket.server.JettyWebSocketServlet; import org.eclipse.jetty.websocket.server.JettyWebSocketServletContainerInitializer; import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory; @@ -105,12 +104,12 @@ public class ClientSessionsTest client.addSessionListener(new WebSocketSessionListener() { @Override - public void onWebSocketSessionOpened(WebSocketSession session) + public void onWebSocketSessionOpened(Session session) { } @Override - public void onWebSocketSessionClosed(WebSocketSession session) + public void onWebSocketSessionClosed(Session session) { onSessionCloseLatch.countDown(); }