Deprecate flatile datasource, force flat to sqlite conversion #344

AuthMe · Dec 26, 2015 · 41e400e · 41e400e
1 parent 72365bc
commit 41e400e
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 415 deletions.
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -1,7 +1,34 @@
 package fr.xephi.authme;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitTask;
+import org.mcstats.Metrics;
+import org.mcstats.Metrics.Graph;
+
 import com.earth2me.essentials.Essentials;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+
 import fr.xephi.authme.api.API;
 import fr.xephi.authme.api.NewAPI;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -11,7 +38,6 @@
 import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.command.CommandHandler;
 import fr.xephi.authme.command.CommandInitializer;
-import fr.xephi.authme.converter.Converter;
 import fr.xephi.authme.converter.ForceFlatToSqlite;
 import fr.xephi.authme.datasource.CacheDataSource;
 import fr.xephi.authme.datasource.DataSource;
@@ -45,31 +71,6 @@
 import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.util.Wrapper;
 import net.minelink.ctplus.CombatTagPlus;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitTask;
-import org.mcstats.Metrics;
-import org.mcstats.Metrics.Graph;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
 
 /**
  * The AuthMe main class.
@@ -563,16 +564,17 @@ public void run() {
             });
         }
 
+        if (Settings.getDataSource == DataSource.DataSourceType.FILE) {
+            ConsoleLogger.showError("FlatFile backend has been detected and is now deprecated, it will be changed to SQLite... Connection will be impossible until conversion is done!");
+            ForceFlatToSqlite converter = new ForceFlatToSqlite(database, this);
+            DataSource source = converter.run();
+            if (source != null)
+                database = source;
+        }
+
         if (Settings.isCachingEnabled) {
             database = new CacheDataSource(database);
         }
-
-        if (Settings.getDataSource == DataSource.DataSourceType.FILE) {
-            Converter converter = new ForceFlatToSqlite(database, this);
-            server.getScheduler().runTaskAsynchronously(this, converter);
-            ConsoleLogger.showError("FlatFile backend has been detected and is now deprecated, next time server starts up, it will be changed to SQLite... Conversion will be started Asynchronously, it will not drop down your performance !");
-            ConsoleLogger.showError("If you want to keep FlatFile, set file again into config at backend, but this message and this change will appear again at the next restart");
-        }
     }
 
     /**

diff --git a/src/main/java/fr/xephi/authme/command/CommandInitializer.java b/src/main/java/fr/xephi/authme/command/CommandInitializer.java
@@ -1,6 +1,14 @@
 package fr.xephi.authme.command;
 
+import static fr.xephi.authme.permission.DefaultPermission.ALLOWED;
+import static fr.xephi.authme.permission.DefaultPermission.OP_ONLY;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
 import com.google.common.collect.ImmutableSet;
+
 import fr.xephi.authme.command.executable.HelpCommand;
 import fr.xephi.authme.command.executable.authme.AccountsCommand;
 import fr.xephi.authme.command.executable.authme.AuthMeCommand;
@@ -35,13 +43,6 @@
 import fr.xephi.authme.permission.AdminPermission;
 import fr.xephi.authme.permission.PlayerPermission;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-import static fr.xephi.authme.permission.DefaultPermission.ALLOWED;
-import static fr.xephi.authme.permission.DefaultPermission.OP_ONLY;
-
 /**
  * Initializes all available AuthMe commands.
  */
@@ -478,8 +479,8 @@ private static void initializeCommands() {
             .labels("converter", "convert", "conv")
             .description("Converter Command")
             .detailedDescription("Converter command for AuthMeReloaded.")
-            .withArgument("job", "Conversion job: flattosql / flattosqlite /| xauth / crazylogin / rakamak / " +
-                "royalauth / vauth / sqltoflat / sqlitetosql", false)
+            .withArgument("job", "Conversion job: xauth / crazylogin / rakamak / " +
+                "royalauth / vauth / sqlitetosql", false)
             .permissions(OP_ONLY, AdminPermission.CONVERTER)
             .executableCommand(new ConverterCommand())
             .build();

diff --git a/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java b/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
@@ -1,23 +1,21 @@
 package fr.xephi.authme.command.executable.converter;
 
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.converter.Converter;
 import fr.xephi.authme.converter.CrazyLoginConverter;
-import fr.xephi.authme.converter.FlatToSql;
-import fr.xephi.authme.converter.FlatToSqlite;
 import fr.xephi.authme.converter.RakamakConverter;
 import fr.xephi.authme.converter.RoyalAuthConverter;
-import fr.xephi.authme.converter.SqlToFlat;
 import fr.xephi.authme.converter.SqliteToSql;
 import fr.xephi.authme.converter.vAuthConverter;
 import fr.xephi.authme.converter.xAuthConverter;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
 
 public class ConverterCommand extends ExecutableCommand {
 
@@ -42,12 +40,6 @@ public void executeCommand(CommandSender sender, List<String> arguments) {
         // Get the proper converter instance
         Converter converter = null;
         switch (jobType) {
-            case FTSQL:
-                converter = new FlatToSql();
-                break;
-            case FTSQLITE:
-                converter = new FlatToSqlite(sender);
-                break;
             case XAUTH:
                 converter = new xAuthConverter(plugin, sender);
                 break;
@@ -63,9 +55,6 @@ public void executeCommand(CommandSender sender, List<String> arguments) {
             case VAUTH:
                 converter = new vAuthConverter(plugin, sender);
                 break;
-            case SQLTOFLAT:
-                converter = new SqlToFlat(plugin, sender);
-                break;
             case SQLITETOSQL:
             	converter = new SqliteToSql(plugin, sender);
             	break;
@@ -81,14 +70,11 @@ public void executeCommand(CommandSender sender, List<String> arguments) {
     }
 
     public enum ConvertType {
-        FTSQL("flattosql"),
-        FTSQLITE("flattosqlite"),
         XAUTH("xauth"),
         CRAZYLOGIN("crazylogin"),
         RAKAMAK("rakamak"),
         ROYALAUTH("royalauth"),
         VAUTH("vauth"),
-        SQLTOFLAT("sqltoflat"),
         SQLITETOSQL("sqlitetosql");
 
         final String name;

diff --git a/src/main/java/fr/xephi/authme/converter/FlatToSql.java b/src/main/java/fr/xephi/authme/converter/FlatToSql.java