Cleanup

Voinea-Radu · Dec 17, 2022 · d700fd9 · d700fd9
1 parent 74ea1e2
commit d700fd9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>dev.lightdream</groupId>
     <artifactId>DatabaseManager</artifactId>
-    <version>3.9.1</version>
+    <version>3.9.2</version>
 
     <distributionManagement>
         <repository>

diff --git a/src/main/java/dev/lightdream/databasemanager/database/DatabaseManager.java b/src/main/java/dev/lightdream/databasemanager/database/DatabaseManager.java
@@ -3,7 +3,7 @@
 import dev.lightdream.databasemanager.DatabaseMain;
 import dev.lightdream.databasemanager.dto.IDatabaseEntry;
 import dev.lightdream.databasemanager.dto.SQLConfig;
-import dev.lightdream.lambda.LambdaExecutor;
+import dev.lightdream.lambda.lambda.ReturnArgLambdaExecutor;
 import dev.lightdream.logger.Logger;
 
 import java.io.File;
@@ -12,21 +12,12 @@
 public abstract class DatabaseManager implements IDatabaseManager {
 
     private final static String lineSeparator = ";line_separator;";
-    private final static HashMap<Class<?>, LambdaExecutor.ReturnLambdaExecutor<?, Object>> serializeMap = new HashMap<>();
-    private final static HashMap<Class<?>, LambdaExecutor.ReturnLambdaExecutor<?, Object>> deserializeMap = new HashMap<>();
+    private final static HashMap<Class<?>, ReturnArgLambdaExecutor<?, Object>> serializeMap = new HashMap<>();
+    private final static HashMap<Class<?>, ReturnArgLambdaExecutor<?, Object>> deserializeMap = new HashMap<>();
     public final DatabaseMain main;
     public SQLConfig sqlConfig;
     public File dataFolder;
 
-    /**
-     * @param string The string to format
-     * @return String appended with " at the beginning and end
-     */
-    @SuppressWarnings("unused")
-    public static String formatString(String string) {
-        return "\"" + string + "\"";
-    }
-
     public DatabaseManager(DatabaseMain main) {
         this.main = main;
         this.sqlConfig = main.getSqlConfig();
@@ -120,12 +111,21 @@ public DatabaseManager(DatabaseMain main) {
         registerDataType(List.class, "TEXT");
     }
 
+    /**
+     * @param string The string to format
+     * @return String appended with " at the beginning and end
+     */
+    @SuppressWarnings("unused")
+    public static String formatString(String string) {
+        return "\"" + string + "\"";
+    }
+
     private static ArrayList<?> deserializeList(Object object) {
         if (object == null) {
             return null;
         }
 
-        try{
+        try {
             if (object.toString()
                     .equals("[]")) {
                 return new ArrayList<>();
@@ -139,7 +139,7 @@ private static ArrayList<?> deserializeList(Object object) {
                 lst.add(getObject(clazz, data));
             }
             return lst;
-        }catch (Exception e){
+        } catch (Exception e) {
             Logger.error("Malformed data for " + object);
             e.printStackTrace();
             return null;
@@ -234,8 +234,8 @@ public void save(IDatabaseEntry object) {
     }
 
     @SuppressWarnings({"unused", "unchecked"})
-    public <R> void registerSDPair(Class<R> clazz, LambdaExecutor.ReturnLambdaExecutor<?, R> serialize, LambdaExecutor.ReturnLambdaExecutor<R, Object> deserialize) {
-        serializeMap.put(clazz, (LambdaExecutor.ReturnLambdaExecutor<?, Object>) serialize);
+    public <R> void registerSDPair(Class<R> clazz, ReturnArgLambdaExecutor<?, R> serialize, ReturnArgLambdaExecutor<R, Object> deserialize) {
+        serializeMap.put(clazz, (ReturnArgLambdaExecutor<?, Object>) serialize);
         deserializeMap.put(clazz, deserialize);
     }
 

diff --git a/src/main/java/dev/lightdream/databasemanager/dto/IDatabaseEntry.java b/src/main/java/dev/lightdream/databasemanager/dto/IDatabaseEntry.java
@@ -1,9 +1,6 @@
 package dev.lightdream.databasemanager.dto;
 
 import dev.lightdream.databasemanager.DatabaseMain;
-import dev.lightdream.databasemanager.annotations.database.DatabaseField;
-
-import java.util.Objects;
 
 public interface IDatabaseEntry {
 

diff --git a/src/main/java/dev/lightdream/databasemanager/dto/entry/DatabaseEntry.java b/src/main/java/dev/lightdream/databasemanager/dto/entry/DatabaseEntry.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.annotations.Expose;
 import dev.lightdream.databasemanager.DatabaseMain;
-import dev.lightdream.databasemanager.annotations.database.DatabaseField;
 import dev.lightdream.databasemanager.dto.IDatabaseEntry;
 
 import java.util.Objects;

diff --git a/src/main/java/dev/lightdream/databasemanager/dto/entry/impl/IntegerDatabaseEntry.java b/src/main/java/dev/lightdream/databasemanager/dto/entry/impl/IntegerDatabaseEntry.java
@@ -2,11 +2,8 @@
 
 import dev.lightdream.databasemanager.DatabaseMain;
 import dev.lightdream.databasemanager.annotations.database.DatabaseField;
-import dev.lightdream.databasemanager.dto.IDatabaseEntry;
 import dev.lightdream.databasemanager.dto.entry.DatabaseEntry;
 
-import java.util.Objects;
-
 @SuppressWarnings("unused")
 public abstract class IntegerDatabaseEntry extends DatabaseEntry {
 
@@ -19,6 +16,7 @@ public abstract class IntegerDatabaseEntry extends DatabaseEntry {
     public IntegerDatabaseEntry(DatabaseMain main) {
         super(main);
     }
+
     @Override
     public Integer getID() {
         return id;

diff --git a/src/main/java/dev/lightdream/databasemanager/dto/entry/impl/StringDatabaseEntry.java b/src/main/java/dev/lightdream/databasemanager/dto/entry/impl/StringDatabaseEntry.java
@@ -1,13 +1,9 @@
 package dev.lightdream.databasemanager.dto.entry.impl;
 
-import com.google.gson.annotations.Expose;
 import dev.lightdream.databasemanager.DatabaseMain;
 import dev.lightdream.databasemanager.annotations.database.DatabaseField;
-import dev.lightdream.databasemanager.dto.IDatabaseEntry;
 import dev.lightdream.databasemanager.dto.entry.DatabaseEntry;
 
-import java.util.Objects;
-
 @SuppressWarnings("unused")
 public abstract class StringDatabaseEntry extends DatabaseEntry {