Pass in dependencies to ServerManager explicitly.

Avoid static/singleton references, and use a temporary Provider<>
implementation that will eventually be replaced by Dagger.

Change-Id: Id1bda9437f71cc9ddceb0a9ed1ba38d4787f2226
Reviewed-on: http://gerrit.dmdirc.com/2671
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/Main.java

@@ -57,6 +57,8 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import javax.inject.Provider;
+
 /**
  * Main class, handles initialisation.
  */
@@ -66,7 +68,7 @@ public class Main implements LifecycleController {
     private final int FEEDBACK_DELAY = 30 * 60 * 1000;
 
     /** The UI to use for the client. */
-    private final Collection<UIController> CONTROLLERS = new HashSet<UIController>();
+    private final Collection<UIController> CONTROLLERS = new HashSet<>();
 
     /** The config dir to use for the client. */
     private String configdir;
@@ -106,7 +108,9 @@ public class Main implements LifecycleController {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
 
         IdentityManager.getIdentityManager().loadVersionIdentity();
-        serverManager = new ServerManager();
+        serverManager = new ServerManager(
+                new ParserFactoryProvider(),
+                IdentityManager.getIdentityManager());
         ActionManager.initActionManager(serverManager, IdentityManager.getIdentityManager());
 
         final CommandLineParser clp = new CommandLineParser(this, args);
@@ -506,4 +510,16 @@ public class Main implements LifecycleController {
         }
     }
 
+    /**
+     * Temporary class to lazily provide {@link ParserFactory}s.
+     */
+    private class ParserFactoryProvider implements Provider<ParserFactory> {
+
+        /** {@inheritDoc} */
+        @Override
+        public ParserFactory get() {
+            return new ParserFactory(pluginManager);
+        }
+    }
+
 }

src/com/dmdirc/ServerManager.java

@@ -27,7 +27,7 @@ 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.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -41,6 +41,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import javax.inject.Provider;
+
 /**
  * The ServerManager maintains a list of all servers, and provides methods to
  * search or iterate over them.
@@ -48,12 +50,25 @@ import java.util.concurrent.CopyOnWriteArraySet;
 public class ServerManager implements ServerFactory {
 
     /** All servers that currently exist. */
-    private final Set<Server> servers = new CopyOnWriteArraySet<Server>();
+    private final Set<Server> servers = new CopyOnWriteArraySet<>();
+
+    /** Provider of {@link ParserFactory}s for servers. */
+    private final Provider<ParserFactory> parserFactoryProvider;
+
+    /** The identity controller to use to find profiles. */
+    private final IdentityController identityController;
 
     /**
      * Creates a new instance of ServerManager.
+     *
+     * @param parserFactoryProvider The provider of {@link ParserFactory}s to give to servers.
+     * @param identityController The identity controller to use to find profiles.
      */
-    public ServerManager() {
+    public ServerManager(
+            final Provider<ParserFactory> parserFactoryProvider,
+            final IdentityController identityController) {
+        this.parserFactoryProvider = parserFactoryProvider;
+        this.identityController = identityController;
     }
 
     /** {@inheritDoc} */
@@ -65,7 +80,7 @@ public class ServerManager implements ServerFactory {
                 this,
                 configManager,
                 new ServerCommandParser(configManager),
-                new ParserFactory(Main.mainInstance.getPluginManager()),
+                parserFactoryProvider.get(),
                 WindowManager.getWindowManager(),
                 AliasWrapper.getAliasWrapper(),
                 CommandManager.getCommandManager(),
@@ -98,7 +113,7 @@ public class ServerManager implements ServerFactory {
      * @return A list of all servers
      */
     public List<Server> getServers() {
-        return new ArrayList<Server>(servers);
+        return new ArrayList<>(servers);
     }
 
     /**
@@ -150,7 +165,7 @@ public class ServerManager implements ServerFactory {
      * @return A list of servers connected to the network
      */
     public List<Server> getServersByNetwork(final String network) {
-        final List<Server> res = new ArrayList<Server>();
+        final List<Server> res = new ArrayList<>();
 
         for (Server server : servers) {
             if (server.isNetwork(network)) {
@@ -168,7 +183,7 @@ public class ServerManager implements ServerFactory {
      * @return A list of servers connected to the network
      */
     public List<Server> getServersByAddress(final String address) {
-        final List<Server> res = new ArrayList<Server>();
+        final List<Server> res = new ArrayList<>();
 
         for (Server server : servers) {
             if (server.getAddress().equalsIgnoreCase(address)) {
@@ -188,8 +203,8 @@ public class ServerManager implements ServerFactory {
      * @since 0.6.3
      */
     public Server connectToAddress(final URI uri) {
-        return connectToAddress(uri, IdentityManager.getIdentityManager()
-                .getIdentitiesByType("profile").get(0));
+        return connectToAddress(uri,
+                identityController.getIdentitiesByType("profile").get(0));
     }
 
     /**
@@ -249,8 +264,7 @@ public class ServerManager implements ServerFactory {
 
         if (connectedServer == null) {
             try {
-                connectToAddress(new URI("irc://irc.quakenet.org/DMDirc"),
-                        IdentityManager.getIdentityManager().getIdentitiesByType("profile").get(0));
+                connectToAddress(new URI("irc://irc.quakenet.org/DMDirc"));
             } catch (URISyntaxException ex) {
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to construct new server", ex);
             }

test/com/dmdirc/ServerManagerTest.java

@@ -22,23 +22,32 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 
+import javax.inject.Provider;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ServerManagerTest {
 
+    @Mock private IdentityController identityController;
+    @Mock private Provider<ParserFactory> parserFactoryProvider;
     private ServerManager serverManager;
 
     @Before
     public void setUp() throws Exception {
-        serverManager = new ServerManager();
+        serverManager = new ServerManager(parserFactoryProvider, identityController);
     }
 
     @After

test/com/dmdirc/TestMain.java

@@ -6,17 +6,25 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.plugins.PluginManager;
 
+import javax.inject.Provider;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
 /**
  * Main subclass to init things needed for testing.
  */
 public class TestMain extends Main {
     private static Main instance;
 
+    @Mock private Provider<ParserFactory> parserFactoryProvider;
+
     public TestMain() { }
 
     /** {@inheritDoc} */
     @Override
     public void init(final String[] args) {
+        MockitoAnnotations.initMocks(this);
+
         // TODO: Tests probably shouldn't rely on a config dir... Who knows
         //       what the user has done with their config.
         IdentityManager.getIdentityManager().loadVersionIdentity();
@@ -28,7 +36,9 @@ public class TestMain extends Main {
             // DON'T do anything to the user's configuration... (so no calls
             // to handleInvalidConfigFile(); here)
         }
-        serverManager = new ServerManager();
+        serverManager = new ServerManager(
+                parserFactoryProvider,
+                IdentityManager.getIdentityManager());
         ActionManager.initActionManager(serverManager, IdentityManager.getIdentityManager());
         pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
         pluginManager.refreshPlugins();