#727 Remove CommandService from ExecutableCommand interface

(work in progress)
- Inject CommandService like other classes instead of passing it as method parameter
- Not solved: cyclic dependency CommandInitializer > ExecutableCommand > CommandService > CommandInitializer...

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

@@ -17,8 +17,11 @@ public class AddEmailCommand extends PlayerCommand {
     @Inject
     private Management management;
 
+    @Inject
+    private CommandService commandService;
+
     @Override
-    public void runCommand(Player player, List<String> arguments, CommandService commandService) {
+    public void runCommand(Player player, List<String> arguments) {
         String email = arguments.get(0);
         String emailConfirmation = arguments.get(1);
 

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

@@ -1,6 +1,5 @@
 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;
@@ -17,7 +16,7 @@ public class ChangeEmailCommand extends PlayerCommand {
     private Management management;
 
     @Override
-    public void runCommand(Player player, List<String> arguments, CommandService commandService) {
+    public void runCommand(Player player, List<String> arguments) {
         String playerMailOld = arguments.get(0);
         String playerMailNew = arguments.get(1);
 

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

@@ -6,6 +6,7 @@ import fr.xephi.authme.command.FoundCommandResult;
 import fr.xephi.authme.command.help.HelpProvider;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
 import java.util.Collections;
 import java.util.List;
 
@@ -14,8 +15,11 @@ import java.util.List;
  */
 public class EmailBaseCommand implements ExecutableCommand {
 
+    @Inject
+    private CommandService commandService;
+
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
+    public void executeCommand(CommandSender sender, List<String> arguments) {
         FoundCommandResult result = commandService.mapPartsToCommand(sender, Collections.singletonList("email"));
         commandService.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
     }

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

@@ -1,11 +1,5 @@
 package fr.xephi.authme.command.executable.email;
 
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -19,12 +13,19 @@ import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.util.StringUtils;
+import org.bukkit.entity.Player;
+
+import javax.inject.Inject;
+import java.util.List;
 
 public class RecoverEmailCommand extends PlayerCommand {
 
     @Inject
     private PasswordSecurity passwordSecurity;
 
+    @Inject
+    private CommandService commandService;
+
     @Inject
     private DataSource dataSource;
 
@@ -32,10 +33,11 @@ public class RecoverEmailCommand extends PlayerCommand {
     private PlayerCache playerCache;
 
     @Inject
+    // TODO #655: Remove injected AuthMe instance once Authme#mail is encapsulated
     private AuthMe plugin;
 
     @Override
-    public void runCommand(Player player, List<String> arguments, CommandService commandService) {
+    public void runCommand(Player player, List<String> arguments) {
         final String playerMail = arguments.get(0);
         final String playerName = player.getName();