Make AutoCommand use AutoValue.

src/com/dmdirc/commandparser/auto/ActionServerPerformMigrator.java

@@ -101,7 +101,8 @@ public class ActionServerPerformMigrator implements Migrator {
             final Optional<String> profile = getCondition(configFile,
                     "SERVER_PROFILE.IDENTITY_NAME");
 
-            autoCommandManager.addAutoCommand(new AutoCommand(server, network, profile, response));
+            autoCommandManager.addAutoCommand(
+                    AutoCommand.create(server, network, profile, response));
             return true;
         } catch (IOException | InvalidConfigFileException | NumberFormatException ex) {
             return false;

src/com/dmdirc/commandparser/auto/AutoCommand.java

@@ -23,9 +23,8 @@
 package com.dmdirc.commandparser.auto;
 
 
-import com.google.common.base.MoreObjects;
+import com.google.auto.value.AutoValue;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import javax.annotation.Nonnull;
@@ -34,28 +33,36 @@ import javax.annotation.Nonnull;
  * Describes a command that is executed automatically in response to either the client opening, or a
  * server connecting.
  */
-public class AutoCommand {
-
-    /** The name of the server for connection events. */
-    private final Optional<String> server;
-    /** The name of the network for connection events. */
-    private final Optional<String> network;
-    /** The name of the profile for connection events. */
-    private final Optional<String> profile;
-    /** The commands to execute. */
-    private final String response;
-    /** The type of auto command. */
-    private final AutoCommandType type;
+@AutoValue
+public abstract class AutoCommand {
+
+    AutoCommand() {
+    }
 
     public AutoCommand(
             final Optional<String> server,
             final Optional<String> network,
             final Optional<String> profile,
             @Nonnull final String response) {
-        this.server = server;
-        this.network = network;
-        this.profile = profile;
-        this.response = response;
+
+    }
+
+    public abstract Optional<String> getServer();
+
+    public abstract Optional<String> getNetwork();
+
+    public abstract Optional<String> getProfile();
+
+    public abstract String getResponse();
+
+    public abstract AutoCommandType getType();
+
+    public static AutoCommand create(
+            final Optional<String> server,
+            final Optional<String> network,
+            final Optional<String> profile,
+            @Nonnull final String response) {
+        final AutoCommandType type;
         if (!server.isPresent() && !network.isPresent()) {
             type = AutoCommandType.GLOBAL;
         } else if (server.isPresent() && !network.isPresent()) {
@@ -65,58 +72,8 @@ public class AutoCommand {
         } else {
             type = AutoCommandType.UNKNOWN;
         }
-    }
-
-    public Optional<String> getServer() {
-        return server;
-    }
-
-    public Optional<String> getNetwork() {
-        return network;
-    }
-
-    public Optional<String> getProfile() {
-        return profile;
-    }
-
-    @Nonnull
-    public String getResponse() {
-        return response;
-    }
-
-    public AutoCommandType getType() {
-        return type;
-    }
-
-    @Override
-    public boolean equals(final Object object) {
-        if (object == null) {
-            return false;
-        }
-        if (getClass() != object.getClass()) {
-            return false;
-        }
-        final AutoCommand command = (AutoCommand) object;
-        return  Objects.equals(server, command.getServer())
-                && Objects.equals(network, command.getNetwork())
-                && Objects.equals(profile, command.getProfile())
-                && Objects.equals(response, command.getResponse());
-
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(server, network, profile, response);
-    }
 
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("Connection", server)
-                .add("Network", network)
-                .add("Profile", profile)
-                .add("Response", response)
-                .toString();
+        return new AutoValue_AutoCommand(server, network, profile, response, type);
     }
 
 }

src/com/dmdirc/commandparser/auto/YamlAutoCommandStore.java

@@ -87,7 +87,7 @@ public class YamlAutoCommandStore extends BaseYamlStore<AutoCommand> implements
             final Optional<String> profile =
                     Optional.ofNullable(optionalString(map, "profile"));
             final String command = requiredString(map, "command");
-            return Optional.of(new AutoCommand(server, network, profile, command));
+            return Optional.of(AutoCommand.create(server, network, profile, command));
         } catch (IllegalArgumentException ex) {
             LOG.info("Unable to read auto command", ex);
             return Optional.empty();

src/com/dmdirc/ui/core/autocommands/MutableAutoCommand.java

@@ -106,7 +106,7 @@ public class MutableAutoCommand {
     }
 
     public AutoCommand getAutoCommand() {
-        return new AutoCommand(server, network, profile, response);
+        return AutoCommand.create(server, network, profile, response);
     }
 
     @Override

test/com/dmdirc/commandparser/auto/AutoCommandManagerTest.java

@@ -59,13 +59,13 @@ public class AutoCommandManagerTest {
     @Before
     public void setup() {
         autoCommandManager = new AutoCommandManager(eventBus, factory);
-        global = new AutoCommand(Optional.<String>empty(), Optional.<String>empty(),
+        global = AutoCommand.create(Optional.<String>empty(), Optional.<String>empty(),
                 Optional.<String>empty(), "");
-        ircquakenet = new AutoCommand(Optional.ofNullable("irc.quakenet.org"),
+        ircquakenet = AutoCommand.create(Optional.ofNullable("irc.quakenet.org"),
                 Optional.ofNullable("Quakenet"), Optional.<String>empty(), "");
-        ukquakenet = new AutoCommand(Optional.ofNullable("uk.quakenet.org"),
+        ukquakenet = AutoCommand.create(Optional.ofNullable("uk.quakenet.org"),
                 Optional.ofNullable("Quakenet"), Optional.<String>empty(), "");
-        testnet = new AutoCommand(Optional.ofNullable("irc.testnet.org"),
+        testnet = AutoCommand.create(Optional.ofNullable("irc.testnet.org"),
                 Optional.ofNullable("Testnet"), Optional.ofNullable("profileName"), "");
         when(testProfile.getName()).thenReturn("profileName");
         when(factory.getAutoCommandHandler(global)).thenReturn(globalHandler);

test/com/dmdirc/commandparser/auto/AutoCommandTest.java

@@ -35,81 +35,81 @@ public class AutoCommandTest {
 
     @Before
     public void setUp() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.empty(), "");
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.empty(), "");
     }
 
     @Test
     public void testGetServer_Empty() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.empty(), "");
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.empty(), "");
         assertEquals(Optional.<String>empty(), command.getServer());
     }
 
     @Test
     public void testGetServer_NotEmpty() throws Exception {
-        command = new AutoCommand(Optional.of("server"), Optional.empty(), Optional.empty(), "");
+        command = AutoCommand.create(Optional.of("server"), Optional.empty(), Optional.empty(), "");
         assertEquals(Optional.of("server"), command.getServer());
     }
 
     @Test
     public void testGetNetwork_Empty() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.empty(), "");
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.empty(), "");
         assertEquals(Optional.<String>empty(), command.getNetwork());
     }
 
     @Test
     public void testGetNetwork_NotEmpty() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.of("network"), Optional.empty(), "");
