#835 Replace injector classes with ones from ch.jalu.injector project

2016-07-17 21:50:48 +02:00
parent b439a0391c
commit 9a91156000
52 changed files with 157 additions and 1937 deletions
@@ -1,8 +1,8 @@
 package fr.xephi.authme.security;

+import ch.jalu.injector.Injector;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.PasswordEncryptionEvent;
-import fr.xephi.authme.initialization.AuthMeServiceInitializer;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.security.crypts.EncryptionMethod;
 import fr.xephi.authme.security.crypts.HashedPassword;
@@ -28,7 +28,7 @@ public class PasswordSecurity implements Reloadable {
    private PluginManager pluginManager;

    @Inject
-    private AuthMeServiceInitializer initializer;
+    private Injector injector;

    private HashAlgorithm algorithm;
    private boolean supportOldAlgorithm;
@@ -155,7 +155,7 @@ public class PasswordSecurity implements Reloadable {
        if (HashAlgorithm.CUSTOM.equals(algorithm) || HashAlgorithm.PLAINTEXT.equals(algorithm)) {
            return null;
        }
-        return initializer.newInstance(algorithm.getClazz());
+        return injector.newInstance(algorithm.getClazz());
    }

    private void hashPasswordForNewAlgorithm(String password, String playerName) {