From f83ead52bbc3eda7ee6e24cd6fa709930a1c2bc4 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:24:59 +0700
Subject: [PATCH] refactor: getOrDefault in PersistentDataUtilities

---
 build-number.txt                                          | 2 +-
 .../me/chayapak1/chomens_bot/plugins/FilterPlugin.java    | 8 +-------
 .../me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java  | 8 +-------
 .../java/me/chayapak1/chomens_bot/plugins/MailPlugin.java | 8 +-------
 .../chomens_bot/plugins/PlayersPersistentDataPlugin.java  | 8 +-------
 .../chomens_bot/util/PersistentDataUtilities.java         | 4 ++++
 6 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/build-number.txt b/build-number.txt
index b3bba8d8..c00ea42d 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1145
\ No newline at end of file
+1147
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterPlugin.java
index 74b10e2c..f11bd2e6 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterPlugin.java
@@ -20,16 +20,10 @@ import java.util.regex.Pattern;
 public class FilterPlugin extends PlayersPlugin.Listener {
     private final Bot bot;
 
-    public static JsonArray filteredPlayers = new JsonArray();
+    public static JsonArray filteredPlayers = PersistentDataUtilities.getOrDefault("filters", new JsonArray()).getAsJsonArray();
 
     private final Gson gson = new Gson();
 
-    static {
-        if (PersistentDataUtilities.has("filters")) {
-            filteredPlayers = PersistentDataUtilities.get("filters").getAsJsonArray();
-        }
-    }
-
     public FilterPlugin (Bot bot) {
         this.bot = bot;
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
index e5fb5875..43fb04f8 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
@@ -12,13 +12,7 @@ import java.util.concurrent.TimeUnit;
 public class IPFilterPlugin extends PlayersPlugin.Listener {
     private final Bot bot;
 
-    public static JsonArray filteredIPs = new JsonArray();
-
-    static {
-        if (PersistentDataUtilities.has("ipFilters")) {
-            filteredIPs = PersistentDataUtilities.get("ipFilters").getAsJsonArray();
-        }
-    }
+    public static JsonArray filteredIPs = PersistentDataUtilities.getOrDefault("ipFilters", new JsonArray()).getAsJsonArray();
 
     public IPFilterPlugin (Bot bot) {
         this.bot = bot;
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
index 24e7f064..b47b4a70 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
@@ -14,16 +14,10 @@ import net.kyori.adventure.text.format.NamedTextColor;
 public class MailPlugin extends PlayersPlugin.Listener {
     private final Bot bot;
 
-    public static JsonArray mails = new JsonArray();
+    public static JsonArray mails = PersistentDataUtilities.getOrDefault("mails", new JsonArray()).getAsJsonArray();
 
     private final Gson gson = new Gson();
 
-    static {
-        if (PersistentDataUtilities.has("mails")) {
-            mails = PersistentDataUtilities.get("mails").getAsJsonArray();
-        }
-    }
-
     public MailPlugin (Bot bot) {
         this.bot = bot;
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPersistentDataPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPersistentDataPlugin.java
index 86995e1d..f1238413 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPersistentDataPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPersistentDataPlugin.java
@@ -11,13 +11,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 public class PlayersPersistentDataPlugin extends PlayersPlugin.Listener {
-    public static JsonObject playersObject = new JsonObject();
-
-    static {
-        if (PersistentDataUtilities.has("players")) {
-            playersObject = PersistentDataUtilities.get("players").getAsJsonObject();
-        }
-    }
+    public static JsonObject playersObject = PersistentDataUtilities.getOrDefault("players", new JsonObject()).getAsJsonObject();
 
     private final Bot bot;
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/util/PersistentDataUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/PersistentDataUtilities.java
index 12a899bd..0b3c59bc 100644
--- a/src/main/java/me/chayapak1/chomens_bot/util/PersistentDataUtilities.java
+++ b/src/main/java/me/chayapak1/chomens_bot/util/PersistentDataUtilities.java
@@ -77,6 +77,10 @@ public class PersistentDataUtilities {
         return jsonObject.get(property);
     }
 
+    public static synchronized JsonElement getOrDefault (String property, JsonElement defaultElement) {
+        return has(property) ? get(property) : defaultElement;
+    }
+
     public static synchronized void put (String property, JsonElement value) {
         lock.lock();