+        command = AutoCommand.create(Optional.empty(), Optional.of("network"), Optional.empty(), "");
         assertEquals(Optional.of("network"), command.getNetwork());
     }
 
     @Test
     public void testGetProfile_Empty() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.empty(), "");
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.empty(), "");
         assertEquals(Optional.<String>empty(), command.getProfile());
     }
 
     @Test
     public void testGetProfile_NotEmpty() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.of("profile"), "");
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.of("profile"), "");
         assertEquals(Optional.of("profile"), command.getProfile());
     }
 
     @Test
     public void testGetResponse_Empty() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.empty(), "");
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.empty(), "");
         assertEquals("", command.getResponse());
     }
 
     @Test
     public void testGetResponse_NotEmpty() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.empty(), "response");
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.empty(), "response");
         assertEquals("response", command.getResponse());
     }
 
     @Test
     public void testGetType_Server() throws Exception {
-        command = new AutoCommand(Optional.of("server"), Optional.empty(), Optional.empty(),
+        command = AutoCommand.create(Optional.of("server"), Optional.empty(), Optional.empty(),
                 "response");
         assertEquals(AutoCommandType.SERVER, command.getType());
     }
 
     @Test
     public void testGetType_Network() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.of("network"), Optional.empty(),
+        command = AutoCommand.create(Optional.empty(), Optional.of("network"), Optional.empty(),
                 "response");
         assertEquals(AutoCommandType.NETWORK, command.getType());
     }
 
     @Test
     public void testGetType_Global() throws Exception {
-        command = new AutoCommand(Optional.empty(), Optional.empty(), Optional.of("profile"),
+        command = AutoCommand.create(Optional.empty(), Optional.empty(), Optional.of("profile"),
                 "response");
         assertEquals(AutoCommandType.GLOBAL, command.getType());
     }
 
     @Test
     public void testGetType_Unknown() throws Exception {
-        command = new AutoCommand(Optional.of("server"), Optional.of("network"), Optional.empty(),
+        command = AutoCommand.create(Optional.of("server"), Optional.of("network"), Optional.empty(),
                 "response");
         assertEquals(AutoCommandType.UNKNOWN, command.getType());
     }

test/com/dmdirc/commandparser/auto/YamlAutoCommandStoreTest.java

@@ -54,21 +54,21 @@ public class YamlAutoCommandStoreTest {
         fs = Jimfs.newFileSystem(Configuration.unix());
         Files.copy(getClass().getResource("readtest.yml").openStream(),
                 fs.getPath("readtest.yml"));
-        command = new AutoCommand(Optional.ofNullable("server"),
+        command = AutoCommand.create(Optional.ofNullable("server"),
                 Optional.ofNullable("network"),
                 Optional.ofNullable("profile"),
                 "command");
-        command1 = new AutoCommand(Optional.ofNullable("server1"),
+        command1 = AutoCommand.create(Optional.ofNullable("server1"),
                 Optional.ofNullable("network1"),
                 Optional.ofNullable("profile1"), "command1");
-        command2 = new AutoCommand(Optional.ofNullable("server2"),
+        command2 = AutoCommand.create(Optional.ofNullable("server2"),
                 Optional.ofNullable("network2"),
                 Optional.<String>empty(),
                 "command2");
-        command3 = new AutoCommand(Optional.<String>empty(),
+        command3 = AutoCommand.create(Optional.<String>empty(),
                 Optional.ofNullable("network3"), Optional.<String>empty(),
                 "command3");
-        command4 = new AutoCommand(Optional.<String>empty(),
+        command4 = AutoCommand.create(Optional.<String>empty(),
                 Optional.<String>empty(),
                 Optional.<String>empty(),
                 "command4");

test/com/dmdirc/ui/core/autocommands/MutableAutoCommandTest.java

@@ -44,7 +44,7 @@ public class MutableAutoCommandTest {
 
     @Test
     public void testConstructor() {
-        final AutoCommand autoCommand = new AutoCommand(server, network, profile, response);
+        final AutoCommand autoCommand = AutoCommand.create(server, network, profile, response);
         command = new MutableAutoCommand(autoCommand);
         assertEquals(server, command.getServer());
         assertEquals(network, command.getNetwork());
@@ -122,7 +122,7 @@ public class MutableAutoCommandTest {
     public void testEqualsAutoCommand() {
         final MutableAutoCommand command1 = new MutableAutoCommand(server, network, profile,
                 response, type);
-        final AutoCommand command2 = new AutoCommand(server, network, profile, response);
+        final AutoCommand command2 = AutoCommand.create(server, network, profile, response);
         assertTrue(command1.equalsAutoCommand(command2));
     }