refactor: create a separate class for every db table

Smart123s · Smart123s · commit 0e8e07f946b2 · 2022-09-01T10:24:50.000+02:00
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java
@@ -63,14 +63,14 @@ private void onCrackedSelf(CommandSender sender) {
         }
 
         // todo: load async if
-        StoredProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
+        StoredProfile profile = plugin.getCore().getAuthStorage().loadProfile(sender.getName());
         if (profile.isPremium()) {
             plugin.getCore().sendLocaleMessage("remove-premium", sender);
 
             profile.setPremium(false);
             profile.setId(null);
             plugin.getScheduler().runAsync(() -> {
-                plugin.getCore().getStorage().save(profile);
+                plugin.getCore().getAuthStorage().save(profile);
                 plugin.getServer().getPluginManager().callEvent(
                         new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
             });
@@ -89,7 +89,7 @@ private void onCrackedOther(CommandSender sender, Command command, String[] args
         }
 
         //todo: load async
-        StoredProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
+        StoredProfile profile = plugin.getCore().getAuthStorage().loadProfile(args[0]);
         if (profile == null) {
             sender.sendMessage("Error occurred");
             return;
@@ -103,7 +103,7 @@ private void onCrackedOther(CommandSender sender, Command command, String[] args
 
             profile.setPremium(false);
             plugin.getScheduler().runAsync(() -> {
-                plugin.getCore().getStorage().save(profile);
+                plugin.getCore().getAuthStorage().save(profile);
                 plugin.getServer().getPluginManager().callEvent(
                         new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
             });
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java
@@ -78,14 +78,14 @@ private void onPremiumSelf(CommandSender sender) {
 
         plugin.getCore().getPendingConfirms().remove(id);
         //todo: load async
-        StoredProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
+        StoredProfile profile = plugin.getCore().getAuthStorage().loadProfile(sender.getName());
         if (profile.isPremium()) {
             plugin.getCore().sendLocaleMessage("already-exists", sender);
         } else {
             //todo: resolve uuid
             profile.setPremium(true);
             plugin.getScheduler().runAsync(() -> {
-                plugin.getCore().getStorage().save(profile);
+                plugin.getCore().getAuthStorage().save(profile);
                 plugin.getServer().getPluginManager().callEvent(
                         new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_SELF));
             });
@@ -104,7 +104,7 @@ private void onPremiumOther(CommandSender sender, Command command, String[] args
         }
 
         //todo: load async
-        StoredProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
+        StoredProfile profile = plugin.getCore().getAuthStorage().loadProfile(args[0]);
         if (profile == null) {
             plugin.getCore().sendLocaleMessage("player-unknown", sender);
             return;
@@ -116,7 +116,7 @@ private void onPremiumOther(CommandSender sender, Command command, String[] args
             //todo: resolve uuid
             profile.setPremium(true);
             plugin.getScheduler().runAsync(() -> {
-                plugin.getCore().getStorage().save(profile);
+                plugin.getCore().getAuthStorage().save(profile);
                 plugin.getServer().getPluginManager().callEvent(
                         new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
             });
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
@@ -133,7 +133,7 @@ private void onSuccessMessage(ProxiedPlayer forPlayer) {
 
             if (!loginSession.isAlreadySaved()) {
                 playerProfile.setPremium(true);
-                plugin.getCore().getStorage().save(playerProfile);
+                plugin.getCore().getAuthStorage().save(playerProfile);
                 loginSession.setAlreadySaved(true);
             }
         }
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java
@@ -63,7 +63,7 @@ public void run() {
     }
 
     private void turnOffPremium() {
-        StoredProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
+        StoredProfile playerProfile = core.getAuthStorage().loadProfile(targetPlayer);
         //existing player is already cracked
         if (playerProfile.isSaved() && !playerProfile.isPremium()) {
             sendMessage("not-premium");
@@ -72,7 +72,7 @@ private void turnOffPremium() {
 
         playerProfile.setPremium(false);
         playerProfile.setId(null);
-        core.getStorage().save(playerProfile);
+        core.getAuthStorage().save(playerProfile);
         PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName()))
             ? PremiumToggleReason.COMMAND_OTHER : PremiumToggleReason.COMMAND_SELF;
         core.getPlugin().getProxy().getPluginManager().callEvent(
@@ -81,14 +81,14 @@ private void turnOffPremium() {
     }
 
     private void activatePremium() {
-        StoredProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
+        StoredProfile playerProfile = core.getAuthStorage().loadProfile(targetPlayer);
         if (playerProfile.isPremium()) {
             sendMessage("already-exists");
             return;
         }
 
         playerProfile.setPremium(true);
-        core.getStorage().save(playerProfile);
+        core.getAuthStorage().save(playerProfile);
         PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName()))
             ? PremiumToggleReason.COMMAND_OTHER : PremiumToggleReason.COMMAND_SELF;
         core.getPlugin().getProxy().getPluginManager().callEvent(
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java
@@ -37,6 +37,7 @@
 import com.github.games647.fastlogin.core.hooks.PasswordGenerator;
 import com.github.games647.fastlogin.core.mojang.ProxyAgnosticMojangResolver;
 import com.github.games647.fastlogin.core.storage.MySQLStorage;
+import com.github.games647.fastlogin.core.storage.SQLAuthStorage;
 import com.github.games647.fastlogin.core.storage.SQLStorage;
 import com.github.games647.fastlogin.core.storage.SQLiteStorage;
 import com.google.common.base.Ticker;
@@ -202,8 +203,8 @@ public MojangResolver getResolver() {
         return resolver;
     }
 
-    public SQLStorage getStorage() {
-        return storage;
+    public SQLAuthStorage getAuthStorage() {
+        return storage.getAuthStorage();
     }
 
     public T getPlugin() {
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java
@@ -76,11 +76,11 @@ public void run() {
 
         //this happens on Bukkit if it's connected to Bungee
         //if that's the case, players will be logged in via plugin messages
-        if (core.getStorage() == null) {
+        if (core.getAuthStorage() == null) {
             return;
         }
 
-        profile = core.getStorage().loadProfile(username);
+        profile = core.getAuthStorage().loadProfile(username);
         if (!profile.isSaved()) {
             // linked players are stored as Java (= not Floodgate) players
             profile.setFloodgate(!isLinked);
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
@@ -28,7 +28,7 @@
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 import com.github.games647.fastlogin.core.shared.event.FastLoginAutoLoginEvent;
-import com.github.games647.fastlogin.core.storage.SQLStorage;
+import com.github.games647.fastlogin.core.storage.SQLAuthStorage;
 
 public abstract class ForceLoginManagement<P extends C, C, L extends LoginSession, T extends PlatformPlugin<C>>
         implements Runnable {
@@ -55,7 +55,7 @@ public void run() {
             return;
         }
 
-        SQLStorage storage = core.getStorage();
+        SQLAuthStorage storage = core.getAuthStorage();
         StoredProfile playerProfile = session.getProfile();
         try {
             if (isOnlineMode()) {
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java
@@ -60,7 +60,7 @@ public void onLogin(String username, S source) {
             }
         }
 
-        StoredProfile profile = core.getStorage().loadProfile(username);
+        StoredProfile profile = core.getAuthStorage().loadProfile(username);
 
         //can't be a premium Java player, if it's not saved in the database
         if (profile == null) {
@@ -152,7 +152,7 @@ private boolean checkPremiumName(S source, String username, StoredProfile profil
     private boolean checkNameChange(S source, String username, Profile profile) {
         //user not exists in the db
         if (core.getConfig().get("nameChangeCheck", false)) {
-            StoredProfile storedProfile = core.getStorage().loadProfile(profile.getId());
+            StoredProfile storedProfile = core.getAuthStorage().loadProfile(profile.getId());
             if (storedProfile != null) {
                 if (storedProfile.isFloodgate()) {
                     core.getPlugin().getLog()
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/storage/AuthStorage.java b/core/src/main/java/com/github/games647/fastlogin/core/storage/AuthStorage.java
@@ -35,6 +35,4 @@ public interface AuthStorage {
     StoredProfile loadProfile(UUID uuid);
 
     void save(StoredProfile playerProfile);
-
-    void close();
 }
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/storage/MigrationManager.java b/core/src/main/java/com/github/games647/fastlogin/core/storage/MigrationManager.java
@@ -26,7 +26,6 @@
 package com.github.games647.fastlogin.core.storage;
 
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
-import com.zaxxer.hikari.HikariDataSource;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -52,20 +51,20 @@ public class MigrationManager {
 
     protected final FastLoginCore<?, ?, ?> core;
 
-    protected final HikariDataSource dataSource;
+    protected final SQLStorage storage;
 
-    protected MigrationManager(FastLoginCore<?, ?, ?> core, HikariDataSource dataSource) {
+    protected MigrationManager(FastLoginCore<?, ?, ?> core, SQLStorage storage) {
         this.core = core;
-        this.dataSource = dataSource;
+        this.storage = storage;
     }
 
     protected void createTables() throws SQLException {
-        try (Connection con = dataSource.getConnection();
+        try (Connection con = storage.getDataSource().getConnection();
                 Statement createStmt = con.createStatement()) {
 
             // if (dataSource.getDriverClassName().contains("sqlite")) {
             // throws: the return value of "fastlogin.hikari.HikariDataSource.getDriverClassName()" is null
-            if (core.getStorage() instanceof SQLiteStorage) {
+            if (storage instanceof SQLiteStorage) {
                 createStmt.executeUpdate(CREATE_TABLE_STMT.replace("AUTO_INCREMENT", "AUTOINCREMENT"));
             } else {
                 createStmt.executeUpdate(CREATE_TABLE_STMT);
@@ -75,7 +74,7 @@ protected void createTables() throws SQLException {
     }
 
     protected int getTableVersion(String table) {
-        try (Connection con = dataSource.getConnection();
+        try (Connection con = storage.getDataSource().getConnection();
                 PreparedStatement loadStmt = con.prepareStatement(LOAD_TABLE_VERSION)) {
             loadStmt.setString(1, table);
 
@@ -102,7 +101,7 @@ protected void migrateTable(MigratableStorage table) {
         for (int i = initialVersion; i < table.getLatestTableVersion(); i++) {
             core.getPlugin().getLog().info("Starting database migration of table {} to version {}",
                     table.getTableName(), i + 1);
-            try (Connection con = dataSource.getConnection();
+            try (Connection con = storage.getDataSource().getConnection();
                     Statement migrateStmt = con.createStatement();
                     PreparedStatement saveStmt = con.prepareStatement(INSERT_MIGRATION);
                 ) {
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/storage/MySQLStorage.java b/core/src/main/java/com/github/games647/fastlogin/core/storage/MySQLStorage.java
@@ -34,7 +34,7 @@ public class MySQLStorage extends SQLStorage {
     private static final String MYSQL_DRIVER = "com.mysql.cj.jdbc.Driver";
     private static final String MARIADB_DRIVER = "fastlogin.mariadb.jdbc.Driver";
 
-    private static final String TABLE_EXISTS = "SHOW TABLES LIKE '" + PREMIUM_TABLE + "'";
+    private static final String TABLE_EXISTS = "SHOW TABLES LIKE ?";
 
     public MySQLStorage(FastLoginCore<?, ?, ?> core, String driver, String host, int port, String database,
                         HikariConfig config, boolean useSSL) {
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/storage/SQLAuthStorage.java b/core/src/main/java/com/github/games647/fastlogin/core/storage/SQLAuthStorage.java
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/storage/SQLStorage.java b/core/src/main/java/com/github/games647/fastlogin/core/storage/SQLStorage.java
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/storage/SQLiteStorage.java b/core/src/main/java/com/github/games647/fastlogin/core/storage/SQLiteStorage.java
diff --git a/velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java
diff --git a/velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncToggleMessage.java b/velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncToggleMessage.java

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ private void onSuccessMessage(ProxiedPlayer forPlayer) {`
`133`	`133`
`134`	`134`	`if (!loginSession.isAlreadySaved()) {`
`135`	`135`	`playerProfile.setPremium(true);`
`136`		`- plugin.getCore().getStorage().save(playerProfile);`
	`136`	`+ plugin.getCore().getAuthStorage().save(playerProfile);`
`137`	`137`	`loginSession.setAlreadySaved(true);`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,4 @@ public interface AuthStorage {`
`35`	`35`	`StoredProfile loadProfile(UUID uuid);`
`36`	`36`
`37`	`37`	`void save(StoredProfile playerProfile);`
`38`		`-`
`39`		`- void close();`
`40`	`38`	`}`