Pass in most dependencies to Server.

Remove all static/singleton references in the constructor so that
Servers can be instansiated sensibly without all the client existing.

Also change everything that creates a Server to use the appropriate
method in the ServerManager instead of doing it manually.

Depends-On: I3fff818d6e6694163660a36f47d60271d8f0e68e
Change-Id: I9842c20b4e4ff846c9bbf4858da794a843c3b053
Reviewed-on: http://gerrit.dmdirc.com/2655
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/Main.java

@@ -89,7 +89,8 @@ public class Main {
     @SuppressWarnings("PMD.AvoidCatchingThrowable")
     public static void main(final String[] args) {
         try {
-            new Main().init(args);
+            mainInstance = new Main();
+            mainInstance.init(args);
         } catch (Throwable ex) {
             Logger.appError(ErrorLevel.FATAL, "Exception while initialising",
                     ex);
@@ -105,7 +106,7 @@ public class Main {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
 
         IdentityManager.getIdentityManager().loadVersionIdentity();
-        serverManager = new ServerManager(this);
+        serverManager = new ServerManager();
         ActionManager.initActionManager(this, serverManager, IdentityManager.getIdentityManager());
 
         final CommandLineParser clp = new CommandLineParser(this, args);

src/com/dmdirc/Server.java

@@ -25,13 +25,13 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.parsers.ServerCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.AwayStateListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
@@ -194,35 +194,53 @@ public class Server extends WritableFrameContainer
      * the specified profile.
      *
      * @since 0.6.3
-     * @param manager The servermanager that owns this server.
+     * @param manager The server manager that owns this server.
+     * @param configManager THe configuration manager to read config settings from.
+     * @param commandParser The parser to use for commands in this server's window.
+     * @param parserFactory The factory to use to generate parsers.
+     * @param windowManager The window manager to register this server with.
+     * @param aliasWrapper The actions wrapper to retrieve aliases from.
+     * @param commandController The controller to use to retrieve commands.
      * @param uri The address of the server to connect to
      * @param profile The profile to use
      */
-    public Server(final ServerManager manager, final URI uri, final Identity profile) {
-        super("server-disconnected", getHost(uri), getHost(uri),
-                new ConfigManager(uri.getScheme(), "", "", uri.getHost()),
-                new ServerCommandParser(
-                new ConfigManager(uri.getScheme(), "", "", uri.getHost())),
+    public Server(
+            final ServerManager manager,
+            final ConfigManager configManager,
+            final CommandParser commandParser,
+            final ParserFactory parserFactory,
+            final WindowManager windowManager,
+            final AliasWrapper aliasWrapper,
+            final CommandController commandController,
+            final URI uri,
+            final Identity profile) {
+        super("server-disconnected",
+                getHost(uri),
+                getHost(uri),
+                configManager,
+                commandParser,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
         this.manager = manager;
-        parserFactory = new ParserFactory(manager.getMain().getPluginManager());
+        this.parserFactory = parserFactory;
         setConnectionDetails(uri, profile);
 
         manager.registerServer(this);
-        WindowManager.getWindowManager().addWindow(this);
+        windowManager.addWindow(this);
 
+        // TODO: Server shouldn't have to know about the alias wrapper.
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                AliasWrapper.getAliasWrapper().getAliases());
+                aliasWrapper.getAliases());
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_SERVER));
+                commandController.getCommandNames(CommandType.TYPE_SERVER));
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_GLOBAL));
+                commandController.getCommandNames(CommandType.TYPE_GLOBAL));
 
         updateIcon();
 
