#727 Instantiate ExecutableCommand objects in CommandHandler

- Change CommandDescription to contain a reference to ExecutableCommand class only
- Instantiate the actual ExecutableCommand objects in CommandHandler

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

@@ -1,6 +1,6 @@
 package fr.xephi.authme.command.executable;
 
-import fr.xephi.authme.command.CommandService;
+import fr.xephi.authme.command.CommandMapper;
 import fr.xephi.authme.command.CommandUtils;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.FoundCommandResult;
@@ -18,14 +18,17 @@ import static fr.xephi.authme.command.FoundResultStatus.UNKNOWN_LABEL;
 public class HelpCommand implements ExecutableCommand {
 
     @Inject
-    private CommandService commandService;
+    private CommandMapper commandMapper;
+
+    @Inject
+    private HelpProvider helpProvider;
 
 
     // Convention: arguments is not the actual invoked arguments but the command that was invoked,
     // e.g. "/authme help register" would typically be arguments = [register], but here we pass [authme, register]
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments) {
-        FoundCommandResult result = commandService.mapPartsToCommand(sender, arguments);
+        FoundCommandResult result = commandMapper.mapPartsToCommand(sender, arguments);
 
         FoundResultStatus resultStatus = result.getResultStatus();
         if (MISSING_BASE_COMMAND.equals(resultStatus)) {
@@ -43,9 +46,9 @@ public class HelpCommand implements ExecutableCommand {
 
         int mappedCommandLevel = result.getCommandDescription().getLabelCount();
         if (mappedCommandLevel == 1) {
-            commandService.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
+            helpProvider.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
         } else {
-            commandService.outputHelp(sender, result, HelpProvider.ALL_OPTIONS);
+            helpProvider.outputHelp(sender, result, HelpProvider.ALL_OPTIONS);
         }
     }
 

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

@@ -1,7 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AntiBot;
-import fr.xephi.authme.command.CommandService;
+import fr.xephi.authme.command.CommandMapper;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.FoundCommandResult;
 import fr.xephi.authme.command.help.HelpProvider;
@@ -21,7 +21,10 @@ public class SwitchAntiBotCommand implements ExecutableCommand {
     private AntiBot antiBot;
 
     @Inject
-    private CommandService commandService;
+    private CommandMapper commandMapper;
+
+    @Inject
+    private HelpProvider helpProvider;
 
     @Override
     public void executeCommand(final CommandSender sender, List<String> arguments) {
@@ -41,8 +44,8 @@ public class SwitchAntiBotCommand implements ExecutableCommand {
             sender.sendMessage("[AuthMe] AntiBot Manual Override: disabled!");
         } else {
             sender.sendMessage(ChatColor.DARK_RED + "Invalid AntiBot mode!");
-            FoundCommandResult result = commandService.mapPartsToCommand(sender, Arrays.asList("authme", "antibot"));
-            commandService.outputHelp(sender, result, HelpProvider.SHOW_ARGUMENTS);
+            FoundCommandResult result = commandMapper.mapPartsToCommand(sender, Arrays.asList("authme", "antibot"));
+            helpProvider.outputHelp(sender, result, HelpProvider.SHOW_ARGUMENTS);
             sender.sendMessage(ChatColor.GOLD + "Detailed help: " + ChatColor.WHITE + "/authme help antibot");
         }
     }

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

@@ -1,6 +1,6 @@
 package fr.xephi.authme.command.executable.email;
 
-import fr.xephi.authme.command.CommandService;
+import fr.xephi.authme.command.CommandMapper;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.FoundCommandResult;
 import fr.xephi.authme.command.help.HelpProvider;
@@ -16,11 +16,14 @@ import java.util.List;
 public class EmailBaseCommand implements ExecutableCommand {
 
     @Inject
-    private CommandService commandService;
+    private CommandMapper commandMapper;
+
+    @Inject
+    private HelpProvider helpProvider;
 
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments) {
-        FoundCommandResult result = commandService.mapPartsToCommand(sender, Collections.singletonList("email"));
-        commandService.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
+        FoundCommandResult result = commandMapper.mapPartsToCommand(sender, Collections.singletonList("email"));
+        helpProvider.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
     }
 }