Add a controller for websockets.

The handler can't be dependency injected (as it's created by the
framework) so, in order to minimise the amount of static
horribleness, pass in a controller which can do the actual work
and have proper dependencies.

ui_web2/src/com/dmdirc/addons/ui_web2/WebSocketController.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_web2;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jetty.websocket.api.Session;
+
+/**
+ * Manages events raised by the {@link WebSocketHandler}.
+ *
+ * <p>This serves as a bridge between the {@link WebSocketHandler}, which cannot have dependencies
+ * passed in sanely due to the framework, and the rest of the plugin/client.
+ */
+@Singleton
+public class WebSocketController {
+
+    private final Collection<Session> sessions = new CopyOnWriteArrayList<Session>();
+
+    @Inject
+    public WebSocketController() {
+    }
+
+    void sessionConnected(final Session session) {
+        sessions.add(session);
+    }
+
+    void sessionClosed(final Session session, final int statusCode, final String reason) {
+        sessions.remove(session);
+    }
+
+    void messageReceived(final Session session, final String message) {
+        // Echo the message back for testing
+        sendMessage(session, message);
+    }
+
+    /**
+     * Sends a message to a specific session.
+     *
+     * @param session The session to send a message to.
+     * @param message The message to be sent.
+     */
+    public void sendMessage(final Session session, final String message) {
+        try {
+            WebSocketHandler.sendMessage(session, message);
+        } catch (IOException ex) {
+            // TODO: Raise an error...
+        }
+    }
+
+    /**
+     * Sends a message to all connected sessions.
+     *
+     * @param message The message to be sent.
+     */
+    public void sendMessage(final String message) {
+        sessions.forEach(s -> sendMessage(s, message));
+    }
+
+}

ui_web2/src/com/dmdirc/addons/ui_web2/WebSocketHandler.java

@@ -23,8 +23,6 @@
 package com.dmdirc.addons.ui_web2;
 
 import java.io.IOException;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
@@ -38,21 +36,36 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 @WebSocket
 public class WebSocketHandler {
 
-    private static final Queue<Session> sessions = new ConcurrentLinkedQueue<>();
+    /** Controller to use. */
+    @SuppressWarnings("StaticNonFinalField")
+    private static WebSocketController controller;
+
+    /**
+     * Sets the controller that manages ALL instances of {@link WebSocketHandler}.
+     *
+     * @param controller Controller to use.
+     */
+    @SuppressWarnings("StaticMethodOnlyUsedInOneClass")
+    public static void setController(final WebSocketController controller) {
+        WebSocketHandler.controller = controller;
+    }
 
     @OnWebSocketConnect
     public void connected(final Session session) {
-        sessions.add(session);
+        controller.sessionConnected(session);
     }
 
     @OnWebSocketClose
     public void closed(final Session session, final int statusCode, final String reason) {
-        sessions.remove(session);
+        controller.sessionClosed(session, statusCode, reason);
     }
 
     @OnWebSocketMessage
-    public void message(final Session session, final String message) throws IOException {
-        // Echo the message back, for testing.
+    public void message(final Session session, final String message) {
+        controller.messageReceived(session, message);
+    }
+
+    public static void sendMessage(final Session session, final String message) throws IOException {
         session.getRemote().sendString(message);
     }
 

ui_web2/src/com/dmdirc/addons/ui_web2/WebUiModule.java

@@ -68,7 +68,9 @@ public class WebUiModule {
     @Singleton
     public WebServer getWebServer(
             @PluginDomain(WebUiPlugin.class) final String domain,
-            @GlobalConfig final AggregateConfigProvider globalConfig) {
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final WebSocketController controller) {
+        WebSocketHandler.setController(controller);
         final int port = globalConfig.getOptionInt(domain, "port");
         return new WebServer(port);
     }