Merge branch '835-integrate-jalu-injector' of https://github.com/AuthMe-Team/AuthMeReloaded

src/main/java/fr/xephi/authme/command/CommandHandler.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.command;
 
+import ch.jalu.injector.Injector;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.help.HelpProvider;
-import fr.xephi.authme.initialization.AuthMeServiceInitializer;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.util.StringUtils;
 import org.bukkit.ChatColor;
@@ -37,12 +37,12 @@ public class CommandHandler {
     private Map<Class<? extends ExecutableCommand>, ExecutableCommand> commands = new HashMap<>();
 
     @Inject
-    public CommandHandler(AuthMeServiceInitializer initializer, CommandMapper commandMapper,
+    public CommandHandler(Injector injector, CommandMapper commandMapper,
                           PermissionsManager permissionsManager, HelpProvider helpProvider) {
         this.commandMapper = commandMapper;
         this.permissionsManager = permissionsManager;
         this.helpProvider = helpProvider;
-        initializeCommands(initializer, commandMapper.getCommandClasses());
+        initializeCommands(injector, commandMapper.getCommandClasses());
     }
 
     /**
@@ -90,12 +90,13 @@ public class CommandHandler {
     /**
      * Initialize all required ExecutableCommand objects.
      *
+     * @param injector the injector
      * @param commandClasses the classes to instantiate
      */
-    private void initializeCommands(AuthMeServiceInitializer initializer,
+    private void initializeCommands(Injector injector,
                                     Set<Class<? extends ExecutableCommand>> commandClasses) {
         for (Class<? extends ExecutableCommand> clazz : commandClasses) {
-            commands.put(clazz, initializer.newInstance(clazz));
+            commands.put(clazz, injector.newInstance(clazz));
         }
     }
 

src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.command.executable.authme;
 
+import ch.jalu.injector.Injector;
 import com.google.common.annotations.VisibleForTesting;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
@@ -11,7 +12,6 @@ import fr.xephi.authme.converter.RoyalAuthConverter;
 import fr.xephi.authme.converter.SqliteToSql;
 import fr.xephi.authme.converter.vAuthConverter;
 import fr.xephi.authme.converter.xAuthConverter;
-import fr.xephi.authme.initialization.AuthMeServiceInitializer;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.util.BukkitService;
 import org.bukkit.command.CommandSender;
@@ -31,7 +31,7 @@ public class ConverterCommand implements ExecutableCommand {
     private BukkitService bukkitService;
 
     @Inject
-    private AuthMeServiceInitializer initializer;
+    private Injector injector;
 
     @Override
     public void executeCommand(final CommandSender sender, List<String> arguments) {
@@ -46,7 +46,7 @@ public class ConverterCommand implements ExecutableCommand {
         }
 
         // Get the proper converter instance
-        final Converter converter = initializer.newInstance(jobType.getConverterClass());
+        final Converter converter = injector.newInstance(jobType.getConverterClass());
 
         // Run the convert job
         bukkitService.runTaskAsynchronously(new Runnable() {

src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java

@@ -1,17 +1,20 @@
 package fr.xephi.authme.command.executable.authme;
 
+import ch.jalu.injector.Injector;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.initialization.AuthMeServiceInitializer;
+import fr.xephi.authme.initialization.Reloadable;
+import fr.xephi.authme.initialization.SettingsDependent;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.settings.NewSetting;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import org.bukkit.command.CommandSender;
 
 import javax.inject.Inject;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -23,7 +26,7 @@ public class ReloadCommand implements ExecutableCommand {
     private AuthMe plugin;
 
     @Inject
-    private AuthMeServiceInitializer initializer;
+    private Injector injector;
 
     @Inject
     private NewSetting settings;
@@ -44,7 +47,7 @@ public class ReloadCommand implements ExecutableCommand {
                 ConsoleLogger.info("Note: cannot change database type during /authme reload");
                 sender.sendMessage("Note: cannot change database type during /authme reload");
             }
-            initializer.performReloadOnServices();
+            performReloadOnServices();
             commandService.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);
         } catch (Exception e) {
             sender.sendMessage("Error occurred during reload of AuthMe: aborting");
@@ -52,4 +55,16 @@ public class ReloadCommand implements ExecutableCommand {
             plugin.stopOrUnload();
         }
     }
+
+    private void performReloadOnServices() {
+        Collection<Reloadable> reloadables = injector.retrieveAllOfType(Reloadable.class);
+        for (Reloadable reloadable : reloadables) {
+            reloadable.reload();
+        }
+
+        Collection<SettingsDependent> settingsDependents = injector.retrieveAllOfType(SettingsDependent.class);
+        for (SettingsDependent dependent : settingsDependents) {
+            dependent.reload(settings);
+        }
+    }
 }