Make Profile use AutoValue.

src/com/dmdirc/config/profiles/IdentitiesProfileMigrator.java

@@ -67,7 +67,7 @@ public class IdentitiesProfileMigrator implements Migrator {
                 ident = Optional.empty();
             }
             profileManager.addProfile(
-                    new Profile(p.getName(), p.getOption(DOMAIN_PROFILE, "realname"), ident,
+                    Profile.create(p.getName(), p.getOption(DOMAIN_PROFILE, "realname"), ident,
                             p.getOptionList(DOMAIN_PROFILE, "nicknames")));
             try {
                 p.delete();

src/com/dmdirc/config/profiles/Profile.java

@@ -22,80 +22,31 @@
 
 package com.dmdirc.config.profiles;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
+import com.google.auto.value.AutoValue;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 /**
  * Describes a profile, used to describe the settings associated with the local client on a
  * connection.
  */
-public class Profile {
+@AutoValue
+public abstract class Profile {
 
-    /** Profile Name, must be a sanitised filename. */
-    private final String name;
-    /** Real name. */
-    private final String realname;
-    /** Ident. */
-    private final Optional<String> ident;
-    /** Nicknames. */
-    private final List<String> nicknames;
+    Profile() {}
 
-    public Profile(final String name, final String realname, final Optional<String> ident,
-            final Iterable<String> nicknames) {
-        this.name = name;
-        this.realname = realname;
-        this.ident = ident;
-        this.nicknames = Lists.newArrayList(nicknames);
-    }
+    public abstract String getName();
 
-    public String getName() {
-        return name;
-    }
+    public abstract String getRealname();
 
-    public String getRealname() {
-        return realname;
-    }
+    public abstract Optional<String> getIdent();
 
-    public Optional<String> getIdent() {
-        return ident;
-    }
+    public abstract List<String> getNicknames();
 
-    public List<String> getNicknames() {
-        return Collections.unmodifiableList(nicknames);
+    public static Profile create(final String name, final String realName,
+            final Optional<String> ident, final List<String> nicknames) {
+        return new AutoValue_Profile(name, realName, ident, nicknames);
     }
 
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("name", name)
-                .add("realname", realname)
-                .add("ident", ident)
-                .add("nicknames", nicknames)
-                .toString();
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final Profile profile = (Profile) o;
-        return Objects.equals(name, profile.getName())
-                && Objects.equals(realname, profile.getRealname())
-                && Objects.equals(ident, profile.getIdent())
-                && Objects.equals(nicknames, profile.getNicknames());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, realname, ident, nicknames);
-    }
 }

src/com/dmdirc/config/profiles/ProfileManager.java

@@ -54,7 +54,7 @@ public class ProfileManager {
         this.eventBus = eventBus;
         profiles = new ArrayList<>();
         final String nick = systemInfo.getProperty("user.name").replace(' ', '_');
-        defaultProfile = new Profile(nick, nick, Optional.empty(), Lists.newArrayList(nick));
+        defaultProfile = Profile.create(nick, nick, Optional.empty(), Lists.newArrayList(nick));
     }
 
     /**

src/com/dmdirc/config/profiles/YamlProfileStore.java

@@ -76,7 +76,7 @@ public class YamlProfileStore extends BaseYamlStore<Profile> implements ProfileS
             final String realname = requiredString(map, "realname");
             final Optional<String> ident = Optional.ofNullable(optionalString(map, "ident"));
             final List<String> nicknames = asList(map.get("nicknames"), s -> Optional.of(s.toString()));
-            return Optional.of(new Profile(name, realname, ident, nicknames));
+            return Optional.of(Profile.create(name, realname, ident, nicknames));
         } catch (IllegalArgumentException ex) {
             LOG.info("Unable to read profile", ex);
             return Optional.empty();

src/com/dmdirc/ui/core/profiles/CoreProfilesDialogModel.java

@@ -131,7 +131,7 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
         final List<Profile> profileList = Lists.newArrayList(profileManager.getProfiles());
         profileList.forEach(profileManager::deleteProfile);
         profiles.values().forEach(p -> profileManager.addProfile(
-                new Profile(p.getName(), p.getRealname(), p.getIdent(), p.getNicknames())));
+                Profile.create(p.getName(), p.getRealname(), p.getIdent(), p.getNicknames())));
     }
 
     @Override

test/com/dmdirc/config/profiles/IdentitiesProfileMigratorTest.java

@@ -94,7 +94,7 @@ public class IdentitiesProfileMigratorTest {
         when(identityManager.getProvidersByType("profile")).thenReturn(
                 Lists.newArrayList(configProvider1));
         instance.migrate();
-        verify(profileManager).addProfile(new Profile("name1", "realname1", Optional.empty(),
+        verify(profileManager).addProfile(Profile.create("name1", "realname1", Optional.empty(),
                 Lists.newArrayList("nickname1")));
     }
 
@@ -103,7 +103,7 @@ public class IdentitiesProfileMigratorTest {
         when(identityManager.getProvidersByType("profile")).thenReturn(
                 Lists.newArrayList(configProvider2));
         instance.migrate();
-        verify(profileManager).addProfile(new Profile("name2", "realname2", Optional.of("ident2"),
+        verify(profileManager).addProfile(Profile.create("name2", "realname2", Optional.of("ident2"),
                 Lists.newArrayList("nickname2")));
     }
 
@@ -112,7 +112,7 @@ public class IdentitiesProfileMigratorTest {
         when(identityManager.getProvidersByType("profile")).thenReturn(
                 Lists.newArrayList(configProvider3));
         instance.migrate();
-        verify(profileManager).addProfile(new Profile("name3", "realname3", Optional.of("ident3"),
+        verify(profileManager).addProfile(Profile.create("name3", "realname3", Optional.of("ident3"),
                 Lists.newArrayList("nickname31", "nickname32", "nickname33")));
     }
 }

test/com/dmdirc/config/profiles/ProfileManagerTest.java

@@ -100,7 +100,7 @@ public class ProfileManagerTest {
     @Test
     public void testGetDefaultProfile_EmptyList() {
         final String nick = "UserName";
-        final Profile profile = new Profile(nick, nick, Optional.empty(), Lists.newArrayList(nick));
+        final Profile profile = Profile.create(nick, nick, Optional.empty(), Lists.newArrayList(nick));
         assertEquals(profile, instance.getDefault());
     }
 

test/com/dmdirc/config/profiles/YamlProfileStoreTest.java

@@ -23,19 +23,16 @@
 package com.dmdirc.config.profiles;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
-import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -54,11 +51,11 @@ public class YamlProfileStoreTest {
 
     @Before
     public void setup() {
-        profile1 = new Profile("profile1", "realname1", Optional.empty(),
+        profile1 = Profile.create("profile1", "realname1", Optional.empty(),
                 Lists.newArrayList("nickname1", "nickname2"));
-        profile2 = new Profile("profile2", "realname2", Optional.of("ident2"),
+        profile2 = Profile.create("profile2", "realname2", Optional.of("ident2"),
                 Lists.newArrayList("nickname1", "nickname3"));
-        profile3 = new Profile("profile3", "realname3", Optional.empty(),
+        profile3 = Profile.create("profile3", "realname3", Optional.empty(),
                 Lists.newArrayList("nickname3"));
     }
 
@@ -68,7 +65,6 @@ public class YamlProfileStoreTest {
                 .getResource("profiles.yml").toURI()));
         final Collection<Profile> profiles = store.readProfiles();
         assertEquals(3, profiles.size());
-        profiles.forEach(System.out::println);
         assertTrue(profiles.contains(profile1));
         assertTrue(profiles.contains(profile2));
         assertTrue(profiles.contains(profile3));
@@ -81,8 +77,6 @@ public class YamlProfileStoreTest {
                     .resolve("profiles.yml"));
             final List<Profile> profiles = Lists.newArrayList(profile1, profile2, profile3);
             store.writeProfiles(profiles);
-            System.out.println(Files.readAllLines(fs.getPath("/")
-                    .resolve("profiles.yml")));
             final Collection<Profile> readProfiles = store.readProfiles();
             assertEquals(3, readProfiles.size());
             assertTrue(readProfiles.contains(profile1));

test/com/dmdirc/ui/core/profiles/CoreProfilesDialogModelTest.java

@@ -81,7 +81,7 @@ public class CoreProfilesDialogModelTest {
     }
 
     private Profile getProfile(final int name) {
-        return new Profile("profile" + name, "realname" + name, Optional.of("ident" + name),
+        return Profile.create("profile" + name, "realname" + name, Optional.of("ident" + name),
                 Lists.newArrayList("nickname" + name + '1', "nickname" + name + '2',
                         "nickname" + name + '3'));
     }