+        // TODO: Don't start timers in the constructor!
         whoTimer = new Timer("Server Who Timer");
         whoTimer.schedule(new TimerTask() {
             @Override

src/com/dmdirc/ServerManager.java

@@ -22,12 +22,17 @@
 
 package com.dmdirc;
 
+import com.dmdirc.actions.wrappers.AliasWrapper;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.parsers.ServerCommandParser;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.ui.WindowManager;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -42,34 +47,30 @@ import java.util.concurrent.CopyOnWriteArraySet;
  */
 public class ServerManager implements ServerFactory {
 
-    /** Main that owns this ServerManager. */
-    private final Main main;
-
     /** All servers that currently exist. */
     private final Set<Server> servers = new CopyOnWriteArraySet<Server>();
 
     /**
      * Creates a new instance of ServerManager.
      */
-    public ServerManager(final Main main) {
-        this.main = main;
-    }
-
-    /**
-     * Get the Main that owns this ServerManager.
-     *
-     * @return The Main that owns this ServerManager.
-     * @Deprecated Global state is bad.
-     */
-    @Deprecated
-    public Main getMain() {
-        return main;
+    public ServerManager() {
     }
 
     /** {@inheritDoc} */
     @Override
     public Server createServer(final URI uri, final Identity profile) {
-        return new Server(this, uri, profile);
+        final ConfigManager configManager = new ConfigManager(uri.getScheme(), "", "", uri.getHost());
+
+        return new Server(
+                this,
+                configManager,
+                new ServerCommandParser(configManager),
+                new ParserFactory(Main.mainInstance.getPluginManager()),
+                WindowManager.getWindowManager(),
+                AliasWrapper.getAliasWrapper(),
+                CommandManager.getCommandManager(),
+                uri,
+                profile);
     }
 
     /**
@@ -212,7 +213,7 @@ public class ServerManager implements ServerFactory {
         }
 
         if (server == null) {
-            server = new Server(this, uri, profile);
+            server = createServer(uri, profile);
             server.connect();
             return server;
         }
@@ -248,10 +249,8 @@ public class ServerManager implements ServerFactory {
 
         if (connectedServer == null) {
             try {
-                final Server server = new Server(this, new URI("irc://irc.quakenet.org/DMDirc"),
-                        IdentityManager.getIdentityManager()
-                        .getIdentitiesByType("profile").get(0));
-                server.connect();
+                connectToAddress(new URI("irc://irc.quakenet.org/DMDirc"),
+                        IdentityManager.getIdentityManager().getIdentitiesByType("profile").get(0));
             } catch (URISyntaxException ex) {
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to construct new server", ex);
             }

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -42,7 +42,7 @@ import java.util.List;
 /**
  * Encapsulates alias actions.
  */
-public final class AliasWrapper extends ActionGroup {
+public class AliasWrapper extends ActionGroup {
 
     /** Singleton instance of the alias wrapper. */
     private static AliasWrapper me;

test/com/dmdirc/ServerManagerTest.java

@@ -25,7 +25,7 @@ package com.dmdirc;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 
 import org.junit.After;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -34,66 +34,43 @@ import static org.mockito.Mockito.*;
 
 public class ServerManagerTest {
 
-    @BeforeClass
-    public static void setUp() throws Exception {
-        TestMain.getTestMain();
+    private ServerManager serverManager;
+
+    @Before
+    public void setUp() throws Exception {
+        serverManager = new ServerManager();
     }
 
     @After
     public void tearDown() {
-        for (Server server : TestMain.getTestMain().getServerManager().getServers()) {
-            TestMain.getTestMain().getServerManager().unregisterServer(server);
+        for (Server server : serverManager.getServers()) {
+            serverManager.unregisterServer(server);
         }
     }
 
-    @Test
-    public void testGetServerManager() {
-        final ServerManager resultA = TestMain.getTestMain().getServerManager();
-        final ServerManager resultB = TestMain.getTestMain().getServerManager();
-
-        assertNotNull(resultA);
-        assertTrue(resultA instanceof ServerManager);
-        assertEquals(resultA, resultB);
-    }
-
     @Test
     public void testRegisterServer() {
         final Server server = mock(Server.class);
-
-        final ServerManager instance = TestMain.getTestMain().getServerManager();
-
-        instance.registerServer(server);
-
-        assertEquals(1, instance.numServers());
+        serverManager.registerServer(server);
+        assertEquals(1, serverManager.numServers());
     }
 
     @Test
     public void testUnregisterServer() {
         final Server server = mock(Server.class);
-
-        final ServerManager instance = TestMain.getTestMain().getServerManager();
-
-        instance.registerServer(server);
-        instance.unregisterServer(server);
-
-        assertEquals(0, instance.numServers());
+        serverManager.registerServer(server);
+        serverManager.unregisterServer(server);
+        assertEquals(0, serverManager.numServers());
     }
 
     @Test
     public void testNumServers() {
-        final ServerManager instance = TestMain.getTestMain().getServerManager();
-
-        assertEquals(instance.getServers().size(), instance.numServers());
-
+        assertEquals(serverManager.getServers().size(), serverManager.numServers());
         final Server server = mock(Server.class);
-
-        instance.registerServer(server);
-
-        assertEquals(instance.getServers().size(), instance.numServers());
-
-        instance.unregisterServer(server);
-
-        assertEquals(instance.getServers().size(), instance.numServers());
+        serverManager.registerServer(server);
+        assertEquals(serverManager.getServers().size(), serverManager.numServers());
+        serverManager.unregisterServer(server);
+        assertEquals(serverManager.getServers().size(), serverManager.numServers());
     }
 
     @Test
@@ -103,14 +80,12 @@ public class ServerManagerTest {
         when(serverA.getAddress()).thenReturn("255.255.255.255");
         when(serverB.getAddress()).thenReturn("255.255.255.254");
 
-        final ServerManager sm = TestMain.getTestMain().getServerManager();
+        serverManager.registerServer(serverA);
+        serverManager.registerServer(serverB);
 
-        sm.registerServer(serverA);
-        sm.registerServer(serverB);
-
-        assertEquals(serverA, sm.getServersByAddress("255.255.255.255").get(0));
-        assertEquals(serverB, sm.getServersByAddress("255.255.255.254").get(0));
-        assertEquals(0, sm.getServersByAddress("255.255.255.253").size());
+        assertEquals(serverA, serverManager.getServersByAddress("255.255.255.255").get(0));
+        assertEquals(serverB, serverManager.getServersByAddress("255.255.255.254").get(0));
+        assertEquals(0, serverManager.getServersByAddress("255.255.255.253").size());
     }
 
     @Test
@@ -123,27 +98,25 @@ public class ServerManagerTest {
         when(serverB.isNetwork("Net2")).thenReturn(true);
         when(serverC.isNetwork("Net2")).thenReturn(true);
 
-        final ServerManager sm = TestMain.getTestMain().getServerManager();
-
-        sm.registerServer(serverA);
-        sm.registerServer(serverB);
-        sm.registerServer(serverC);
+        serverManager.registerServer(serverA);
+        serverManager.registerServer(serverB);
+        serverManager.registerServer(serverC);
 
-        assertEquals(1, sm.getServersByNetwork("Net1").size());
-        assertEquals(serverA, sm.getServersByNetwork("Net1").get(0));
+        assertEquals(1, serverManager.getServersByNetwork("Net1").size());
+        assertEquals(serverA, serverManager.getServersByNetwork("Net1").get(0));
 
-        assertEquals(2, sm.getServersByNetwork("Net2").size());
-        assertEquals(serverB, sm.getServersByNetwork("Net2").get(0));
-        assertEquals(serverC, sm.getServersByNetwork("Net2").get(1));
+        assertEquals(2, serverManager.getServersByNetwork("Net2").size());
+        assertEquals(serverB, serverManager.getServersByNetwork("Net2").get(0));
+        assertEquals(serverC, serverManager.getServersByNetwork("Net2").get(1));
 
-        assertEquals(0, sm.getServersByNetwork("Net3").size());
+        assertEquals(0, serverManager.getServersByNetwork("Net3").size());
     }
 
     @Test
     public void testCloseAll() {
         final Server serverA = mock(Server.class);
-        TestMain.getTestMain().getServerManager().registerServer(serverA);
-        TestMain.getTestMain().getServerManager().closeAll();
+        serverManager.registerServer(serverA);
+        serverManager.closeAll();
         verify(serverA).disconnect();
         verify(serverA).close();
     }
@@ -151,8 +124,8 @@ public class ServerManagerTest {
     @Test
     public void testCloseAllWithMessage() {
         final Server serverA = mock(Server.class);
-        TestMain.getTestMain().getServerManager().registerServer(serverA);
-        TestMain.getTestMain().getServerManager().closeAll("message here");
+        serverManager.registerServer(serverA);
+        serverManager.closeAll("message here");
         verify(serverA).disconnect("message here");
         verify(serverA).close();
     }
@@ -160,8 +133,8 @@ public class ServerManagerTest {
     @Test
     public void testDisconnectAll() {
         final Server serverA = mock(Server.class);
-        TestMain.getTestMain().getServerManager().registerServer(serverA);
-        TestMain.getTestMain().getServerManager().disconnectAll("message here");
+        serverManager.registerServer(serverA);
+        serverManager.disconnectAll("message here");
         verify(serverA).disconnect("message here");
     }
 
@@ -172,8 +145,8 @@ public class ServerManagerTest {
         when(serverA.hasChannel("#DMDirc")).thenReturn(true);
         when(serverA.getState()).thenReturn(ServerState.CONNECTED);
 
-        TestMain.getTestMain().getServerManager().registerServer(serverA);
-        TestMain.getTestMain().getServerManager().joinDevChat();
+        serverManager.registerServer(serverA);
+        serverManager.joinDevChat();
 
         verify(serverA).join(new ChannelJoinRequest("#DMDirc"));
     }
@@ -185,8 +158,8 @@ public class ServerManagerTest {
         when(serverA.hasChannel("#DMDirc")).thenReturn(false);
         when(serverA.getState()).thenReturn(ServerState.CONNECTED);
 
-        TestMain.getTestMain().getServerManager().registerServer(serverA);
-        TestMain.getTestMain().getServerManager().joinDevChat();
+        serverManager.registerServer(serverA);
+        serverManager.joinDevChat();
 
         verify(serverA).join(new ChannelJoinRequest("#DMDirc"));
     }
@@ -202,12 +175,12 @@ public class ServerManagerTest {
         when(serverB.getNetwork()).thenReturn("Foonet");
         when(serverB.getState()).thenReturn(ServerState.CONNECTED);
 
-        TestMain.getTestMain().getServerManager().registerServer(serverA);
-        TestMain.getTestMain().getServerManager().registerServer(serverB);
+        serverManager.registerServer(serverA);
+        serverManager.registerServer(serverB);
 
-        TestMain.getTestMain().getServerManager().joinDevChat();
+        serverManager.joinDevChat();
 
-        assertEquals(3, TestMain.getTestMain().getServerManager().numServers());
+        assertEquals(3, serverManager.numServers());
     }
 
 }

test/com/dmdirc/ServerTest.java

@@ -22,27 +22,53 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.actions.wrappers.AliasWrapper;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.ui.WindowManager;
 
-import com.dmdirc.plugins.PluginManager;
 import java.net.URI;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 
+import static org.mockito.Mockito.*;
 import static org.junit.Assert.*;
 
 public class ServerTest {
 
-    private static Server server;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        TestMain.getTestMain();
-        server = new Server(TestMain.getTestMain().getServerManager(), new URI("irc-test://255.255.255.255"),
-                IdentityManager.getIdentityManager()
-                .getIdentitiesByType("profile").get(0));
+    @Mock private ServerManager serverManager;
+    @Mock private Identity profile;
+    @Mock private ConfigManager configManager;
+    @Mock private CommandParser commandParser;
+    @Mock private ParserFactory parserFactory;
+    @Mock private WindowManager windowManager;
+    @Mock private AliasWrapper aliasWrapper;
+    @Mock private CommandController commandController;
+
+    private Server server;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        when(configManager.getOptionInt(anyString(), anyString()))
+                .thenReturn(Integer.MAX_VALUE);
+
+        server = new Server(
+                serverManager,
+                configManager,
+                commandParser,
+                parserFactory,
+                windowManager,
+                aliasWrapper,
+                commandController,
+                new URI("irc-test://255.255.255.255"),
+                profile);
     }
 
     @Test
@@ -64,19 +90,14 @@ public class ServerTest {
 
     @Test
     public void testDuplicateInviteRemoval() {
-        server.disconnect();
-
         server.addInvite(new Invite(server, "#chan1", "a!b@c"));
         server.addInvite(new Invite(server, "#chan1", "d!e@f"));
 
         assertEquals(1, server.getInvites().size());
-        server.removeInvites("#chan1");
     }
 
     @Test
     public void testRemoveInvites() {
-        server.disconnect();
-
         server.addInvite(new Invite(server, "#chan1", "a!b@c"));
         server.addInvite(new Invite(server, "#chan2", "d!e@f"));
 

test/com/dmdirc/TestMain.java

@@ -28,7 +28,7 @@ public class TestMain extends Main {
             // DON'T do anything to the user's configuration... (so no calls
             // to handleInvalidConfigFile(); here)
         }
-        serverManager = new ServerManager(this);
+        serverManager = new ServerManager();
         ActionManager.initActionManager(this, serverManager, IdentityManager.getIdentityManager());
         pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
         pluginManager.refreshPlugins();