* Code refactoring and documentation fix.

Ree6-Applications · Aug 9, 2022 · 5c4a768 · 5c4a768
1 parent 9a324bb
commit 5c4a768
Show file tree

Hide file tree

Showing 24 changed files with 47 additions and 39 deletions.
diff --git a/src/main/java/de/presti/ree6/events/LoggingEvents.java b/src/main/java/de/presti/ree6/events/LoggingEvents.java
@@ -12,7 +12,7 @@
 import de.presti.ree6.logger.invite.InviteContainer;
 import de.presti.ree6.logger.invite.InviteContainerManager;
 import de.presti.ree6.main.Main;
-import de.presti.ree6.sql.base.data.SQLResponse;
+import de.presti.ree6.sql.base.entitis.SQLResponse;
 import de.presti.ree6.sql.entities.Invite;
 import de.presti.ree6.sql.entities.webhook.Webhook;
 import de.presti.ree6.utils.data.ArrayUtil;

diff --git a/src/main/java/de/presti/ree6/events/OtherEvents.java b/src/main/java/de/presti/ree6/events/OtherEvents.java
@@ -5,7 +5,7 @@
 import de.presti.ree6.bot.util.WebhookUtil;
 import de.presti.ree6.bot.version.BotState;
 import de.presti.ree6.main.Main;
-import de.presti.ree6.sql.base.data.SQLResponse;
+import de.presti.ree6.sql.base.entitis.SQLResponse;
 import de.presti.ree6.sql.entities.TemporalVoicechannel;
 import de.presti.ree6.sql.entities.level.ChatUserLevel;
 import de.presti.ree6.sql.entities.level.VoiceUserLevel;

diff --git a/src/main/java/de/presti/ree6/sql/SQLConnector.java b/src/main/java/de/presti/ree6/sql/SQLConnector.java
@@ -2,20 +2,17 @@
 
 import com.google.gson.JsonElement;
 import de.presti.ree6.main.Main;
-import de.presti.ree6.sql.base.data.MigrationUtil;
-import de.presti.ree6.sql.base.data.SQLEntity;
-import de.presti.ree6.sql.base.data.SQLUtil;
-import de.presti.ree6.sql.base.data.StoredResultSet;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
+import de.presti.ree6.sql.base.entitis.StoredResultSet;
+import de.presti.ree6.sql.base.utils.MigrationUtil;
+import de.presti.ree6.sql.base.utils.SQLUtil;
 import de.presti.ree6.sql.mapper.EntityMapper;
 import de.presti.ree6.sql.seed.SeedManager;
 import org.reflections.Reflections;
 
 import java.sql.*;
-import java.util.Base64;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * A "Connector" Class which connect with the used Database Server.

diff --git a/src/main/java/de/presti/ree6/sql/SQLWorker.java b/src/main/java/de/presti/ree6/sql/SQLWorker.java
@@ -7,10 +7,10 @@
 import de.presti.ree6.logger.invite.InviteContainer;
 import de.presti.ree6.main.Main;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
-import de.presti.ree6.sql.base.data.SQLParameter;
-import de.presti.ree6.sql.base.data.SQLResponse;
-import de.presti.ree6.sql.base.data.SQLUtil;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLParameter;
+import de.presti.ree6.sql.base.entitis.SQLResponse;
+import de.presti.ree6.sql.base.utils.SQLUtil;
 import de.presti.ree6.sql.entities.BirthdayWish;
 import de.presti.ree6.sql.entities.Blacklist;
 import de.presti.ree6.sql.entities.Invite;

