#547 Create ProcessService

- Create ProcessService for common tasks within processes
- Integrate service into AsyncAddEmail

src/main/java/fr/xephi/authme/process/Management.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.process;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.process.email.AsyncAddEmail;
 import fr.xephi.authme.process.email.AsyncChangeEmail;
 import fr.xephi.authme.process.join.AsynchronousJoin;
@@ -20,18 +21,25 @@ public class Management {
 
     private final AuthMe plugin;
     private final BukkitScheduler sched;
+    private final ProcessService processService;
+    private final DataSource dataSource;
+    private final PlayerCache playerCache;
     private final NewSetting settings;
 
     /**
      * Constructor for Management.
      *
      * @param plugin AuthMe
-     * @param settings The plugin settings
      */
-    public Management(AuthMe plugin, NewSetting settings) {
+    public Management(AuthMe plugin, ProcessService processService, DataSource dataSource, PlayerCache playerCache) {
         this.plugin = plugin;
         this.sched = this.plugin.getServer().getScheduler();
-        this.settings = settings;
+        this.processService = processService;
+        this.dataSource = dataSource;
+        this.playerCache = playerCache;
+
+        // FIXME don't pass settings anymore -> go through the service in the processes
+        this.settings = processService.getSettings();
     }
 
     public void performLogin(final Player player, final String password, final boolean forceLogin) {
@@ -39,7 +47,7 @@ public class Management {
 
             @Override
             public void run() {
-                new AsynchronousLogin(player, password, forceLogin, plugin, plugin.getDataSource(), settings)
+                new AsynchronousLogin(player, password, forceLogin, plugin, dataSource, settings)
                     .process();
             }
         });
@@ -60,7 +68,7 @@ public class Management {
 
             @Override
             public void run() {
-                new AsyncRegister(player, password, email, plugin, plugin.getDataSource(), settings).process();
+                new AsyncRegister(player, password, email, plugin, dataSource, settings).process();
             }
         });
     }
@@ -80,7 +88,7 @@ public class Management {
 
             @Override
             public void run() {
-                new AsynchronousJoin(player, plugin, plugin.getDataSource()).process();
+                new AsynchronousJoin(player, plugin, dataSource).process();
             }
 
         });
@@ -91,28 +99,26 @@ public class Management {
 
             @Override
             public void run() {
-                new AsynchronousQuit(player, plugin, plugin.getDataSource(), isKick).process();
+                new AsynchronousQuit(player, plugin, dataSource, isKick).process();
             }
 
         });
     }
 
     public void performAddEmail(final Player player, final String newEmail) {
-        sched.runTaskAsynchronously(plugin, new Runnable() {
-            @Override
-            public void run() {
-                new AsyncAddEmail(player, plugin, newEmail, plugin.getDataSource(),
-                    PlayerCache.getInstance(), settings).process();
-            }
-        });
+        runTask(new AsyncAddEmail(player, newEmail, dataSource, playerCache, processService));
     }
 
     public void performChangeEmail(final Player player, final String oldEmail, final String newEmail) {
         sched.runTaskAsynchronously(plugin, new Runnable() {
             @Override
             public void run() {
-                new AsyncChangeEmail(player, plugin, oldEmail, newEmail, plugin.getDataSource(), PlayerCache.getInstance(), settings).process();
+                new AsyncChangeEmail(player, plugin, oldEmail, newEmail, dataSource, playerCache, settings).process();
             }
         });
     }
+
+    private void runTask(Process process) {
+        sched.runTaskAsynchronously(plugin, process);
+    }
 }

src/main/java/fr/xephi/authme/process/Process.java

@@ -0,0 +1,8 @@
+package fr.xephi.authme.process;
+
+/**
+ * Common interface for AuthMe processes.
+ */
+public interface Process extends Runnable {
+
+}

src/main/java/fr/xephi/authme/process/ProcessService.java

