Merge remote-tracking branch 'refs/remotes/AuthMe/master'

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

@@ -6,6 +6,8 @@ import fr.xephi.authme.settings.properties.DatabaseSettings;
 /**
  * Database column names.
  */
+// Justification: String is immutable and this class is used to easily access the configurable column names
+@SuppressWarnings({"checkstyle:VisibilityModifier", "checkstyle:MemberName", "checkstyle:AbbreviationAsWordInName"})
 public final class Columns {
 
     public final String NAME;

src/main/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverter.java

@@ -37,7 +37,7 @@ public abstract class AbstractDataSourceConverter<S extends DataSource> implemen
     // which is never the case when a converter is launched from the /authme converter command.
     @Override
     public void execute(CommandSender sender) {
-        if (!destinationType.equals(destination.getType())) {
+        if (destinationType != destination.getType()) {
             if (sender != null) {
                 sender.sendMessage("Please configure your connection to "
                     + destinationType + " and re-run this command");
@@ -59,6 +59,7 @@ public abstract class AbstractDataSourceConverter<S extends DataSource> implemen
             if (destination.isAuthAvailable(auth.getNickname())) {
                 skippedPlayers.add(auth.getNickname());
             } else {
+                adaptPlayerAuth(auth);
                 destination.saveAuth(auth);
                 destination.updateQuitLoc(auth);
             }
@@ -72,6 +73,15 @@ public abstract class AbstractDataSourceConverter<S extends DataSource> implemen
             + " to " + destinationType);
     }
 
+    /**
+     * Adapts the PlayerAuth from the source before it is saved in the destination.
+     *
+     * @param auth the auth from the source
+     */
+    protected void adaptPlayerAuth(PlayerAuth auth) {
+        // noop
+    }
+
     /**
      * @return the data source to convert from
      * @throws Exception during initialization of source

src/main/java/fr/xephi/authme/datasource/converter/ForceFlatToSqlite.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.datasource.converter;
 
+import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.FlatFile;
 
@@ -25,4 +26,11 @@ public class ForceFlatToSqlite extends AbstractDataSourceConverter<FlatFile> {
     public FlatFile getSource() {
         return source;
     }
+
+    @Override
+    protected void adaptPlayerAuth(PlayerAuth auth) {
+        // Issue #1120: FlatFile returns PlayerAuth objects with realname = lower-case name all the time.
+        // We don't want to take this over into the new data source.
+        auth.setRealName("Player");
+    }
 }

src/main/java/fr/xephi/authme/datasource/converter/RakamakConverter.java

@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 
 /**
@@ -40,19 +41,17 @@ public class RakamakConverter implements Converter {
     @Override
     // TODO ljacqu 20151229: Restructure this into smaller portions
     public void execute(CommandSender sender) {
-        boolean useIP = settings.getProperty(ConverterSettings.RAKAMAK_USE_IP);
+        boolean useIp = settings.getProperty(ConverterSettings.RAKAMAK_USE_IP);
         String fileName = settings.getProperty(ConverterSettings.RAKAMAK_FILE_NAME);
         String ipFileName = settings.getProperty(ConverterSettings.RAKAMAK_IP_FILE_NAME);
         File source = new File(pluginFolder, fileName);
-        File ipfiles = new File(pluginFolder, ipFileName);
-        HashMap<String, String> playerIP = new HashMap<>();
-        HashMap<String, HashedPassword> playerPSW = new HashMap<>();
+        File ipFiles = new File(pluginFolder, ipFileName);
+        Map<String, String> playerIP = new HashMap<>();
+        Map<String, HashedPassword> playerPassword = new HashMap<>();
         try {
-            BufferedReader users;
-            BufferedReader ipFile;
-            ipFile = new BufferedReader(new FileReader(ipfiles));
+            BufferedReader ipFile = new BufferedReader(new FileReader(ipFiles));
             String line;
-            if (useIP) {
+            if (useIp) {
                 String tempLine;
                 while ((tempLine = ipFile.readLine()) != null) {
                     if (tempLine.contains("=")) {
@@ -63,20 +62,20 @@ public class RakamakConverter implements Converter {
             }
             ipFile.close();
 
-            users = new BufferedReader(new FileReader(source));
+            BufferedReader users = new BufferedReader(new FileReader(source));
             while ((line = users.readLine()) != null) {
                 if (line.contains("=")) {
                     String[] arguments = line.split("=");
                     HashedPassword hashedPassword = passwordSecurity.computeHash(arguments[1], arguments[0]);
-                    playerPSW.put(arguments[0], hashedPassword);
+                    playerPassword.put(arguments[0], hashedPassword);
 
                 }
             }
             users.close();
-            for (Entry<String, HashedPassword> m : playerPSW.entrySet()) {
+            for (Entry<String, HashedPassword> m : playerPassword.entrySet()) {
                 String playerName = m.getKey();
-                HashedPassword psw = playerPSW.get(playerName);
-                String ip = useIP ? playerIP.get(playerName) : "127.0.0.1";
+                HashedPassword psw = playerPassword.get(playerName);
+                String ip = useIp ? playerIP.get(playerName) : "127.0.0.1";
                 PlayerAuth auth = PlayerAuth.builder()
                     .name(playerName)
                     .realName(playerName)