split storage-simple into modules

Topper-MC · Feb 9, 2025 · 268828b · 268828b
1 parent 660be09
commit 268828b
Show file tree

Hide file tree

Showing 29 changed files with 259 additions and 59 deletions.
diff --git a/spigot/plugin/pom.xml b/spigot/plugin/pom.xml
@@ -135,7 +135,12 @@
         </dependency>
         <dependency>
             <groupId>me.hsgamer</groupId>
-            <artifactId>topper-storage-simple-config</artifactId>
+            <artifactId>topper-storage-simple-converter</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-sql-config</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -188,6 +193,11 @@
             <version>${core.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.projectunified</groupId>
+            <artifactId>minelib-scheduler-global</artifactId>
+            <version>${minelib.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.github.projectunified</groupId>
             <artifactId>minelib-scheduler-async</artifactId>

diff --git a/spigot/storage-simple/pom.xml b/spigot/storage-simple/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>me.hsgamer</groupId>
-            <artifactId>topper-storage-simple</artifactId>
+            <artifactId>topper-storage-simple-builder</artifactId>
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>
@@ -48,10 +48,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.github.projectunified</groupId>
-            <artifactId>minelib-scheduler-global</artifactId>
-            <version>${minelib.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/storage/pom.xml b/storage/pom.xml
@@ -14,6 +14,5 @@
     <modules>
         <module>core</module>
         <module>simple</module>
-        <module>simple-config</module>
     </modules>
 </project>
diff --git a/storage/simple/builder/pom.xml b/storage/simple/builder/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>me.hsgamer</groupId>
+        <artifactId>topper-storage-simple</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>topper-storage-simple-builder</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-flat</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-sqlite</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-mysql</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>hscore-builder</artifactId>
+            <version>${core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>hscore-database-client-java</artifactId>
+            <version>${core.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...ge/simple/builder/DataStorageBuilder.java → ...ge/simple/builder/DataStorageBuilder.java b/...ge/simple/builder/DataStorageBuilder.java → ...ge/simple/builder/DataStorageBuilder.java
@@ -1,8 +1,12 @@
 package me.hsgamer.topper.storage.simple.builder;
 
 import me.hsgamer.hscore.builder.Builder;
+import me.hsgamer.topper.storage.simple.flat.FlatStorageSupplier;
+import me.hsgamer.topper.storage.simple.mysql.MySqlStorageSupplier;
 import me.hsgamer.topper.storage.simple.setting.DataStorageSetting;
-import me.hsgamer.topper.storage.simple.supplier.*;
+import me.hsgamer.topper.storage.simple.sqlite.NewSqliteStorageSupplier;
+import me.hsgamer.topper.storage.simple.sqlite.SqliteStorageSupplier;
+import me.hsgamer.topper.storage.simple.supplier.DataStorageSupplier;
 
 import java.util.function.Function;
 
@@ -12,9 +16,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.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");
+        register(setting -> new SqliteStorageSupplier(setting.getBaseFolder(), setting.getDatabaseSetting(), setting.getSqlClientFunction()), "sqlite", "sqlite3");
+        register(setting -> new NewSqliteStorageSupplier(setting.getBaseFolder(), setting.getDatabaseSetting(), setting.getSqlClientFunction()), "new-sqlite", "new-sqlite3");
+        register(setting -> new MySqlStorageSupplier(setting.getDatabaseSetting(), setting.getSqlClientFunction()), "mysql", "mysql-connector-java", "mysql-connector");
     }
 
     public DataStorageSupplier buildSupplier(String type, DataStorageSetting setting) {

diff --git a/...le/builder/src/main/java/me/hsgamer/topper/storage/simple/setting/DataStorageSetting.java b/...le/builder/src/main/java/me/hsgamer/topper/storage/simple/setting/DataStorageSetting.java
@@ -0,0 +1,18 @@
+package me.hsgamer.topper.storage.simple.setting;
+
+import me.hsgamer.hscore.database.Setting;
+import me.hsgamer.hscore.database.client.sql.SqlClient;
+import me.hsgamer.hscore.database.client.sql.java.JavaSqlClient;
+
+import java.io.File;
+import java.util.function.Function;
+
+public interface DataStorageSetting {
+    DatabaseSetting getDatabaseSetting();
+
+    File getBaseFolder();
+
+    default Function<Setting, SqlClient<?>> getSqlClientFunction() {
+        return JavaSqlClient::new;
+    }
+}
diff --git a/storage/simple/converter/pom.xml b/storage/simple/converter/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>me.hsgamer</groupId>
+        <artifactId>topper-storage-simple</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>topper-storage-simple-converter</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...mple/converter/ComplexValueConverter.java → ...mple/converter/ComplexValueConverter.java b/...mple/converter/ComplexValueConverter.java → ...mple/converter/ComplexValueConverter.java
diff --git a/...age/simple/converter/NumberConverter.java → ...age/simple/converter/NumberConverter.java b/...age/simple/converter/NumberConverter.java → ...age/simple/converter/NumberConverter.java
diff --git a/...imple/converter/SimpleValueConverter.java → ...imple/converter/SimpleValueConverter.java b/...imple/converter/SimpleValueConverter.java → ...imple/converter/SimpleValueConverter.java
diff --git a/...age/simple/converter/StringConverter.java → ...age/simple/converter/StringConverter.java b/...age/simple/converter/StringConverter.java → ...age/simple/converter/StringConverter.java
diff --git a/...orage/simple/converter/UUIDConverter.java → ...orage/simple/converter/UUIDConverter.java b/...orage/simple/converter/UUIDConverter.java → ...orage/simple/converter/UUIDConverter.java
diff --git a/storage/simple/core/pom.xml b/storage/simple/core/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>me.hsgamer</groupId>
+        <artifactId>topper-storage-simple</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>topper-storage-simple-core</artifactId>
+</project>
diff --git a/...rage/simple/converter/ValueConverter.java → ...rage/simple/converter/ValueConverter.java b/...rage/simple/converter/ValueConverter.java → ...rage/simple/converter/ValueConverter.java
diff --git a/.../simple/supplier/DataStorageSupplier.java → .../simple/supplier/DataStorageSupplier.java b/.../simple/supplier/DataStorageSupplier.java → .../simple/supplier/DataStorageSupplier.java
diff --git a/storage/simple/flat/pom.xml b/storage/simple/flat/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>me.hsgamer</groupId>
+        <artifactId>topper-storage-simple</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>topper-storage-simple-flat</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>hscore-logger-provider</artifactId>
+            <version>${core.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/.../simple/supplier/FlatStorageSupplier.java → ...rage/simple/flat/FlatStorageSupplier.java b/.../simple/supplier/FlatStorageSupplier.java → ...rage/simple/flat/FlatStorageSupplier.java
@@ -1,10 +1,11 @@
-package me.hsgamer.topper.storage.simple.supplier;
+package me.hsgamer.topper.storage.simple.flat;
 
 import me.hsgamer.hscore.logger.common.LogLevel;
 import me.hsgamer.hscore.logger.common.Logger;
 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.supplier.DataStorageSupplier;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/storage/simple/mysql/pom.xml b/storage/simple/mysql/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>me.hsgamer</groupId>
+        <artifactId>topper-storage-simple</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>topper-storage-simple-mysql</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-sql</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!--suppress VulnerableLibrariesLocal -->
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>hscore-database-driver-mysql</artifactId>
+            <version>${core.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...simple/supplier/MySqlStorageSupplier.java → ...ge/simple/mysql/MySqlStorageSupplier.java b/...simple/supplier/MySqlStorageSupplier.java → ...ge/simple/mysql/MySqlStorageSupplier.java
@@ -1,14 +1,18 @@
-package me.hsgamer.topper.storage.simple.supplier;
+package me.hsgamer.topper.storage.simple.mysql;
 
+import me.hsgamer.hscore.database.Setting;
+import me.hsgamer.hscore.database.client.sql.SqlClient;
 import me.hsgamer.hscore.database.driver.mysql.MySqlDriver;
 import me.hsgamer.topper.storage.simple.setting.DatabaseSetting;
+import me.hsgamer.topper.storage.simple.sql.SqlStorageSupplier;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 
 public class MySqlStorageSupplier extends SqlStorageSupplier {
-    public MySqlStorageSupplier(DatabaseSetting databaseSetting) {
-        super(new MySqlDriver(), databaseSetting);
+    public MySqlStorageSupplier(DatabaseSetting databaseSetting, Function<Setting, SqlClient<?>> clientFunction) {
+        super(new MySqlDriver(), databaseSetting, clientFunction);
     }
 
     @Override

diff --git a/storage/simple/pom.xml b/storage/simple/pom.xml
@@ -10,33 +10,23 @@
     </parent>
 
     <artifactId>topper-storage-simple</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>core</module>
+        <module>flat</module>
+        <module>converter</module>
+        <module>sql</module>
+        <module>mysql</module>
+        <module>sqlite</module>
+        <module>builder</module>
+        <module>sql-config</module>
+    </modules>
 
     <dependencies>
         <dependency>
             <groupId>me.hsgamer</groupId>
             <artifactId>topper-storage-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>me.hsgamer</groupId>
-            <artifactId>hscore-builder</artifactId>
-            <version>${core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>me.hsgamer</groupId>
-            <artifactId>hscore-database-client-java</artifactId>
-            <version>${core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>me.hsgamer</groupId>
-            <artifactId>hscore-database-driver-sqlite</artifactId>
-            <version>${core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>me.hsgamer</groupId>
-            <artifactId>hscore-database-driver-mysql</artifactId>
-            <version>${core.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/storage/simple-config/pom.xml → storage/simple/sql-config/pom.xml b/storage/simple-config/pom.xml → storage/simple/sql-config/pom.xml
@@ -5,16 +5,16 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>me.hsgamer</groupId>
-        <artifactId>topper-storage</artifactId>
+        <artifactId>topper-storage-simple</artifactId>
         <version>3.7.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>topper-storage-simple-config</artifactId>
+    <artifactId>topper-storage-simple-sql-config</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>me.hsgamer</groupId>
-            <artifactId>topper-storage-simple</artifactId>
+            <artifactId>topper-storage-simple-sql</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/...storage/simple/config/DatabaseConfig.java → ...storage/simple/config/DatabaseConfig.java b/...storage/simple/config/DatabaseConfig.java → ...storage/simple/config/DatabaseConfig.java
diff --git a/storage/simple/sql/pom.xml b/storage/simple/sql/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>me.hsgamer</groupId>
+        <artifactId>topper-storage-simple</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>topper-storage-simple-sql</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>topper-storage-simple-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>hscore-database-client-sql</artifactId>
+            <version>${core.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...orage/simple/setting/DatabaseSetting.java → ...orage/simple/setting/DatabaseSetting.java b/...orage/simple/setting/DatabaseSetting.java → ...orage/simple/setting/DatabaseSetting.java