@@ -0,0 +1,34 @@
+package fr.xephi.authme.process;
+
+import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.output.Messages;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.domain.Property;
+import org.bukkit.command.CommandSender;
+
+/**
+ * Service for asynchronous and synchronous processes.
+ */
+public class ProcessService {
+
+    private final NewSetting settings;
+    private final Messages messages;
+
+    public ProcessService(NewSetting settings, Messages messages) {
+        this.settings = settings;
+        this.messages = messages;
+    }
+
+    public <T> T getProperty(Property<T> property) {
+        return settings.getProperty(property);
+    }
+
+    public NewSetting getSettings() {
+        return settings;
+    }
+
+    public void send(CommandSender sender, MessageKey key) {
+        messages.send(sender, key);
+    }
+
+}

src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java

@@ -1,40 +1,38 @@
 package fr.xephi.authme.process.email;
 
-import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 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.settings.NewSetting;
-import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.process.Process;
+import fr.xephi.authme.process.ProcessService;
+import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Player;
 
 /**
  * Async task to add an email to an account.
  */
-public class AsyncAddEmail {
+public class AsyncAddEmail implements Process {
 
     private final Player player;
     private final String email;
-    private final Messages messages;
+    private final ProcessService service;
     private final DataSource dataSource;
     private final PlayerCache playerCache;
-    private final NewSetting settings;
 
-    public AsyncAddEmail(Player player, AuthMe plugin, String email, DataSource dataSource,
-                         PlayerCache playerCache, NewSetting settings) {
-        this.messages = plugin.getMessages();
+    public AsyncAddEmail(Player player, String email, DataSource dataSource, PlayerCache playerCache,
+                         ProcessService service) {
         this.player = player;
         this.email = email;
         this.dataSource = dataSource;
         this.playerCache = playerCache;
-        this.settings = settings;
+        this.service = service;
     }
 
-    public void process() {
+    @Override
+    public void run() {
         String playerName = player.getName().toLowerCase();
 
         if (playerCache.isAuthenticated(playerName)) {
@@ -42,19 +40,19 @@ public class AsyncAddEmail {
             final String currentEmail = auth.getEmail();
 
             if (currentEmail != null && !"your@email.com".equals(currentEmail)) {
-                messages.send(player, MessageKey.USAGE_CHANGE_EMAIL);
-            } else if (!Utils.isEmailCorrect(email, settings)) {
-                messages.send(player, MessageKey.INVALID_EMAIL);
+                service.send(player, MessageKey.USAGE_CHANGE_EMAIL);
+            } else if (!Utils.isEmailCorrect(email, service.getSettings())) {
+                service.send(player, MessageKey.INVALID_EMAIL);
             } else if (dataSource.isEmailStored(email)) {
-                messages.send(player, MessageKey.EMAIL_ALREADY_USED_ERROR);
+                service.send(player, MessageKey.EMAIL_ALREADY_USED_ERROR);
             } else {
                 auth.setEmail(email);
                 if (dataSource.updateEmail(auth)) {
                     playerCache.updatePlayer(auth);
-                    messages.send(player, MessageKey.EMAIL_ADDED_SUCCESS);
+                    service.send(player, MessageKey.EMAIL_ADDED_SUCCESS);
                 } else {
                     ConsoleLogger.showError("Could not save email for player '" + player + "'");
-                    messages.send(player, MessageKey.ERROR);
+                    service.send(player, MessageKey.ERROR);
                 }
             }
         } else {
@@ -64,11 +62,11 @@ public class AsyncAddEmail {
 
     private void sendUnloggedMessage(DataSource dataSource) {
         if (dataSource.isAuthAvailable(player.getName())) {
-            messages.send(player, MessageKey.LOGIN_MESSAGE);
-        } else if (Settings.emailRegistration) {
-            messages.send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
+            service.send(player, MessageKey.LOGIN_MESSAGE);
+        } else if (service.getProperty(RegistrationSettings.USE_EMAIL_REGISTRATION)) {
+            service.send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
         } else {
-            messages.send(player, MessageKey.REGISTER_MESSAGE);
+            service.send(player, MessageKey.REGISTER_MESSAGE);
         }
     }