diff --git a/.../presti/ree6/sql/base/data/SQLEntity.java → ...esti/ree6/sql/base/entitis/SQLEntity.java b/.../presti/ree6/sql/base/data/SQLEntity.java → ...esti/ree6/sql/base/entitis/SQLEntity.java
@@ -1,4 +1,4 @@
-package de.presti.ree6.sql.base.data;
+package de.presti.ree6.sql.base.entitis;
 
 /**
  * Class to keep track of the SQL Entities.

diff --git a/...esti/ree6/sql/base/data/SQLParameter.java → ...i/ree6/sql/base/entitis/SQLParameter.java b/...esti/ree6/sql/base/data/SQLParameter.java → ...i/ree6/sql/base/entitis/SQLParameter.java
@@ -1,4 +1,4 @@
-package de.presti.ree6.sql.base.data;
+package de.presti.ree6.sql.base.entitis;
 
 /**
  * This class is used to represent a SQL Parameter.

diff --git a/...resti/ree6/sql/base/data/SQLResponse.java → ...ti/ree6/sql/base/entitis/SQLResponse.java b/...resti/ree6/sql/base/data/SQLResponse.java → ...ti/ree6/sql/base/entitis/SQLResponse.java
@@ -1,4 +1,4 @@
-package de.presti.ree6.sql.base.data;
+package de.presti.ree6.sql.base.entitis;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...i/ree6/sql/base/data/StoredResultSet.java → ...ee6/sql/base/entitis/StoredResultSet.java b/...i/ree6/sql/base/data/StoredResultSet.java → ...ee6/sql/base/entitis/StoredResultSet.java
@@ -1,4 +1,4 @@
-package de.presti.ree6.sql.base.data;
+package de.presti.ree6.sql.base.entitis;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...sti/ree6/sql/base/data/MigrationUtil.java → ...ti/ree6/sql/base/utils/MigrationUtil.java b/...sti/ree6/sql/base/data/MigrationUtil.java → ...ti/ree6/sql/base/utils/MigrationUtil.java
@@ -1,4 +1,4 @@
-package de.presti.ree6.sql.base.data;
+package de.presti.ree6.sql.base.utils;
 
 import de.presti.ree6.main.Main;
 import de.presti.ree6.sql.SQLConnector;

diff --git a/...de/presti/ree6/sql/base/data/SQLUtil.java → ...e/presti/ree6/sql/base/utils/SQLUtil.java b/...de/presti/ree6/sql/base/data/SQLUtil.java → ...e/presti/ree6/sql/base/utils/SQLUtil.java
@@ -1,9 +1,11 @@
-package de.presti.ree6.sql.base.data;
+package de.presti.ree6.sql.base.utils;
 
 import com.google.gson.*;
 import de.presti.ree6.main.Main;
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLParameter;
 
 import javax.sql.rowset.serial.SerialBlob;
 import java.io.BufferedReader;

diff --git a/src/main/java/de/presti/ree6/sql/entities/BirthdayWish.java b/src/main/java/de/presti/ree6/sql/entities/BirthdayWish.java
@@ -2,7 +2,7 @@
 
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 import java.util.Date;
 

diff --git a/src/main/java/de/presti/ree6/sql/entities/Blacklist.java b/src/main/java/de/presti/ree6/sql/entities/Blacklist.java
@@ -2,7 +2,7 @@
 
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 /**
  * SQL Entity for the Blacklist.

diff --git a/src/main/java/de/presti/ree6/sql/entities/Invite.java b/src/main/java/de/presti/ree6/sql/entities/Invite.java
@@ -2,7 +2,7 @@
 
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 /**
  * Invite class to store information about an Invite.

diff --git a/src/main/java/de/presti/ree6/sql/entities/Recording.java b/src/main/java/de/presti/ree6/sql/entities/Recording.java
@@ -3,7 +3,7 @@
 import com.google.gson.JsonArray;
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 import de.presti.ree6.utils.others.RandomUtils;
 
 /**

diff --git a/src/main/java/de/presti/ree6/sql/entities/Setting.java b/src/main/java/de/presti/ree6/sql/entities/Setting.java
@@ -2,7 +2,7 @@
 
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 /**
  * File to store Settings information.

diff --git a/src/main/java/de/presti/ree6/sql/entities/TemporalVoicechannel.java b/src/main/java/de/presti/ree6/sql/entities/TemporalVoicechannel.java
@@ -2,7 +2,7 @@
 
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 /**
  * Class used to store information about the temporal Voice-Channel.

diff --git a/src/main/java/de/presti/ree6/sql/entities/level/UserLevel.java b/src/main/java/de/presti/ree6/sql/entities/level/UserLevel.java
@@ -1,7 +1,7 @@
 package de.presti.ree6.sql.entities.level;
 
 import de.presti.ree6.sql.base.annotations.Property;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 import de.presti.ree6.utils.data.LevelUtil;
 import net.dv8tion.jda.api.entities.User;
 

diff --git a/src/main/java/de/presti/ree6/sql/entities/roles/Role.java b/src/main/java/de/presti/ree6/sql/entities/roles/Role.java
@@ -1,7 +1,7 @@
 package de.presti.ree6.sql.entities.roles;
 
 import de.presti.ree6.sql.base.annotations.Property;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 /**
  * Role class to store data about roles.

diff --git a/src/main/java/de/presti/ree6/sql/entities/stats/Stats.java b/src/main/java/de/presti/ree6/sql/entities/stats/Stats.java
@@ -2,7 +2,7 @@
 
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 /**
  * SQL Entity for the Stats.

diff --git a/src/main/java/de/presti/ree6/sql/entities/webhook/Webhook.java b/src/main/java/de/presti/ree6/sql/entities/webhook/Webhook.java
@@ -1,7 +1,7 @@
 package de.presti.ree6.sql.entities.webhook;
 
 import de.presti.ree6.sql.base.annotations.Property;
-import de.presti.ree6.sql.base.data.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
 
 /**
  * SQL Entity for the Webhooks.

diff --git a/src/main/java/de/presti/ree6/sql/mapper/EntityMapper.java b/src/main/java/de/presti/ree6/sql/mapper/EntityMapper.java
@@ -2,10 +2,10 @@
 
 import de.presti.ree6.main.Main;
 import de.presti.ree6.sql.base.annotations.Property;
-import de.presti.ree6.sql.base.data.SQLEntity;
-import de.presti.ree6.sql.base.data.SQLResponse;
-import de.presti.ree6.sql.base.data.SQLUtil;
-import de.presti.ree6.sql.base.data.StoredResultSet;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLResponse;
+import de.presti.ree6.sql.base.entitis.StoredResultSet;
+import de.presti.ree6.sql.base.utils.SQLUtil;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

diff --git a/src/main/java/de/presti/ree6/sql/migrations/MigrationBuilder.java b/src/main/java/de/presti/ree6/sql/migrations/MigrationBuilder.java
@@ -4,7 +4,11 @@
 import de.presti.ree6.sql.SQLConnector;
 import de.presti.ree6.sql.base.annotations.Property;
 import de.presti.ree6.sql.base.annotations.Table;
-import de.presti.ree6.sql.base.data.*;
+import de.presti.ree6.sql.base.entitis.SQLEntity;
+import de.presti.ree6.sql.base.entitis.SQLParameter;
+import de.presti.ree6.sql.base.entitis.StoredResultSet;
+import de.presti.ree6.sql.base.utils.MigrationUtil;
+import de.presti.ree6.sql.base.utils.SQLUtil;
 import org.reflections.Reflections;
 
 import java.lang.reflect.Field;

diff --git a/src/main/java/de/presti/ree6/utils/data/Data.java b/src/main/java/de/presti/ree6/utils/data/Data.java
@@ -5,7 +5,6 @@
  */
 public class Data {
 
-    // Completely remove this, and migrate it into the main class.
 
     /**
      * Constructor for the Data Utility class.
@@ -14,10 +13,14 @@ private Data() {
         throw new IllegalStateException("Utility class");
     }
 
-    // Current Domain of the Website.
+    /**
+     * Current Domain of the Website.
+     */
     public static final String WEBSITE = "https://ree6.de";
 
-    // Advertisement, because of Sponsors.
+    /**
+     * Advertisement, because of Sponsors.
+     */
     public static final String ADVERTISEMENT = "powered by Tube-Hosting";
 }
 
diff --git a/src/main/java/de/presti/ree6/utils/data/ImageCreationUtility.java b/src/main/java/de/presti/ree6/utils/data/ImageCreationUtility.java
@@ -23,7 +23,9 @@ private ImageCreationUtility() {
         throw new IllegalStateException("Utility class");
     }
 
-    // Cached Background Image, for performance.
+    /**
+     * Cached Background Image, for performance.
+     */
     private static BufferedImage rankBackgroundBase;
 
     /**