Various code householding

- Adjust javadoc
- Remove unused PlayerAuth constructor
- Replace legacy Settings with NewSetting calls
- Add process service to all (a)sync processes
- Change IP manager to only cache the calls to the VeryGames API

src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java

@@ -58,7 +58,7 @@ import static org.mockito.Mockito.verify;
 public abstract class AbstractResourceClosingTest {
 
     /** List of DataSource method names not to test. */
-    private static final Set<String> IGNORED_METHODS = ImmutableSet.of("reload", "close", "getType");
+    private static final Set<String> IGNORED_METHODS = ImmutableSet.of("close", "getType");
 
     /** Collection of values to use to call methods with the parameters they expect. */
     private static final Map<Class<?>, Object> PARAM_VALUES = getDefaultParameters();

src/test/java/fr/xephi/authme/manager/IpAddressManagerTest.java

@@ -22,7 +22,7 @@ public class IpAddressManagerTest {
     @Test
     public void shouldRetrieveFromCache() {
         // given
-        IpAddressManager ipAddressManager = new IpAddressManager(mockSettings(false));
+        IpAddressManager ipAddressManager = new IpAddressManager(mockSettings(true));
         ipAddressManager.addCache("Test", "my test IP");
 
         // when

src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java

@@ -1,13 +1,12 @@
 package fr.xephi.authme.process.email;
 
-import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
-import fr.xephi.authme.output.Messages;
+import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.settings.NewSetting;
-import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.util.WrapperMock;
 import org.bukkit.entity.Player;
 import org.junit.After;
@@ -27,9 +26,9 @@ import static org.mockito.Mockito.when;
 public class AsyncChangeEmailTest {
 
     private Player player;
-    private Messages messages;
     private PlayerCache playerCache;
     private DataSource dataSource;
+    private ProcessService service;
     private NewSetting settings;
 
     @BeforeClass
@@ -41,9 +40,10 @@ public class AsyncChangeEmailTest {
     @After
     public void cleanFields() {
         player = null;
-        messages = null;
         playerCache = null;
         dataSource = null;
+        service = null;
+        settings = null;
     }
 
     @Test
@@ -62,7 +62,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource).updateEmail(auth);
         verify(playerCache).updatePlayer(auth);
-        verify(messages).send(player, MessageKey.EMAIL_CHANGED_SUCCESS);
+        verify(service).send(player, MessageKey.EMAIL_CHANGED_SUCCESS);
     }
 
     @Test
@@ -81,7 +81,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource).updateEmail(auth);
         verify(playerCache, never()).updatePlayer(auth);
-        verify(messages).send(player, MessageKey.ERROR);
+        verify(service).send(player, MessageKey.ERROR);
     }
 
     @Test
@@ -99,7 +99,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(messages).send(player, MessageKey.USAGE_ADD_EMAIL);
+        verify(service).send(player, MessageKey.USAGE_ADD_EMAIL);
     }
 
     @Test
@@ -117,7 +117,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(messages).send(player, MessageKey.INVALID_NEW_EMAIL);
+        verify(service).send(player, MessageKey.INVALID_NEW_EMAIL);
     }
 
     @Test
@@ -135,7 +135,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(messages).send(player, MessageKey.INVALID_OLD_EMAIL);
+        verify(service).send(player, MessageKey.INVALID_OLD_EMAIL);
     }
 
     @Test
@@ -154,7 +154,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(messages).send(player, MessageKey.EMAIL_ALREADY_USED_ERROR);
+        verify(service).send(player, MessageKey.EMAIL_ALREADY_USED_ERROR);
     }
 
     @Test
@@ -171,7 +171,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(messages).send(player, MessageKey.LOGIN_MESSAGE);
+        verify(service).send(player, MessageKey.LOGIN_MESSAGE);
     }
 
     @Test
@@ -181,7 +181,7 @@ public class AsyncChangeEmailTest {
         given(player.getName()).willReturn("Bobby");
         given(playerCache.isAuthenticated("bobby")).willReturn(false);
         given(dataSource.isAuthAvailable("Bobby")).willReturn(false);
-        Settings.emailRegistration = true;
+        given(service.getProperty(RegistrationSettings.USE_EMAIL_REGISTRATION)).willReturn(true);
 
         // when
         process.run();
@@ -189,7 +189,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(messages).send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
+        verify(service).send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
     }
 
     @Test
@@ -199,7 +199,7 @@ public class AsyncChangeEmailTest {
         given(player.getName()).willReturn("Bobby");
         given(playerCache.isAuthenticated("bobby")).willReturn(false);
         given(dataSource.isAuthAvailable("Bobby")).willReturn(false);
-        Settings.emailRegistration = false;
+        given(service.getProperty(RegistrationSettings.USE_EMAIL_REGISTRATION)).willReturn(false);
 
         // when
         process.run();
@@ -207,7 +207,7 @@ public class AsyncChangeEmailTest {
         // then
         verify(dataSource, never()).updateEmail(any(PlayerAuth.class));
         verify(playerCache, never()).updatePlayer(any(PlayerAuth.class));
-        verify(messages).send(player, MessageKey.REGISTER_MESSAGE);
+        verify(service).send(player, MessageKey.REGISTER_MESSAGE);
     }
 
     private static PlayerAuth authWithMail(String email) {
@@ -218,12 +218,11 @@ public class AsyncChangeEmailTest {
 
     private AsyncChangeEmail createProcess(String oldEmail, String newEmail) {
         player = mock(Player.class);
-        messages = mock(Messages.class);
-        AuthMe authMe = mock(AuthMe.class);
-        when(authMe.getMessages()).thenReturn(messages);
         playerCache = mock(PlayerCache.class);
         dataSource = mock(DataSource.class);
+        service = mock(ProcessService.class);
         settings = mock(NewSetting.class);
-        return new AsyncChangeEmail(player, authMe, oldEmail, newEmail, dataSource, playerCache, settings);
+        given(service.getSettings()).willReturn(settings);
+        return new AsyncChangeEmail(player, oldEmail, newEmail, dataSource, playerCache, service);
     }
 }