Introduce Dagger.

Start off with the simple stuff, just providing unitialised managers
and having Main do all the wiring. Update the tests to match.

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

src/com/dmdirc/ClientModule.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2006-2013 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;
+
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Provides dependencies for the client.
+ */
+@Module(injects = Main.class)
+public class ClientModule {
+
+    /**
+     * Provides an identity manager for the client.
+     *
+     * @return An unitialised {@link IdentityManager}.
+     */
+    @Provides
+    @Singleton
+    public IdentityManager getIdentityManager() {
+        final IdentityManager identityManager = new IdentityManager();
+        IdentityManager.setIdentityManager(identityManager);
+        identityManager.loadVersionIdentity();
+        return identityManager;
+    }
+
+    /**
+     * Provides an identity controller.
+     *
+     * @param manager The identity manager to use as a controller.
+     * @return An identity controller to use.
+     */
+    @Provides
+    public IdentityController getIdentityController(final IdentityManager manager) {
+        return manager;
+    }
+
+    /**
+     * Provides a parser factory.
+     *
+     * @return A parser factory for use in the client.
+     */
+    @Provides
+    public ParserFactory getParserFactory() {
+        return new ParserFactory(Main.mainInstance.getPluginManager());
+    }
+
+    /**
+     * Provides an action manager.
+     *
+     * @param serverManager The server manager to use to iterate servers.
+     * @param identityController The identity controller to use to look up settings.
+     * @return An unitialised action manager.
+     */
+    @Provides
+    @Singleton
+    public ActionManager getActionManager(final ServerManager serverManager, final IdentityController identityController) {
+        final ActionManager actionManager = new ActionManager(serverManager, identityController);
+        ActionManager.setActionManager(actionManager);
+        return actionManager;
+    }
+
+}

src/com/dmdirc/Main.java

@@ -57,7 +57,9 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import javax.inject.Provider;
+import javax.inject.Inject;
+
+import dagger.ObjectGraph;
 
 /**
  * Main class, handles initialisation.
@@ -70,6 +72,15 @@ public class Main implements LifecycleController {
     /** The UI to use for the client. */
     private final Collection<UIController> CONTROLLERS = new HashSet<>();
 
+    /** The identity manager the client will use. */
+    private final IdentityManager identityManager;
+
+    /** The server manager the client will use. */
+    private final ServerManager serverManager;
+
+    /** The action manager the client will use. */
+    private final ActionManager actionManager;
+
     /** The config dir to use for the client. */
     private String configdir;
 
@@ -80,8 +91,22 @@ public class Main implements LifecycleController {
     /** Instance of pluginmanager used by this Main. */
     protected PluginManager pluginManager;
 
-    /** Our ServerManager. */
-    protected ServerManager serverManager;
+    /**
+     * Creates a new instance of {@link Main}.
+     *
+     * @param identityManager The identity manager the client will use.
+     * @param serverManager The server manager the client will use.
+     * @param actionManager The action manager the client will use.
+     */
+    @Inject
+    public Main(
+            final IdentityManager identityManager,
+            final ServerManager serverManager,
+            final ActionManager actionManager) {
+        this.identityManager = identityManager;
+        this.serverManager = serverManager;
+        this.actionManager = actionManager;
+    }
 
     /**
      * Entry procedure.
@@ -91,7 +116,8 @@ public class Main implements LifecycleController {
     @SuppressWarnings("PMD.AvoidCatchingThrowable")
     public static void main(final String[] args) {
         try {
-            mainInstance = new Main();
+            ObjectGraph graph = ObjectGraph.create(new ClientModule());
+            mainInstance = graph.get(Main.class);
             mainInstance.init(args);
         } catch (Throwable ex) {
             Logger.appError(ErrorLevel.FATAL, "Exception while initialising",
@@ -107,15 +133,6 @@ public class Main implements LifecycleController {
     public void init(final String[] args) {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
 
-        final IdentityManager identityManager = new IdentityManager();
-        IdentityManager.setIdentityManager(identityManager);
-        identityManager.loadVersionIdentity();
-
-        serverManager = new ServerManager(new ParserFactoryProvider(), identityManager);
-
-        final ActionManager actionManager = new ActionManager(serverManager, identityManager);
-        ActionManager.setActionManager(actionManager);
-
         final CommandLineParser clp = new CommandLineParser(this, args);
 
         try {
@@ -510,16 +527,4 @@ 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

@@ -41,12 +41,15 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import javax.inject.Inject;
 import javax.inject.Provider;
+import javax.inject.Singleton;
 
 /**
  * The ServerManager maintains a list of all servers, and provides methods to
  * search or iterate over them.
  */
+@Singleton
 public class ServerManager implements ServerFactory {
 
     /** All servers that currently exist. */
@@ -64,6 +67,7 @@ public class ServerManager implements ServerFactory {
      * @param parserFactoryProvider The provider of {@link ParserFactory}s to give to servers.
      * @param identityController The identity controller to use to find profiles.
      */
+    @Inject
     public ServerManager(
             final Provider<ParserFactory> parserFactoryProvider,
             final IdentityController identityController) {

test/com/dmdirc/TestMain.java

@@ -6,29 +6,31 @@ 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;
+import static org.mockito.Mockito.*;
 
 /**
  * Main subclass to init things needed for testing.
  */
 public class TestMain extends Main {
+
     private static Main instance;
 
-    @Mock private Provider<ParserFactory> parserFactoryProvider;
+    private final IdentityManager identityManager;
+    private final ServerManager serverManager;
+    private final ActionManager actionManager;
 
-    public TestMain() { }
+    public TestMain(final IdentityManager identityManager,
+            final ServerManager serverManager,
+            final ActionManager actionManager) {
+        super(identityManager, serverManager, actionManager);
+        this.identityManager = identityManager;
+        this.serverManager = serverManager;
+        this.actionManager = actionManager;
+    }
 
     /** {@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.setIdentityManager(new IdentityManager());
-        IdentityManager.getIdentityManager().loadVersionIdentity();
         try {
             IdentityManager.getIdentityManager().initialise(getConfigDir());
         } catch (InvalidIdentityFileException ex) {
@@ -37,10 +39,6 @@ public class TestMain extends Main {
             // DON'T do anything to the user's configuration... (so no calls
             // to handleInvalidConfigFile(); here)
         }
-        serverManager = new ServerManager(
-                parserFactoryProvider,
-                IdentityManager.getIdentityManager());
-        ActionManager.setActionManager(new ActionManager(serverManager, IdentityManager.getIdentityManager()));
 
         final String fs = System.getProperty("file.separator");
         final String pluginDirectory = getConfigDir() + "plugins" + fs;
@@ -63,7 +61,18 @@ public class TestMain extends Main {
      */
     public static Main getTestMain() {
         if (instance == null) {
-            instance = new TestMain();
+            // TODO: Tests probably shouldn't rely on a config dir... Who knows
+            //       what the user has done with their config.
+            final IdentityManager identityManager = new IdentityManager();
+            IdentityManager.setIdentityManager(identityManager);
+            IdentityManager.getIdentityManager().loadVersionIdentity();
+
+            final ServerManager serverManager = mock(ServerManager.class);
+
+            final ActionManager actionManager = new ActionManager(serverManager, identityManager);
+            ActionManager.setActionManager(actionManager);
+
+            instance = new TestMain(identityManager, serverManager, actionManager);
             instance.init(new String[0]);
         }
         return instance;