Create JsonSerializer

Author: lowercasebtw

src/main/java/org/visuals/legacy/lightconfig/lib/v1/Config.java

@@ -24,31 +24,40 @@
 
 package org.visuals.legacy.lightconfig.lib.v1;
 
-import com.google.gson.*;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.client.gui.screens.Screen;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.visuals.legacy.lightconfig.lib.v1.field.*;
+import org.visuals.legacy.lightconfig.lib.v1.serializer.ConfigSerializer;
+import org.visuals.legacy.lightconfig.lib.v1.serializer.JsonSerializer;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
 public abstract class Config {
-    protected static final Gson GSON = new GsonBuilder().setPrettyPrinting().setStrictness(Strictness.LENIENT).create();
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
     protected final List<AbstractConfigField<?>> configFields = new ArrayList<>();
     protected final ModContainer modContainer;
     protected final Path path;
-    protected final ConfigSerializer<? extends JsonElement> serializer;
+    protected final ConfigSerializer<?> serializer;
 
-    public Config(ModContainer modContainer, Path path) {
+    public Config(ModContainer modContainer, Path path, ConfigSerializer<?> serializer) {
         this.modContainer = modContainer;
         this.path = path;
-        this.serializer = new ConfigSerializer<>();
+        this.serializer = serializer;
+        if (!(this.serializer instanceof JsonSerializer)) {
+            throw new RuntimeException("Only json serialization is currently supported! Please use JsonSerializer!");
+        }
+    }
+
+    public Config(ModContainer modContainer, Path path) {
+        this(modContainer, path, null);
     }
 
     public BooleanConfigField booleanFieldOf(final String name, final boolean defaultValue) {
@@ -84,7 +93,7 @@ public void load() {
 
         try {
             final String json = Files.readString(this.path);
-            final JsonObject object = GSON.fromJson(json, JsonObject.class);
+            final JsonObject object = ((JsonElement) this.serializer.deserialize(json)).getAsJsonObject();
             if (object == null) {
                 this.logger.warn("Failed to load config! Defaulting to original settings.");
             } else {
@@ -115,7 +124,7 @@ public void save() {
         });
 
         try {
-            Files.write(this.path, GSON.toJson(object).getBytes());
+            Files.write(this.path, ((JsonSerializer) this.serializer).serialize(object));
         } catch (Exception ignored) {
             this.logger.warn("Failed to save config!");
             return;
@@ -130,8 +139,6 @@ public void reset() {
         this.save();
     }
 
-    public abstract Screen getConfigScreen(@Nullable Screen parent);
-
     public Logger getLogger() {
         return logger;
     }
@@ -147,4 +154,6 @@ public ModContainer getModContainer() {
     public Path getPath() {
         return path;
     }
+
+    public abstract Screen getConfigScreen(@Nullable Screen parent);
 }

…lightconfig/lib/v1/ConfigSerializer.java …/lib/v1/serializer/ConfigSerializer.javasrc/main/java/org/visuals/legacy/lightconfig/lib/v1/ConfigSerializer.java renamed to src/main/java/org/visuals/legacy/lightconfig/lib/v1/serializer/ConfigSerializer.java src/main/java/org/visuals/legacy/lightconfig/lib/v1/ConfigSerializer.java renamed to src/main/java/org/visuals/legacy/lightconfig/lib/v1/serializer/ConfigSerializer.java

@@ -22,13 +22,12 @@
  * "MINECRAFT" LINKING EXCEPTION TO THE GPL
  */
 
-package org.visuals.legacy.lightconfig.lib.v1;
+package org.visuals.legacy.lightconfig.lib.v1.serializer;
 
-// TODO
-public class ConfigSerializer<T> {
-    public void read(T value) {
-    }
+import org.jetbrains.annotations.Nullable;
 
-    public void write(T value) {
-    }
+public abstract class ConfigSerializer<T> {
+    public abstract @Nullable T deserialize(Object value);
+
+    public abstract byte[] serialize(T value);
 }

src/main/java/org/visuals/legacy/lightconfig/lib/v1/serializer/JsonSerializer.java

@@ -0,0 +1,28 @@
+package org.visuals.legacy.lightconfig.lib.v1.serializer;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.Strictness;
+
+public class JsonSerializer extends ConfigSerializer<JsonElement> {
+    protected static final Gson GSON = new GsonBuilder().setPrettyPrinting().setStrictness(Strictness.LENIENT).create();
+
+    @Override
+    public JsonElement deserialize(Object value) {
+        if (!(value instanceof String string)) {
+            return null;
+        } else {
+            return GSON.fromJson(string, JsonElement.class);
+        }
+    }
+
+    @Override
+    public byte[] serialize(JsonElement value) {
+        if (value == null) {
+            throw new RuntimeException("Cannot serialize null!");
+        } else {
+            return GSON.toJson(value).getBytes();
+        }
+    }
+}

src/main/java/org/visuals/legacy/lightconfig/lib/v1/type/BooleanType.java

@@ -24,5 +24,5 @@
 
 package org.visuals.legacy.lightconfig.lib.v1.type;
 
-public class BooleanType {
+public class BooleanType extends Type {
 }

src/main/java/org/visuals/legacy/lightconfig/lib/v1/type/DoubleType.java

@@ -24,5 +24,5 @@
 
 package org.visuals.legacy.lightconfig.lib.v1.type;
 
-public class DoubleType {
+public class DoubleType extends Type {
 }

src/main/java/org/visuals/legacy/lightconfig/lib/v1/type/FloatType.java

@@ -24,5 +24,5 @@
 
 package org.visuals.legacy.lightconfig.lib.v1.type;
 
-public class FloatType {
+public class FloatType extends Type {
 }

src/main/java/org/visuals/legacy/lightconfig/lib/v1/type/IntegerType.java

@@ -24,5 +24,5 @@
 
 package org.visuals.legacy.lightconfig.lib.v1.type;
 
-public class IntegerType {
+public class IntegerType extends Type {
 }

src/main/java/org/visuals/legacy/lightconfig/lib/v1/type/LongType.java

@@ -24,5 +24,5 @@
 
 package org.visuals.legacy.lightconfig.lib.v1.type;
 
-public class LongType {
+public class LongType extends Type {
 }

src/main/java/org/visuals/legacy/lightconfig/lib/v1/type/StringType.java

@@ -24,5 +24,5 @@
 
 package org.visuals.legacy.lightconfig.lib.v1.type;
 
-public class StringType {
+public class StringType extends Type {
 }

src/main/java/org/visuals/legacy/lightconfig/lib/v1/type/Type.java

@@ -0,0 +1,4 @@
+package org.visuals.legacy.lightconfig.lib.v1.type;
+
+public class Type {
+}