make standalone DatabaseSetting for more database types

Author: HSGamer

spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/config/DatabaseConfig.java

@@ -2,14 +2,13 @@
 
 import me.hsgamer.hscore.config.annotation.Comment;
 import me.hsgamer.hscore.config.annotation.ConfigPath;
-import me.hsgamer.hscore.database.Setting;
 import me.hsgamer.topper.spigot.plugin.config.converter.StringObjectMapConverter;
+import me.hsgamer.topper.storage.simple.setting.DatabaseSetting;
 
 import java.util.Collections;
 import java.util.Map;
-import java.util.function.Consumer;
 
-public interface DatabaseConfig extends Consumer<Setting> {
+public interface DatabaseConfig extends DatabaseSetting {
     @ConfigPath("host")
     @Comment("The host of the database")
     default String getHost() {
@@ -57,18 +56,4 @@ default Map<String, Object> getDriverProperties() {
     default Map<String, Object> getClientProperties() {
         return Collections.emptyMap();
     }
-
-    @Override
-    default void accept(Setting setting) {
-        setting.setHost(getHost());
-        setting.setPort(getPort());
-        setting.setDatabaseName(getDatabase());
-        setting.setUsername(getUsername());
-        setting.setPassword(getPassword());
-        if (isUseSSL()) {
-            setting.setDriverProperty("useSSL", "true");
-        }
-        setting.setDriverProperties(getDriverProperties());
-        setting.setClientProperties(getClientProperties());
-    }
 }

spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/manager/TopManager.java

@@ -3,7 +3,6 @@
 import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.hscore.bukkit.config.BukkitConfig;
 import me.hsgamer.hscore.config.proxy.ConfigGenerator;
-import me.hsgamer.hscore.database.Setting;
 import me.hsgamer.topper.spigot.plugin.TopperPlugin;
 import me.hsgamer.topper.spigot.plugin.config.DatabaseConfig;
 import me.hsgamer.topper.spigot.plugin.config.MainConfig;
@@ -13,11 +12,11 @@
 import me.hsgamer.topper.storage.simple.converter.NumberConverter;
 import me.hsgamer.topper.storage.simple.converter.UUIDConverter;
 import me.hsgamer.topper.storage.simple.setting.DataStorageSetting;
+import me.hsgamer.topper.storage.simple.setting.DatabaseSetting;
 import me.hsgamer.topper.storage.simple.supplier.DataStorageSupplier;
 
 import java.io.File;
 import java.util.*;
-import java.util.function.Consumer;
 
 public class TopManager implements Loadable {
     private final Map<String, NumberTopHolder> topHolders = new HashMap<>();
@@ -34,7 +33,7 @@ public void enable() {
                 instance.get(MainConfig.class).getStorageType(),
                 new DataStorageSetting() {
                     @Override
-                    public Consumer<Setting> getDatabaseSettingModifier() {
+                    public DatabaseSetting getDatabaseSetting() {
                         return ConfigGenerator.newInstance(DatabaseConfig.class, new BukkitConfig(instance, "database.yml"));
                     }
 

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/builder/DataStorageBuilder.java

@@ -12,9 +12,9 @@ public class DataStorageBuilder extends Builder<DataStorageSetting, DataStorageS
     public DataStorageBuilder() {
         this.defaultSupplier = setting -> new FlatStorageSupplier(setting.getBaseFolder());
         register(defaultSupplier, "flat", "properties", "");
-        register(setting -> new SqliteStorageSupplier(setting.getDatabaseSettingModifier(), setting.getBaseFolder()), "sqlite", "sqlite3");
-        register(setting -> new NewSqliteStorageSupplier(setting.getDatabaseSettingModifier(), setting.getBaseFolder()), "new-sqlite", "new-sqlite3");
-        register(setting -> new MySqlStorageSupplier(setting.getDatabaseSettingModifier()), "mysql", "mysql-connector-java", "mysql-connector");
+        register(setting -> new SqliteStorageSupplier(setting.getDatabaseSetting(), setting.getBaseFolder()), "sqlite", "sqlite3");
+        register(setting -> new NewSqliteStorageSupplier(setting.getDatabaseSetting(), setting.getBaseFolder()), "new-sqlite", "new-sqlite3");
+        register(setting -> new MySqlStorageSupplier(setting.getDatabaseSetting()), "mysql", "mysql-connector-java", "mysql-connector");
     }
 
     public DataStorageSupplier buildSupplier(String type, DataStorageSetting setting) {

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/setting/DataStorageSetting.java

@@ -1,12 +1,9 @@
 package me.hsgamer.topper.storage.simple.setting;
 
-import me.hsgamer.hscore.database.Setting;
-
 import java.io.File;
-import java.util.function.Consumer;
 
 public interface DataStorageSetting {
-    Consumer<Setting> getDatabaseSettingModifier();
+    DatabaseSetting getDatabaseSetting();
 
     File getBaseFolder();
 }

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/setting/DatabaseSetting.java

@@ -0,0 +1,21 @@
+package me.hsgamer.topper.storage.simple.setting;
+
+import java.util.Map;
+
+public interface DatabaseSetting {
+    String getHost();
+
+    String getPort();
+
+    String getDatabase();
+
+    String getUsername();
+
+    String getPassword();
+
+    boolean isUseSSL();
+
+    Map<String, Object> getDriverProperties();
+
+    Map<String, Object> getClientProperties();
+}

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/MySqlStorageSupplier.java

@@ -3,17 +3,17 @@
 import me.hsgamer.hscore.database.Setting;
 import me.hsgamer.hscore.database.client.sql.java.JavaSqlClient;
 import me.hsgamer.hscore.database.driver.mysql.MySqlDriver;
+import me.hsgamer.topper.storage.simple.setting.DatabaseSetting;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
 
 public class MySqlStorageSupplier extends SqlStorageSupplier {
     private final JavaSqlClient client;
 
-    public MySqlStorageSupplier(Consumer<Setting> databaseSettingConsumer) {
+    public MySqlStorageSupplier(DatabaseSetting databaseSetting) {
         Setting setting = Setting.create(new MySqlDriver());
-        databaseSettingConsumer.accept(setting);
+        applyDatabaseSetting(databaseSetting, setting);
         client = new JavaSqlClient(setting);
     }
 

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/NewSqliteStorageSupplier.java

@@ -1,15 +1,14 @@
 package me.hsgamer.topper.storage.simple.supplier;
 
-import me.hsgamer.hscore.database.Setting;
+import me.hsgamer.topper.storage.simple.setting.DatabaseSetting;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
 
 public class NewSqliteStorageSupplier extends SqliteStorageSupplier {
-    public NewSqliteStorageSupplier(Consumer<Setting> databaseSettingConsumer, File baseFolder) {
-        super(databaseSettingConsumer, baseFolder);
+    public NewSqliteStorageSupplier(DatabaseSetting databaseSetting, File baseFolder) {
+        super(databaseSetting, baseFolder);
     }
 
     @Override

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqlStorageSupplier.java

@@ -1,5 +1,6 @@
 package me.hsgamer.topper.storage.simple.supplier;
 
+import me.hsgamer.hscore.database.Setting;
 import me.hsgamer.hscore.database.client.sql.BatchBuilder;
 import me.hsgamer.hscore.database.client.sql.SqlClient;
 import me.hsgamer.hscore.database.client.sql.StatementBuilder;
@@ -8,6 +9,7 @@
 import me.hsgamer.hscore.logger.provider.LoggerProvider;
 import me.hsgamer.topper.storage.core.DataStorage;
 import me.hsgamer.topper.storage.simple.converter.ValueConverter;
+import me.hsgamer.topper.storage.simple.setting.DatabaseSetting;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -20,6 +22,19 @@ public abstract class SqlStorageSupplier implements DataStorageSupplier {
     protected final Logger logger = LoggerProvider.getLogger(getClass());
     private final Lock lock = new ReentrantLock();
 
+    protected static void applyDatabaseSetting(DatabaseSetting databaseSetting, Setting setting) {
+        setting.setHost(databaseSetting.getHost());
+        setting.setPort(databaseSetting.getPort());
+        setting.setDatabaseName(databaseSetting.getDatabase());
+        setting.setUsername(databaseSetting.getUsername());
+        setting.setPassword(databaseSetting.getPassword());
+        if (databaseSetting.isUseSSL()) {
+            setting.setDriverProperty("useSSL", "true");
+        }
+        setting.setDriverProperties(databaseSetting.getDriverProperties());
+        setting.setClientProperties(databaseSetting.getClientProperties());
+    }
+
     protected abstract SqlClient<?> getClient();
 
     protected boolean isSingleThread() {

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqliteStorageSupplier.java

@@ -3,18 +3,18 @@
 import me.hsgamer.hscore.database.Setting;
 import me.hsgamer.hscore.database.client.sql.java.JavaSqlClient;
 import me.hsgamer.hscore.database.driver.sqlite.SqliteFileDriver;
+import me.hsgamer.topper.storage.simple.setting.DatabaseSetting;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Consumer;
 
 public class SqliteStorageSupplier extends SqlStorageSupplier {
     private final JavaSqlClient client;
 
-    public SqliteStorageSupplier(Consumer<Setting> databaseSettingConsumer, File baseHolder) {
+    public SqliteStorageSupplier(DatabaseSetting databaseSetting, File baseHolder) {
         Setting setting = Setting.create(new SqliteFileDriver(baseHolder));
-        databaseSettingConsumer.accept(setting);
+        applyDatabaseSetting(databaseSetting, setting);
         client = new JavaSqlClient(setting);
     }