Merge pull request #768 from csmith/master

Remove config dependency on ClientInfo.

src/main/java/com/dmdirc/config/ConfigManager.java

@@ -22,7 +22,6 @@ import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.config.provider.ConfigProviderMigrator;
-import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.validators.Validator;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -56,8 +55,6 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
     private final ConfigBinder binder;
     /** The manager to use to fetch global state. */
     private final IdentityManager manager;
-    /** Client info object. */
-    private final ClientInfo clientInfo;
     /** The protocol this manager is for. */
     private String protocol;
     /** The ircd this manager is for. */
@@ -81,11 +78,10 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
      * @since 0.6.3
      */
     ConfigManager(
-            final ClientInfo clientInfo,
             final IdentityManager manager,
             final String protocol, final String ircd,
             final String network, final String server) {
-        this(clientInfo, manager, protocol, ircd, network, server, "<Unknown>");
+        this(manager, protocol, ircd, network, server, "<Unknown>");
     }
 
     /**
@@ -101,13 +97,11 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
      * @since 0.6.3
      */
     ConfigManager(
-            final ClientInfo clientInfo,
             final IdentityManager manager,
             final String protocol, final String ircd,
             final String network, final String server, final String channel) {
         final String chanName = channel + '@' + network;
 
-        this.clientInfo = clientInfo;
         this.manager = manager;
         this.protocol = protocol;
         this.ircd = ircd;
@@ -129,7 +123,7 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
         doStats(domain, option);
 
         if (VERSION_DOMAIN.equals(domain)) {
-            final String response = clientInfo.getVersionConfigSetting(VERSION_DOMAIN, option);
+            final String response = manager.getVersionSettings().getOption(VERSION_DOMAIN, option);
             if (response == null || validator.validate(response).isFailure()) {
                 return null;
             }
@@ -153,7 +147,7 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
         doStats(domain, option);
 
         if (VERSION_DOMAIN.equals(domain)) {
-            final String response = clientInfo.getVersionConfigSetting(VERSION_DOMAIN, option);
+            final String response = manager.getVersionSettings().getOption(VERSION_DOMAIN, option);
             return response != null && !validator.validate(response).isFailure();
         }
 

src/main/java/com/dmdirc/config/ConfigModule.java

@@ -24,20 +24,16 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.ui.WarningDialog;
-import com.dmdirc.util.ClientInfo;
-
+import dagger.Module;
+import dagger.Provides;
 import java.awt.GraphicsEnvironment;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-
 import javax.inject.Singleton;
 
-import dagger.Module;
-import dagger.Provides;
-
 import static com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import static com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 
@@ -55,10 +51,8 @@ public class ConfigModule {
             @Directory(DirectoryType.IDENTITIES) final Path identitiesDirectory,
             @Directory(DirectoryType.ERRORS) final Path errorsDirectory,
             final CommandLineParser commandLineParser,
-            final ClientInfo clientInfo,
             final ErrorManager errorManager) {
-        final IdentityManager identityManager = new IdentityManager(baseDirectory,
-                identitiesDirectory, clientInfo);
+        final IdentityManager identityManager = new IdentityManager(baseDirectory, identitiesDirectory);
         errorManager.initialise(identityManager.getGlobalConfiguration());
         identityManager.loadVersionIdentity();
         try {

src/main/java/com/dmdirc/config/IdentityManager.java

@@ -17,20 +17,16 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.Precondition;
 import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.FileUtils;
 import com.dmdirc.util.io.InvalidConfigFileException;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.URISyntaxException;
@@ -46,7 +42,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,8 +81,6 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      */
     private final Multimap<String, WeakReference<ConfigProviderListener>> listeners =
             ArrayListMultimap.create();
-    /** Client info objecty. */
-    private final ClientInfo clientInfo;
     /** The identity file used for the global config. */
     private ConfigFileBackedConfigProvider config;
     /** The identity file used for addon defaults. */
@@ -103,11 +96,9 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * @param baseDirectory       The BASE config directory.
      * @param identitiesDirectory The directory to store identities in.
      */
-    public IdentityManager(final Path baseDirectory, final Path identitiesDirectory,
-            final ClientInfo clientInfo) {
+    public IdentityManager(final Path baseDirectory, final Path identitiesDirectory) {
         this.configDirectory = baseDirectory;
         this.identitiesDirectory = identitiesDirectory;
-        this.clientInfo = clientInfo;
     }
 
     /**
@@ -203,10 +194,6 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      *
      * @param dir The directory to be loaded
      */
-    @Precondition({
-        "The specified File is not null",
-        "The specified File is a directory"
-    })
     private void loadUser(final Path dir) {
         checkNotNull(dir);
         checkArgument(Files.isDirectory(dir));
@@ -648,8 +635,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
             final String ircd, final String network, final String server) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
-                ircd, network, server);
+        final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server);
         setUpConfigManager(configManager);
         return new ConfigManagerMigrator(configManager);
     }
@@ -657,8 +643,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
             final String ircd, final String network, final String server, final String channel) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
-                ircd, network, server, channel);
+        final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server, channel);
         setUpConfigManager(configManager);
         return new ConfigManagerMigrator(configManager);
     }
@@ -666,8 +651,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
             final String network, final String server) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
