Merge pull request #2 from MCCitiesNetwork/fix/deserialisation-issues

feat: undeserialisable config option

Author: Technofied

src/main/java/io/github/md5sha256/democracypost/DemocracyPost.java

@@ -173,7 +173,7 @@ public void onDisable() {
 
     @Nonnull
     private DatabaseAdapter initDatabase() throws IOException {
-        DatabaseAdapter adapter = new DatabaseAdapter(this.settings.databaseSettings());
+        DatabaseAdapter adapter = new DatabaseAdapter(this.settings.databaseSettings(), getLogger(), this.settings.postSettings().skipUndeserializableItems());
         try {
             adapter.init();
         } catch (SQLException ex) {

src/main/java/io/github/md5sha256/democracypost/PostSettings.java

@@ -12,7 +12,8 @@ public record PostSettings(
         @Setting @Required long packageExpirySeconds,
         @Setting @Required long returnPackageExpirySeconds,
         @Setting @Required long expiryNotificationExpiryThresholdSeconds,
-        @Setting @Required double postPrice
+        @Setting @Required double postPrice,
+        @Setting @Required boolean skipUndeserializableItems
 ) {
 
     @Nonnull

src/main/java/io/github/md5sha256/democracypost/database/DatabaseAdapter.java

@@ -12,6 +12,7 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.UUID;
+import java.util.logging.Logger;
 
 public class DatabaseAdapter implements Closeable {
 
@@ -20,9 +21,9 @@ public class DatabaseAdapter implements Closeable {
 
     private HikariDataSource dataSource;
 
-    public DatabaseAdapter(@Nonnull DatabaseSettings databaseSettings) {
+    public DatabaseAdapter(@Nonnull DatabaseSettings databaseSettings, @Nonnull Logger logger, boolean skipUndeserializableItems) {
         this.databaseSettings = databaseSettings;
-        this.schema = new MariaSchema();
+        this.schema = new MariaSchema(logger, skipUndeserializableItems);
     }
 
     public void init() throws SQLException {

src/main/java/io/github/md5sha256/democracypost/database/MariaSchema.java

@@ -26,13 +26,22 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import java.util.logging.Logger;
+
 
 public class MariaSchema implements DatabaseSchema {
 
+    private final Logger logger;
+    private final boolean skipUndeserializableItems;
+
+    public MariaSchema(@Nonnull Logger logger, boolean skipUndeserializableItems) {
+        this.logger = logger;
+        this.skipUndeserializableItems = skipUndeserializableItems;
+    }
+
     private static final String CREATE_POST_PACKAGES_TABLE = """
             CREATE TABLE POST_PACKAGE (
               package_id BINARY(16) NOT NULL,
@@ -225,7 +234,21 @@ private List<ItemStack> getItemStacks(@Nonnull byte[] bytes) {
                 .defaultOptions(options -> options.serializers(Serializers.defaults()));
         try {
             ConfigurationNode node = builder.buildAndLoadString(s);
-            return node.getList(ItemStack.class, Collections.emptyList());
+            List<ItemStack> items = new ArrayList<>();
+            for (ConfigurationNode child : node.childrenList()) {
+                try {
+                    ItemStack item = child.get(ItemStack.class);
+                    if (item != null) {
+                        items.add(item);
+                    }
+                } catch (ConfigurateException ex) {
+                    if (!this.skipUndeserializableItems) {
+                        throw new IllegalStateException("Failed to deserialize item stacks!", ex);
+                    }
+                    this.logger.warning("Skipping item that could not be deserialized: " + ex.getMessage());
+                }
+            }
+            return items;
         } catch (ConfigurateException ex) {
             throw new IllegalStateException("Failed to deserialize item stacks!", ex);
         }

src/main/resources/settings.yml

@@ -13,6 +13,7 @@ post-settings:
   return-package-expiry-seconds: 2592000
   expiry-notification-expiry-threshold-seconds: 259200
   post-price: 0.50
+  skip-undeserializable-items: true
 
 save-duration-seconds: 600
 join-message-delay-seconds: 10