#432 Create custom dependency injector

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

@@ -1,14 +1,14 @@
 package fr.xephi.authme.command;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.help.HelpProvider;
+import fr.xephi.authme.util.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
-import fr.xephi.authme.util.StringUtils;
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The AuthMe command handler, responsible for mapping incoming commands to the correct {@link CommandDescription}
@@ -29,6 +29,7 @@ public class CommandHandler {
      * 
      * @param commandService The CommandService instance
      */
+    @Inject
     public CommandHandler(CommandService commandService) {
         this.commandService = commandService;
     }

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

@@ -1,11 +1,13 @@
 package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.HelpCommand;
+import fr.xephi.authme.initialization.BaseCommands;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.util.CollectionUtils;
 import fr.xephi.authme.util.StringUtils;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -28,7 +30,8 @@ public class CommandMapper {
     private final Set<CommandDescription> baseCommands;
     private final PermissionsManager permissionsManager;
 
-    public CommandMapper(Set<CommandDescription> baseCommands, PermissionsManager permissionsManager) {
+    @Inject
+    public CommandMapper(@BaseCommands Set<CommandDescription> baseCommands, PermissionsManager permissionsManager) {
         this.baseCommands = baseCommands;
         this.permissionsManager = permissionsManager;
     }

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

@@ -19,6 +19,7 @@ import fr.xephi.authme.util.ValidationService;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
 import java.util.Collection;
 import java.util.List;
 
@@ -28,39 +29,30 @@ import java.util.List;
  */
 public class CommandService {
 
-    private final AuthMe authMe;
-    private final Messages messages;
-    private final HelpProvider helpProvider;
-    private final CommandMapper commandMapper;
-    private final PasswordSecurity passwordSecurity;
-    private final PermissionsManager permissionsManager;
-    private final NewSetting settings;
-    private final PluginHooks pluginHooks;
-    private final SpawnLoader spawnLoader;
-    private final AntiBot antiBot;
-    private final ValidationService validationService;
-    private final BukkitService bukkitService;
-
-    /*
-     * Constructor.
-     */
-    public CommandService(AuthMe authMe, CommandMapper commandMapper, HelpProvider helpProvider, Messages messages,
-                          PasswordSecurity passwordSecurity, PermissionsManager permissionsManager, NewSetting settings,
-                          PluginHooks pluginHooks, SpawnLoader spawnLoader, AntiBot antiBot,
-                          ValidationService validationService, BukkitService bukkitService) {
-        this.authMe = authMe;
-        this.messages = messages;
-        this.helpProvider = helpProvider;
-        this.commandMapper = commandMapper;
-        this.passwordSecurity = passwordSecurity;
-        this.permissionsManager = permissionsManager;
-        this.settings = settings;
-        this.pluginHooks = pluginHooks;
-        this.spawnLoader = spawnLoader;
-        this.antiBot = antiBot;
-        this.validationService = validationService;
-        this.bukkitService = bukkitService;
-    }
+    @Inject
+    private AuthMe authMe;
+    @Inject
+    private Messages messages;
+    @Inject
+    private HelpProvider helpProvider;
+    @Inject
+    private CommandMapper commandMapper;
+    @Inject
+    private PasswordSecurity passwordSecurity;
+    @Inject
+    private PermissionsManager permissionsManager;
+    @Inject
+    private NewSetting settings;
+    @Inject
+    private PluginHooks pluginHooks;
+    @Inject
+    private SpawnLoader spawnLoader;
+    @Inject
+    private AntiBot antiBot;
+    @Inject
+    private ValidationService validationService;
+    @Inject
+    private BukkitService bukkitService;
 
     /**
      * Send a message to a player.

src/main/java/fr/xephi/authme/command/help/HelpProvider.java

@@ -10,10 +10,13 @@ import fr.xephi.authme.command.FoundCommandResult;
 import fr.xephi.authme.permission.DefaultPermission;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.permission.PermissionsManager;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.util.CollectionUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,9 +48,10 @@ public class HelpProvider {
     private final PermissionsManager permissionsManager;
     private final String helpHeader;
 
-    public HelpProvider(PermissionsManager permissionsManager, String helpHeader) {
+    @Inject
+    public HelpProvider(PermissionsManager permissionsManager, NewSetting settings) {
         this.permissionsManager = permissionsManager;
-        this.helpHeader = helpHeader;
+        this.helpHeader = settings.getProperty(PluginSettings.HELP_HEADER);
     }
 
     public List<String> printHelp(CommandSender sender, FoundCommandResult result, int options) {