-                ircd, network, server);
+        final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server);
         setUpConfigManager(configManager);
         return configManager;
     }
@@ -675,8 +659,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
             final String network, final String server, final String channel) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
-                ircd, network, server, channel);
+        final ConfigManager configManager = new ConfigManager(this, protocol, ircd, network, server, channel);
         setUpConfigManager(configManager);
         return configManager;
     }

src/main/java/com/dmdirc/interfaces/config/IdentityFactory.java

@@ -17,7 +17,6 @@
 
 package com.dmdirc.interfaces.config;
 
-import com.dmdirc.Precondition;
 import com.dmdirc.config.ConfigTarget;
 import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.config.provider.ConfigProvider;
@@ -38,8 +37,6 @@ public interface IdentityFactory {
      *
      * @return A config provider for the channel
      */
-    @Precondition({"The specified network is non-null and not empty",
-            "The specified channel is non-null and not empty"})
     ConfigProvider createChannelConfig(String network, String channel);
 
     /**
@@ -49,7 +46,6 @@ public interface IdentityFactory {
      *
      * @return A config provider for the network
      */
-    @Precondition("The specified network is non-null and not empty")
     ConfigProvider createNetworkConfig(String network);
 
     /**
@@ -59,7 +55,6 @@ public interface IdentityFactory {
      *
      * @return A config provider for the server
      */
-    @Precondition("The specified server is non-null and not empty")
     ConfigProvider createServerConfig(String server);
 
     /**

src/test/java/com/dmdirc/config/ConfigManagerTest.java

@@ -23,9 +23,7 @@
 package com.dmdirc.config;
 
 import com.dmdirc.config.provider.ConfigChangeListener;
-import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.validators.PermissiveValidator;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -43,17 +41,16 @@ import static org.mockito.Mockito.verify;
 public class ConfigManagerTest {
 
     @Mock private IdentityManager identityManager;
-    @Mock private ClientInfo clientInfo;
 
     @Test
     public void testNonExistantOption() {
-        assertNull(new ConfigManager(clientInfo, identityManager, "", "", "", "")
+        assertNull(new ConfigManager(identityManager, "", "", "", "")
                 .getOption("unit-test123", "foobar"));
     }
 
     @Test
     public void testStats() {
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
+        final ConfigManager cm = new ConfigManager(identityManager, "", "", "", "");
         assertNull(ConfigManager.getStats().get("unit-test123.baz"));
         cm.hasOption("unit-test123", "baz", new PermissiveValidator<>());
         assertNotNull(ConfigManager.getStats().get("unit-test123.baz"));
@@ -63,7 +60,7 @@ public class ConfigManagerTest {
     @Test
     public void testDomainListener() {
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
+        final ConfigManager cm = new ConfigManager(identityManager, "", "", "", "");
         cm.addChangeListener("unit-test", listener);
 
         cm.configChanged("foo", "bar");
@@ -76,7 +73,7 @@ public class ConfigManagerTest {
     @Test
     public void testDomainKeyListener() {
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
+        final ConfigManager cm = new ConfigManager(identityManager, "", "", "", "");
         cm.addChangeListener("unit-test", "foo", listener);
 
         cm.configChanged("foo", "bar");

src/test/java/com/dmdirc/config/IdentityManagerTest.java

@@ -24,17 +24,13 @@ package com.dmdirc.config;
 
 import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.tests.JimFsRule;
-import com.dmdirc.util.ClientInfo;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
@@ -45,8 +41,6 @@ public class IdentityManagerTest {
 
     @Rule public final JimFsRule jimFsRule = new JimFsRule();
 
-    @Mock private ClientInfo clientInfo;
-
     private Path baseDirectory;
     private Path identitiesDirectory;
 
@@ -58,8 +52,7 @@ public class IdentityManagerTest {
 
     @Test
     public void testLoadsVersionIdentity() throws InvalidIdentityFileException {
-        final IdentityManager identityManager = new IdentityManager(
-                baseDirectory, identitiesDirectory, clientInfo);
+        final IdentityManager identityManager = new IdentityManager(baseDirectory, identitiesDirectory);
         identityManager.initialise();
 
         final ConfigFileBackedConfigProvider versionSettings =
@@ -71,8 +64,7 @@ public class IdentityManagerTest {
 
     @Test
     public void testUsesSystemUsernameForProfileNickname() throws InvalidIdentityFileException {
-        final IdentityManager identityManager = new IdentityManager(
-                baseDirectory, identitiesDirectory, clientInfo);
+        final IdentityManager identityManager = new IdentityManager(baseDirectory, identitiesDirectory);
         identityManager.initialise();
 
         System.setProperty("user.name", "Awesome User");
@@ -86,8 +78,7 @@ public class IdentityManagerTest {
         Files.copy(getClass().getResourceAsStream("profile-new"),
                 identitiesDirectory.resolve("profile"));
 
-        final IdentityManager identityManager = new IdentityManager(
-                baseDirectory, identitiesDirectory, clientInfo);
+        final IdentityManager identityManager = new IdentityManager(baseDirectory, identitiesDirectory);
         identityManager.initialise();
 
         final Collection<ConfigProvider> profiles = identityManager.getProvidersByType("profile");