#432 Inject in commands: DataSource / AntiBot / PasswordSecurity / PlayerCache

- Inject the services instead of passing them through the command service

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

@@ -8,16 +8,27 @@ import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.security.PasswordSecurity;
 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 DataSource dataSource;
+
+    @Inject
+    private PlayerCache playerCache;
+
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
         final String playerMail = arguments.get(0);
@@ -29,7 +40,6 @@ public class RecoverEmailCommand extends PlayerCommand {
             commandService.send(player, MessageKey.ERROR);
             return;
         }
-        DataSource dataSource = commandService.getDataSource();
         if (dataSource.isAuthAvailable(playerName)) {
             if (PlayerCache.getInstance().isAuthenticated(playerName)) {
                 commandService.send(player, MessageKey.ALREADY_LOGGED_IN_ERROR);
@@ -37,10 +47,10 @@ public class RecoverEmailCommand extends PlayerCommand {
             }
 
             String thePass = RandomString.generate(commandService.getProperty(EmailSettings.RECOVERY_PASSWORD_LENGTH));
-            HashedPassword hashNew = commandService.getPasswordSecurity().computeHash(thePass, playerName);
+            HashedPassword hashNew = passwordSecurity.computeHash(thePass, playerName);
             PlayerAuth auth;
-            if (PlayerCache.getInstance().isAuthenticated(playerName)) {
-                auth = PlayerCache.getInstance().getAuth(playerName);
+            if (playerCache.isAuthenticated(playerName)) {
+                auth = playerCache.getAuth(playerName);
             } else if (dataSource.isAuthAvailable(playerName)) {
                 auth = dataSource.getAuth(playerName);
             } else {