Updated Branches: refs/heads/master 135d75ff6 -> 0411fdccf
WICKET-4832 Websocket broadcast support Simplify the holder for IWebSocketSettings by using static methods. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0411fdcc Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0411fdcc Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0411fdcc Branch: refs/heads/master Commit: 0411fdccf44c3a66a9354d273e6cbd187720d84d Parents: 135d75f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Dec 7 11:12:18 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Dec 7 11:12:18 2012 +0100 ---------------------------------------------------------------------- .../wicket/protocol/ws/IWebSocketSettings.java | 6 ++---- .../ws/api/AbstractWebSocketProcessor.java | 2 +- .../protocol/ws/api/WebSocketPushBroadcaster.java | 2 +- .../ws/util/tester/WebSocketTesterTest.java | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0411fdcc/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/IWebSocketSettings.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/IWebSocketSettings.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/IWebSocketSettings.java index 9d64f06..b3a3833 100644 --- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/IWebSocketSettings.java +++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/IWebSocketSettings.java @@ -41,7 +41,7 @@ public interface IWebSocketSettings */ public static final class Holder { - public IWebSocketSettings get(Application application) + public static IWebSocketSettings get(Application application) { IWebSocketSettings settings = application.getMetaData(KEY); if (settings == null) @@ -58,14 +58,12 @@ public interface IWebSocketSettings return settings; } - public void set(Application application, IWebSocketSettings settings) + public static void set(Application application, IWebSocketSettings settings) { application.setMetaData(KEY, settings); } } - public static final Holder HOLDER = new Holder(); - /** * The executor for processing websocket push messages broadcasted to all sessions. * http://git-wip-us.apache.org/repos/asf/wicket/blob/0411fdcc/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java index 7b58d11..15c4647 100644 --- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java +++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java @@ -83,7 +83,7 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor this.webRequest = new WebSocketRequest(new ServletRequestCopy(request)); this.application = Args.notNull(application, "application"); - IWebSocketSettings webSocketSettings = IWebSocketSettings.HOLDER.get(application); + IWebSocketSettings webSocketSettings = IWebSocketSettings.Holder.get(application); this.connectionRegistry = webSocketSettings.getConnectionRegistry(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/0411fdcc/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketPushBroadcaster.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketPushBroadcaster.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketPushBroadcaster.java index 7a016f0..a2a81ef 100644 --- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketPushBroadcaster.java +++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketPushBroadcaster.java @@ -110,7 +110,7 @@ public class WebSocketPushBroadcaster private void process(final Application application, final Collection<IWebSocketConnection> wsConnections, final IWebSocketPushMessage message) { - IWebSocketSettings webSocketSettings = IWebSocketSettings.HOLDER.get(application); + IWebSocketSettings webSocketSettings = IWebSocketSettings.Holder.get(application); Executor executor = webSocketSettings.getWebSocketPushMessageExecutor(); for (final IWebSocketConnection wsConnection : wsConnections) { http://git-wip-us.apache.org/repos/asf/wicket/blob/0411fdcc/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java index 0313db4..995bd9d 100644 --- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java +++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java @@ -150,7 +150,7 @@ public class WebSocketTesterTest extends Assert tester.getSession().bind(); new WebSocketTester(tester, page); - IWebSocketSettings webSocketSettings = IWebSocketSettings.HOLDER.get(tester.getApplication()); + IWebSocketSettings webSocketSettings = IWebSocketSettings.Holder.get(tester.getApplication()); WebSocketPushBroadcaster broadcaster = new WebSocketPushBroadcaster(webSocketSettings.getConnectionRegistry()); ConnectedMessage wsMessage = new ConnectedMessage(tester.getApplication(), tester.getHttpSession().getId(), page.getPageId());
