Minor code householding

src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.command.executable.authme;
 
+import com.google.common.primitives.Ints;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.task.purge.PurgeService;
 import org.bukkit.ChatColor;
@@ -26,10 +27,8 @@ public class PurgeCommand implements ExecutableCommand {
         String daysStr = arguments.get(0);
 
         // Convert the days string to an integer value, and make sure it's valid
-        int days;
-        try {
-            days = Integer.parseInt(daysStr);
-        } catch (NumberFormatException ex) {
+        Integer days = Ints.tryParse(daysStr);
+        if (days == null) {
             sender.sendMessage(ChatColor.RED + "The value you've entered is invalid!");
             return;
         }

src/main/java/fr/xephi/authme/data/limbo/LimboServiceHelper.java

@@ -3,7 +3,6 @@ package fr.xephi.authme.data.limbo;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.LimboSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.Location;
@@ -20,9 +19,6 @@ import static fr.xephi.authme.util.Utils.isCollectionEmpty;
  */
 class LimboServiceHelper {
 
-    @Inject
-    private SpawnLoader spawnLoader;
-
     @Inject
     private PermissionsManager permissionsManager;
 

src/main/java/fr/xephi/authme/security/crypts/Pbkdf2.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.security.crypts;
 
+import com.google.common.primitives.Ints;
 import de.rtner.misc.BinTools;
 import de.rtner.security.auth.spi.PBKDF2Engine;
 import de.rtner.security.auth.spi.PBKDF2Parameters;
@@ -38,13 +39,12 @@ public class Pbkdf2 extends HexSaltedMethod {
         if (line.length != 4) {
             return false;
         }
-        int iterations;
-        try {
-            iterations = Integer.parseInt(line[1]);
-        } catch (NumberFormatException e) {
-            ConsoleLogger.logException("Cannot read number of rounds for Pbkdf2", e);
+        Integer iterations = Ints.tryParse(line[1]);
+        if (iterations == null) {
+            ConsoleLogger.warning("Cannot read number of rounds for Pbkdf2: '" + line[1] + "'");
             return false;
         }
+
         String salt = line[2];
         byte[] derivedKey = BinTools.hex2bin(line[3]);
         PBKDF2Parameters params = new PBKDF2Parameters("HmacSHA256", "UTF-8", salt.getBytes(), iterations, derivedKey);

src/main/java/fr/xephi/authme/security/crypts/Pbkdf2Django.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.security.crypts;
 
+import com.google.common.primitives.Ints;
 import de.rtner.security.auth.spi.PBKDF2Engine;
 import de.rtner.security.auth.spi.PBKDF2Parameters;
 import fr.xephi.authme.ConsoleLogger;
@@ -27,13 +28,12 @@ public class Pbkdf2Django extends HexSaltedMethod {
         if (line.length != 4) {
             return false;
         }
-        int iterations;
-        try {
-            iterations = Integer.parseInt(line[1]);
-        } catch (NumberFormatException e) {
-            ConsoleLogger.logException("Could not read number of rounds for Pbkdf2Django:", e);
+        Integer iterations = Ints.tryParse(line[1]);
+        if (iterations == null) {
+            ConsoleLogger.warning("Cannot read number of rounds for Pbkdf2Django: '" + line[1] + "'");
             return false;
         }
+
         String salt = line[2];
         byte[] derivedKey = Base64.getDecoder().decode(line[3]);
         PBKDF2Parameters params = new PBKDF2Parameters("HmacSHA256", "ASCII", salt.getBytes(), iterations, derivedKey);

src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.security.totp;
 
+import com.google.common.primitives.Ints;
 import com.warrenstrange.googleauth.GoogleAuthenticator;
 import com.warrenstrange.googleauth.GoogleAuthenticatorKey;
 import com.warrenstrange.googleauth.GoogleAuthenticatorQRGenerator;
@@ -43,13 +44,8 @@ public class TotpAuthenticator {
      * @return true if code is valid, false otherwise
      */
     public boolean checkCode(String totpKey, String inputCode) {
-        try {
-            Integer totpCode = Integer.valueOf(inputCode);
-            return authenticator.authorize(totpKey, totpCode);
-        } catch (NumberFormatException e) {
-            // ignore
-        }
-        return false;
+        Integer totpCode = Ints.tryParse(inputCode);
+        return totpCode != null && authenticator.authorize(totpKey, totpCode);
     }
 
     public TotpGenerationResult generateTotpKey(Player player) {