From d700fd9db07d1d190071a6c0d8e248f1b613aa4f Mon Sep 17 00:00:00 2001 From: Radu Voinea Date: Sun, 18 Dec 2022 00:29:15 +0200 Subject: [PATCH] Cleanup --- pom.xml | 2 +- .../database/DatabaseManager.java | 32 +++++++++---------- .../databasemanager/dto/IDatabaseEntry.java | 3 -- .../dto/entry/DatabaseEntry.java | 1 - .../dto/entry/impl/IntegerDatabaseEntry.java | 4 +-- .../dto/entry/impl/StringDatabaseEntry.java | 4 --- 6 files changed, 18 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 6f0fe8b..01ae1de 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.lightdream DatabaseManager - 3.9.1 + 3.9.2 diff --git a/src/main/java/dev/lightdream/databasemanager/database/DatabaseManager.java b/src/main/java/dev/lightdream/databasemanager/database/DatabaseManager.java index 862bf7d..13b631a 100644 --- 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, LambdaExecutor.ReturnLambdaExecutor> serializeMap = new HashMap<>(); - private final static HashMap, LambdaExecutor.ReturnLambdaExecutor> deserializeMap = new HashMap<>(); + private final static HashMap, ReturnArgLambdaExecutor> serializeMap = new HashMap<>(); + private final static HashMap, ReturnArgLambdaExecutor> 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 void registerSDPair(Class clazz, LambdaExecutor.ReturnLambdaExecutor serialize, LambdaExecutor.ReturnLambdaExecutor deserialize) { - serializeMap.put(clazz, (LambdaExecutor.ReturnLambdaExecutor) serialize); + public void registerSDPair(Class clazz, ReturnArgLambdaExecutor serialize, ReturnArgLambdaExecutor deserialize) { + serializeMap.put(clazz, (ReturnArgLambdaExecutor) 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 index 4118c12..24d69bd 100644 --- 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 index d93aeaf..48a6fe8 100644 --- 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 index 98acace..75b58a1 100644 --- 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 index 6ae7a6c..7f7b392 100644 --- 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 {