Add persistence default elision

CitizensDev · Jan 1, 2023 · e7dcc4a · e7dcc4a
1 parent d2acdca
commit e7dcc4a
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 11 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/gui/InputMenus.java b/src/main/java/net/citizensnpcs/api/gui/InputMenus.java
@@ -173,7 +173,11 @@ public void initialise(MenuContext ctx) {
         @ClickHandler(slot = { 0, 2 })
         public void save(InventoryMenuSlot slot, CitizensInventoryClickEvent evt) {
             evt.setCancelled(true);
-            if (callback.apply(slot.getCurrentItem().getItemMeta().getDisplayName())) {
+            String res = slot.getCurrentItem().getItemMeta().getDisplayName();
+            if (res != null && (res.isEmpty() || res.equalsIgnoreCase("Not set") || res.equalsIgnoreCase("null"))) {
+                res = null;
+            }
+            if (callback.apply(res)) {
                 ctx.getMenu().transitionBack();
             }
         }

diff --git a/src/main/java/net/citizensnpcs/api/persistence/PersistenceLoader.java b/src/main/java/net/citizensnpcs/api/persistence/PersistenceLoader.java
@@ -54,6 +54,8 @@ public void save(Object instance, DataKey root) {
     }
 
     private static class PersistField {
+        private boolean checkedForDefault;
+        private Object defaultValue;
         private final Persister<?> delegate;
         private final Field field;
         private final String key;
@@ -100,10 +102,32 @@ public Class<?> getType() {
             return field.getType();
         }
 
+        public boolean isDefault(Object value) {
+            return false;
+            // return defaultValue != null && defaultValue.equals(value);
+        }
+
         public boolean isRequired() {
             return persistAnnotation.required();
         }
 
+        public void populateDefault(Object instance) {
+            if (checkedForDefault)
+                return;
+
+            try {
+                defaultValue = field.get(instance);
+                checkedForDefault = true;
+                if (defaultValue != null && !defaultValue.getClass().isPrimitive() && !(defaultValue instanceof Number)
+                        && !(defaultValue instanceof Enum) && !(defaultValue instanceof Boolean)
+                        && !(defaultValue instanceof String)) {
+                    defaultValue = null;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
         public void set(Object instance, Object value) {
             try {
                 field.set(instance, value);
@@ -441,13 +465,19 @@ private static Class<?> getGenericType(Field field) {
     public static <T> T load(Class<? extends T> clazz, DataKey root) {
         T instance = null;
         try {
-            for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
-                if (constructor.getParameterCount() == 0) {
-                    constructor.setAccessible(true);
-                    instance = (T) constructor.newInstance();
-                    break;
+            Constructor<?> constructor = constructorCache.get(clazz);
+            if (constructor == null) {
+                for (Constructor<?> cons : clazz.getDeclaredConstructors()) {
+                    if (cons.getParameterCount() == 0) {
+                        cons.setAccessible(true);
+                        constructor = cons;
+                        constructorCache.put(clazz, constructor);
+                        break;
+                    }
                 }
             }
+
+            instance = (T) constructor.newInstance();
         } catch (Exception e) {
             Messaging.severe("Error creating instance for " + clazz + " using " + root);
             e.printStackTrace();
@@ -474,6 +504,7 @@ public static <T> T load(T instance, DataKey root) {
         PersistField[] fields = getFields(clazz);
         for (PersistField field : fields) {
             try {
+                field.populateDefault(instance);
                 deserialise(field, instance, field.get(instance), field.getDataKey(root));
             } catch (Exception e) {
                 if (e != loadException) {
@@ -572,6 +603,10 @@ private static void serialise(PersistField field, Object fieldValue, DataKey roo
 
     @SuppressWarnings("unchecked")
     private static void serialiseValue(PersistField field, DataKey root, Object value) {
+        if (field.isDefault(value)) {
+            root.removeKey("");
+            return;
+        }
         if (field.delegate != null) {
             ((Persister<Object>) field.delegate).save(value, root);
         } else if (value instanceof Enum) {
@@ -584,18 +619,18 @@ private static void serialiseValue(PersistField field, DataKey root, Object valu
         }
     }
 
-    private static final Map<Class<?>, PersistField[]> fieldCache = new WeakHashMap<Class<?>, PersistField[]>();
-
-    private static final Map<Class<? extends Persister<?>>, Persister<?>> loadedDelegates = new WeakHashMap<Class<? extends Persister<?>>, Persister<?>>();
+    private static Map<Class<?>, Constructor<?>> constructorCache = new WeakHashMap<>();
+    private static final Map<Class<?>, PersistField[]> fieldCache = new WeakHashMap<>();
+    private static final Map<Class<? extends Persister<?>>, Persister<?>> loadedDelegates = new WeakHashMap<>();
     private static final Exception loadException = new Exception() {
         @SuppressWarnings("unused")
         public void fillInStackTrace(StackTraceElement[] elements) {
         }
 
         private static final long serialVersionUID = -4245839150826112365L;
     };
-    private static final Map<Class<?>, Class<? extends Persister<?>>> persistRedirects = new WeakHashMap<Class<?>, Class<? extends Persister<?>>>();
-    private static final Map<Class<?>, PersisterRegistry<?>> registries = new WeakHashMap<Class<?>, PersisterRegistry<?>>();
+    private static final Map<Class<?>, Class<? extends Persister<?>>> persistRedirects = new WeakHashMap<>();
+    private static final Map<Class<?>, PersisterRegistry<?>> registries = new WeakHashMap<>();
 
     static {
         registerPersistDelegate(Location.class, LocationPersister.class);