#432 Injector improvements

- Separate FieldInjection from default fallback for no-Inject public no-args constructor classes
- Make CommandInitializer a normal, instantiable service
- Add various injections instead of fetching through command service

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

@@ -13,15 +13,16 @@ import fr.xephi.authme.converter.xAuthConverter;
 import fr.xephi.authme.output.MessageKey;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
 import java.util.List;
 
 public class ConverterCommand implements ExecutableCommand {
 
+    @Inject
+    private AuthMe authMe;
+
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
-        // AuthMe plugin instance
-        final AuthMe plugin = AuthMe.getInstance();
-
         // Get the conversion job
         String job = arguments.get(0);
 
@@ -36,22 +37,22 @@ public class ConverterCommand implements ExecutableCommand {
         Converter converter = null;
         switch (jobType) {
             case XAUTH:
-                converter = new xAuthConverter(plugin, sender);
+                converter = new xAuthConverter(authMe, sender);
                 break;
             case CRAZYLOGIN:
-                converter = new CrazyLoginConverter(plugin, sender);
+                converter = new CrazyLoginConverter(authMe, sender);
                 break;
             case RAKAMAK:
-                converter = new RakamakConverter(plugin, sender);
+                converter = new RakamakConverter(authMe, sender);
                 break;
             case ROYALAUTH:
-                converter = new RoyalAuthConverter(plugin);
+                converter = new RoyalAuthConverter(authMe);
                 break;
             case VAUTH:
-                converter = new vAuthConverter(plugin, sender);
+                converter = new vAuthConverter(authMe, sender);
                 break;
             case SQLITETOSQL:
-                converter = new SqliteToSql(plugin, sender, commandService.getSettings());
+                converter = new SqliteToSql(authMe, sender, commandService.getSettings());
                 break;
             default:
                 break;

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

@@ -2,8 +2,10 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.settings.SpawnLoader;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -11,10 +13,13 @@ import java.util.List;
  */
 public class FirstSpawnCommand extends PlayerCommand {
 
+    @Inject
+    private SpawnLoader spawnLoader;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        if (commandService.getSpawnLoader().getFirstSpawn() != null) {
-            player.teleport(commandService.getSpawnLoader().getFirstSpawn());
+        if (spawnLoader.getFirstSpawn() != null) {
+            player.teleport(spawnLoader.getFirstSpawn());
         } else {
             player.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
         }

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

@@ -2,9 +2,12 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.permission.PermissionsManager;
+import fr.xephi.authme.process.Management;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 import static fr.xephi.authme.permission.PlayerPermission.CAN_LOGIN_BE_FORCED;
@@ -14,6 +17,12 @@ import static fr.xephi.authme.permission.PlayerPermission.CAN_LOGIN_BE_FORCED;
  */
 public class ForceLoginCommand implements ExecutableCommand {
 
+    @Inject
+    private PermissionsManager permissionsManager;
+
+    @Inject
+    private Management management;
+
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Get the player query
@@ -22,10 +31,10 @@ public class ForceLoginCommand implements ExecutableCommand {
         Player player = commandService.getPlayer(playerName);
         if (player == null || !player.isOnline()) {
             sender.sendMessage("Player needs to be online!");
-        } else if (!commandService.getPermissionsManager().hasPermission(player, CAN_LOGIN_BE_FORCED)) {
+        } else if (!permissionsManager.hasPermission(player, CAN_LOGIN_BE_FORCED)) {
             sender.sendMessage("You cannot force login the player " + playerName + "!");
         } else {
-            commandService.getManagement().performLogin(player, "dontneed", true);
+            management.performLogin(player, "dontneed", true);
             sender.sendMessage("Force login for " + playerName + " performed!");
         }
     }

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

@@ -4,6 +4,7 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.hooks.PluginHooks;
 import fr.xephi.authme.settings.properties.PurgeSettings;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -21,11 +22,14 @@ public class PurgeBannedPlayersCommand implements ExecutableCommand {
     @Inject
     private DataSource dataSource;
 
+    @Inject
+    private PluginHooks pluginHooks;
+
+    @Inject
+    private AuthMe plugin;
+
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
-        // AuthMe plugin instance
-        final AuthMe plugin = commandService.getAuthMe();
-
         // Get the list of banned players
         List<String> bannedPlayers = new ArrayList<>();
         for (OfflinePlayer offlinePlayer : commandService.getBukkitService().getBannedPlayers()) {
@@ -35,7 +39,7 @@ public class PurgeBannedPlayersCommand implements ExecutableCommand {
         // Purge the banned players
         dataSource.purgeBanned(bannedPlayers);
         if (commandService.getProperty(PurgeSettings.REMOVE_ESSENTIALS_FILES)
-            && commandService.getPluginHooks().isEssentialsAvailable())
+            && pluginHooks.isEssentialsAvailable())
             plugin.dataManager.purgeEssentials(bannedPlayers);
         if (commandService.getProperty(PurgeSettings.REMOVE_PLAYER_DAT))
             plugin.dataManager.purgeDat(bannedPlayers);

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

@@ -4,6 +4,7 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.hooks.PluginHooks;
 import fr.xephi.authme.settings.properties.PurgeSettings;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -23,6 +24,12 @@ public class PurgeCommand implements ExecutableCommand {
     @Inject
     private DataSource dataSource;
 
+    @Inject
+    private PluginHooks pluginHooks;
+
+    @Inject
+    private AuthMe plugin;
+
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Get the days parameter
@@ -56,9 +63,8 @@ public class PurgeCommand implements ExecutableCommand {
         sender.sendMessage(ChatColor.GOLD + "Deleted " + purged.size() + " user accounts");
 
         // Purge other data
-        AuthMe plugin = commandService.getAuthMe();
-        if (commandService.getProperty(PurgeSettings.REMOVE_ESSENTIALS_FILES) &&
-            commandService.getPluginHooks().isEssentialsAvailable())
+        if (commandService.getProperty(PurgeSettings.REMOVE_ESSENTIALS_FILES)
+            && pluginHooks.isEssentialsAvailable())
             plugin.dataManager.purgeEssentials(purged);
         if (commandService.getProperty(PurgeSettings.REMOVE_PLAYER_DAT))
             plugin.dataManager.purgeDat(purged);

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

@@ -7,6 +7,7 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -14,9 +15,11 @@ import java.util.List;
  */
 public class ReloadCommand implements ExecutableCommand {
 
+    @Inject
+    private AuthMe plugin;
+
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
-        AuthMe plugin = commandService.getAuthMe();
         try {
             plugin.reload();
             commandService.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);

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

@@ -2,15 +2,20 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.settings.SpawnLoader;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 public class SetFirstSpawnCommand extends PlayerCommand {
 
+    @Inject
+    private SpawnLoader spawnLoader;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        if (commandService.getSpawnLoader().setFirstSpawn(player.getLocation())) {
+        if (spawnLoader.setFirstSpawn(player.getLocation())) {
             player.sendMessage("[AuthMe] Correctly defined new first spawn point");
         } else {
             player.sendMessage("[AuthMe] SetFirstSpawn has failed, please retry");

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

@@ -2,15 +2,20 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.settings.SpawnLoader;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 public class SetSpawnCommand extends PlayerCommand {
 
+    @Inject
+    private SpawnLoader spawnLoader;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        if (commandService.getSpawnLoader().setSpawn(player.getLocation())) {
+        if (spawnLoader.setSpawn(player.getLocation())) {
             player.sendMessage("[AuthMe] Correctly defined new spawn point");
         } else {
             player.sendMessage("[AuthMe] SetSpawn has failed, please retry");

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

@@ -2,16 +2,21 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.settings.SpawnLoader;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 public class SpawnCommand extends PlayerCommand {
 
+    @Inject
+    private SpawnLoader spawnLoader;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        if (commandService.getSpawnLoader().getSpawn() != null) {
-            player.teleport(commandService.getSpawnLoader().getSpawn());
+        if (spawnLoader.getSpawn() != null) {
+            player.teleport(spawnLoader.getSpawn());
         } else {
             player.sendMessage("[AuthMe] Spawn has failed, please try to define the spawn");
         }

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

@@ -36,6 +36,9 @@ public class UnregisterAdminCommand implements ExecutableCommand {
     @Inject
     private PlayerCache playerCache;
 
+    @Inject
+    private AuthMe authMe;
+
     @Override
     public void executeCommand(final CommandSender sender, List<String> arguments, CommandService commandService) {
         // Get the player name
@@ -79,7 +82,6 @@ public class UnregisterAdminCommand implements ExecutableCommand {
      * @param service the command service
      */
     private void applyUnregisteredEffectsAndTasks(Player target, CommandService service) {
-        final AuthMe plugin = service.getAuthMe();
         final BukkitService bukkitService = service.getBukkitService();
         final String playerNameLowerCase = target.getName().toLowerCase();
 
@@ -88,11 +90,11 @@ public class UnregisterAdminCommand implements ExecutableCommand {
         int timeOut = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
         int interval = service.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
         if (timeOut != 0) {
-            BukkitTask id = bukkitService.runTaskLater(new TimeoutTask(plugin, playerNameLowerCase, target), timeOut);
+            BukkitTask id = bukkitService.runTaskLater(new TimeoutTask(authMe, playerNameLowerCase, target), timeOut);
             LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setTimeoutTask(id);
         }
         LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setMessageTask(
-            bukkitService.runTask(new MessageTask(service.getBukkitService(), plugin.getMessages(),
+            bukkitService.runTask(new MessageTask(service.getBukkitService(), authMe.getMessages(),
                 playerNameLowerCase, MessageKey.REGISTER_MESSAGE, interval)));
 
         if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {

src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java

@@ -9,16 +9,21 @@ import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 public class CaptchaCommand extends PlayerCommand {
 
+    @Inject
+    private AuthMe plugin;
+
+    @Inject
+    private PlayerCache playerCache;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         final String playerNameLowerCase = player.getName().toLowerCase();
         final String captcha = arguments.get(0);
-        final AuthMe plugin = commandService.getAuthMe();
-        PlayerCache playerCache = PlayerCache.getInstance();
 
         // Command logic
         if (playerCache.isAuthenticated(playerNameLowerCase)) {

src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java

@@ -3,8 +3,10 @@ package fr.xephi.authme.command.executable.email;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.process.Management;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -12,6 +14,9 @@ import java.util.List;
  */
 public class AddEmailCommand extends PlayerCommand {
 
+    @Inject
+    private Management management;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         String email = arguments.get(0);
@@ -19,7 +24,7 @@ public class AddEmailCommand extends PlayerCommand {
 
         if (email.equals(emailConfirmation)) {
             // Closer inspection of the mail address handled by the async task
-            commandService.getManagement().performAddEmail(player, email);
+            management.performAddEmail(player, email);
         } else {
             commandService.send(player, MessageKey.CONFIRM_EMAIL_MESSAGE);
         }

src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java

@@ -2,8 +2,10 @@ package fr.xephi.authme.command.executable.email;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.process.Management;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -11,11 +13,14 @@ import java.util.List;
  */
 public class ChangeEmailCommand extends PlayerCommand {
 
+    @Inject
+    private Management management;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         String playerMailOld = arguments.get(0);
         String playerMailNew = arguments.get(1);
 
-        commandService.getManagement().performChangeEmail(player, playerMailOld, playerMailNew);
+        management.performChangeEmail(player, playerMailOld, playerMailNew);
     }
 }

src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

@@ -29,11 +29,13 @@ public class RecoverEmailCommand extends PlayerCommand {
     @Inject
     private PlayerCache playerCache;
 
+    @Inject
+    private AuthMe plugin;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         final String playerMail = arguments.get(0);
         final String playerName = player.getName();
-        final AuthMe plugin = commandService.getAuthMe();
 
         if (plugin.mail == null) {
             ConsoleLogger.showError("Mail API is not set");

src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java

@@ -2,8 +2,10 @@ package fr.xephi.authme.command.executable.login;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.process.Management;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -11,9 +13,12 @@ import java.util.List;
  */
 public class LoginCommand extends PlayerCommand {
 
+    @Inject
+    private Management management;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         final String password = arguments.get(0);
-        commandService.getManagement().performLogin(player, password, false);
+        management.performLogin(player, password, false);
     }
 }

src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java

@@ -2,8 +2,10 @@ package fr.xephi.authme.command.executable.logout;
 
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.process.Management;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -11,8 +13,11 @@ import java.util.List;
  */
 public class LogoutCommand extends PlayerCommand {
 
+    @Inject
+    private Management management;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        commandService.getManagement().performLogout(player);
+        management.performLogout(player);
     }
 }

src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

@@ -4,12 +4,14 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.process.Management;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 import static fr.xephi.authme.settings.properties.EmailSettings.RECOVERY_PASSWORD_LENGTH;
@@ -19,11 +21,14 @@ import static fr.xephi.authme.settings.properties.RestrictionSettings.ENABLE_PAS
 
 public class RegisterCommand extends PlayerCommand {
 
+    @Inject
+    private Management management;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         if (commandService.getProperty(SecuritySettings.PASSWORD_HASH) == HashAlgorithm.TWO_FACTOR) {
             //for two factor auth we don't need to check the usage
-            commandService.getManagement().performRegister(player, "", "", true);
+            management.performRegister(player, "", "", true);
             return;
         }
 
@@ -50,7 +55,7 @@ public class RegisterCommand extends PlayerCommand {
         if (commandService.getProperty(ENABLE_PASSWORD_CONFIRMATION) && !arguments.get(0).equals(arguments.get(1))) {
             commandService.send(player, MessageKey.PASSWORD_MATCH_ERROR);
         } else {
-            commandService.getManagement().performRegister(player, arguments.get(0), "", true);
+            management.performRegister(player, arguments.get(0), "", true);
         }
     }
 
@@ -70,7 +75,7 @@ public class RegisterCommand extends PlayerCommand {
             commandService.send(player, MessageKey.USAGE_REGISTER);
         } else {
             String thePass = RandomString.generate(commandService.getProperty(RECOVERY_PASSWORD_LENGTH));
-            commandService.getManagement().performRegister(player, thePass, email, true);
+            management.performRegister(player, thePass, email, true);
         }
     }
 

src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java

@@ -4,12 +4,17 @@ import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.process.Management;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.List;
 
 public class UnregisterCommand extends PlayerCommand {
 
+    @Inject
+    private Management management;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         String playerPass = arguments.get(0);
@@ -22,6 +27,6 @@ public class UnregisterCommand extends PlayerCommand {
         }
 
         // Unregister the player
-        commandService.getManagement().performUnregister(player, playerPass, false);
+        management.performUnregister(player, playerPass, false);
     }
 }