Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1467-message-keys-hierarchy

src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java

@@ -167,7 +167,7 @@ public class AuthMeApi {
      * @param playerName The name of the player to process
      *
      * @return The date of the last login, or null if the player doesn't exist or has never logged in
-     * @Deprecated Use Java 8's Instant method {@link #getLastLoginTime(String)}
+     * @deprecated Use Java 8's Instant method {@link #getLastLoginTime(String)}
      */
     @Deprecated
     public Date getLastLogin(String playerName) {

src/main/java/fr/xephi/authme/datasource/SQLite.java

@@ -41,6 +41,7 @@ public class SQLite implements DataSource {
      * Constructor for SQLite.
      *
      * @param settings The settings instance
+     * @param dataFolder The data folder
      *
      * @throws SQLException when initialization of a SQL datasource failed
      */

src/main/java/fr/xephi/authme/permission/PermissionsManager.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.permission;
 
+import com.google.common.annotations.VisibleForTesting;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.listener.JoiningPlayer;
@@ -41,8 +42,7 @@ public class PermissionsManager implements Reloadable {
 
     private final Server server;
     private final PluginManager pluginManager;
-
-    private Settings settings;
+    private final Settings settings;
 
     /**
      * The permission handler that is currently in use.
@@ -50,14 +50,8 @@ public class PermissionsManager implements Reloadable {
      */
     private PermissionHandler handler = null;
 
-    /**
-     * Constructor.
-     *
-     * @param server Server instance
-     * @param pluginManager Bukkit plugin manager
-     */
     @Inject
-    public PermissionsManager(Server server, PluginManager pluginManager, Settings settings) {
+    PermissionsManager(Server server, PluginManager pluginManager, Settings settings) {
         this.server = server;
         this.pluginManager = pluginManager;
         this.settings = settings;
@@ -76,7 +70,8 @@ public class PermissionsManager implements Reloadable {
      * Setup and hook into the permissions systems.
      */
     @PostConstruct
-    private void setup() {
+    @VisibleForTesting
+    void setup() {
         if (settings.getProperty(PluginSettings.FORCE_VAULT_HOOK)) {
             try {
                 PermissionHandler handler = createPermissionHandler(PermissionsSystemType.VAULT);

src/main/java/fr/xephi/authme/permission/handlers/LuckPermsHandler.java

@@ -36,8 +36,7 @@ public class LuckPermsHandler implements PermissionHandler {
         try {
             luckPermsApi = LuckPerms.getApi();
         } catch (IllegalStateException e) {
-            e.printStackTrace();
-            throw new PermissionHandlerException("Could not get api of LuckPerms");
+            throw new PermissionHandlerException("Could not get api of LuckPerms", e);
         }
     }
 

src/main/java/fr/xephi/authme/permission/handlers/PermissionHandlerException.java

@@ -9,4 +9,8 @@ public class PermissionHandlerException extends Exception {
     public PermissionHandlerException(String message) {
         super(message);
     }
+
+    public PermissionHandlerException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }