fix(muscript-gson): use correct naming for type adapters

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicSerializerHolder.java

@@ -1,15 +0,0 @@
-package io.gitlab.jfronny.muscript.json.impl;
-
-import java.util.Objects;
-
-public class DynamicSerializerHolder {
-    private static DynamicSerializer INSTANCE;
-
-    public static void setInstance(DynamicSerializer instance) {
-        INSTANCE = instance;
-    }
-
-    public static DynamicSerializer getInstance() {
-        return Objects.requireNonNull(INSTANCE);
-    }
-}

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicTypeAdapter.java

@@ -13,21 +13,21 @@ import io.gitlab.jfronny.muscript.json.impl.typed.*;
 import io.gitlab.jfronny.muscript.json.impl.typed.additional.*;
 
 @SerializerFor(targets = Dynamic.class)
-public class DynamicSerializer extends TypeAdapter<Dynamic> {
-    public final DObjectSerializer dObject = new DObjectSerializer();
-    public final DListSerializer dList = new DListSerializer();
-    public final DNullSerializer dNull = new DNullSerializer();
-    public final DBoolSerializer dBool = new DBoolSerializer();
-    public final DNumberSerializer dNumber = new DNumberSerializer();
-    public final DStringSerializer dString = new DStringSerializer();
-    public final DCallableSerializer dCallable = new DCallableSerializer();
-    public final DynamicBaseSerializer dynamicBase = new DynamicBaseSerializer();
-    public final DDateSerializer dDate = new DDateSerializer();
-    public final DTimeSerializer dTime = new DTimeSerializer();
-    public final DEnumSerializer dEnum = new DEnumSerializer();
+public class DynamicTypeAdapter extends TypeAdapter<Dynamic> {
+    public final DObjectTypeAdapter dObject = new DObjectTypeAdapter();
+    public final DListTypeAdapter dList = new DListTypeAdapter();
+    public final DNullTypeAdapter dNull = new DNullTypeAdapter();
+    public final DBoolTypeAdapter dBool = new DBoolTypeAdapter();
+    public final DNumberTypeAdapter dNumber = new DNumberTypeAdapter();
+    public final DStringTypeAdapter dString = new DStringTypeAdapter();
+    public final DCallableTypeAdapter dCallable = new DCallableTypeAdapter();
+    public final DynamicBaseTypeAdapter dynamicBase = new DynamicBaseTypeAdapter();
+    public final DDateTypeAdapter dDate = new DDateTypeAdapter();
+    public final DTimeTypeAdapter dTime = new DTimeTypeAdapter();
+    public final DEnumTypeAdapter dEnum = new DEnumTypeAdapter();
 
-    public DynamicSerializer() {
-        DynamicSerializerHolder.setInstance(this);
+    public DynamicTypeAdapter() {
+        DynamicTypeAdapterHolder.setInstance(this);
     }
 
     @Override

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicTypeAdapterHolder.java

@@ -0,0 +1,15 @@
+package io.gitlab.jfronny.muscript.json.impl;
+
+import java.util.Objects;
+
+public class DynamicTypeAdapterHolder {
+    private static DynamicTypeAdapter INSTANCE;
+
+    public static void setInstance(DynamicTypeAdapter instance) {
+        INSTANCE = instance;
+    }
+
+    public static DynamicTypeAdapter getInstance() {
+        return Objects.requireNonNull(INSTANCE);
+    }
+}

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DBoolTypeAdapter.java

@@ -9,7 +9,7 @@ import io.gitlab.jfronny.muscript.data.additional.DFinal;
 import io.gitlab.jfronny.muscript.data.dynamic.DBool;
 
 @SerializerFor(targets = DBool.class, hierarchical = true)
-public class DBoolSerializer extends TypeAdapter<DBool> {
+public class DBoolTypeAdapter extends TypeAdapter<DBool> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DBool value, Writer writer) throws TEx, MalformedDataException {
         writer.value(value.getValue());

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DCallableTypeAdapter.java

@@ -8,7 +8,7 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.muscript.data.dynamic.DCallable;
 
 @SerializerFor(targets = DCallable.class, hierarchical = true)
-public class DCallableSerializer extends TypeAdapter<DCallable> {
+public class DCallableTypeAdapter extends TypeAdapter<DCallable> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DCallable value, Writer writer) throws TEx, MalformedDataException {
         if (value.getName().equals(DCallable.DEFAULT_NAME)) throw new IllegalArgumentException("Unnamed callables cannot be serialized to json");

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DListTypeAdapter.java

@@ -9,18 +9,18 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.muscript.data.additional.DFinal;
 import io.gitlab.jfronny.muscript.data.dynamic.DList;
 import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
-import io.gitlab.jfronny.muscript.json.impl.DynamicSerializerHolder;
+import io.gitlab.jfronny.muscript.json.impl.DynamicTypeAdapterHolder;
 
 import java.util.LinkedList;
 import java.util.List;
 
 @SerializerFor(targets = DList.class, hierarchical = true)
-public class DListSerializer extends TypeAdapter<DList> {
+public class DListTypeAdapter extends TypeAdapter<DList> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DList value, Writer writer) throws TEx, MalformedDataException {
         writer.beginArray();
         for (Dynamic v : value.getValue()) {
-            DynamicSerializerHolder.getInstance().serialize(v, writer);
+            DynamicTypeAdapterHolder.getInstance().serialize(v, writer);
         }
         writer.endArray();
     }
@@ -30,7 +30,7 @@ public class DListSerializer extends TypeAdapter<DList> {
         List<Dynamic> elements = new LinkedList<>();
         reader.beginArray();
         while (reader.peek() != Token.END_ARRAY) {
-            elements.add(DynamicSerializerHolder.getInstance().deserialize(reader));
+            elements.add(DynamicTypeAdapterHolder.getInstance().deserialize(reader));
         }
         reader.endArray();
         return DFinal.of(elements);

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNullTypeAdapter.java

@@ -8,7 +8,7 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.muscript.data.dynamic.DNull;
 
 @SerializerFor(targets = DNull.class, hierarchical = true)
-public class DNullSerializer extends TypeAdapter<DNull> {
+public class DNullTypeAdapter extends TypeAdapter<DNull> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DNull value, Writer writer) throws TEx, MalformedDataException {
         writer.nullValue();

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNumberTypeAdapter.java

@@ -9,7 +9,7 @@ import io.gitlab.jfronny.muscript.data.additional.DFinal;
 import io.gitlab.jfronny.muscript.data.dynamic.DNumber;
 
 @SerializerFor(targets = DNumber.class, hierarchical = true)
-public class DNumberSerializer extends TypeAdapter<DNumber> {
+public class DNumberTypeAdapter extends TypeAdapter<DNumber> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DNumber value, Writer writer) throws TEx, MalformedDataException {
         double d = value.getValue();

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DObjectTypeAdapter.java

@@ -9,19 +9,19 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.muscript.data.additional.DFinal;
 import io.gitlab.jfronny.muscript.data.dynamic.DObject;
 import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
-import io.gitlab.jfronny.muscript.json.impl.DynamicSerializerHolder;
+import io.gitlab.jfronny.muscript.json.impl.DynamicTypeAdapterHolder;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 @SerializerFor(targets = DObject.class, hierarchical = true)
-public class DObjectSerializer extends TypeAdapter<DObject> {
+public class DObjectTypeAdapter extends TypeAdapter<DObject> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DObject value, Writer writer) throws TEx, MalformedDataException {
         writer.beginObject();
         for (Map.Entry<String, ? extends Dynamic> entry : value.getValue().entrySet()) {
             writer.name(entry.getKey());
-            DynamicSerializerHolder.getInstance().serialize(entry.getValue(), writer);
+            DynamicTypeAdapterHolder.getInstance().serialize(entry.getValue(), writer);
         }
         writer.endObject();
     }
@@ -31,7 +31,7 @@ public class DObjectSerializer extends TypeAdapter<DObject> {
         Map<String, Dynamic> elements = new LinkedHashMap<>();
         reader.beginObject();
         while (reader.peek() != Token.END_OBJECT) {
-            elements.put(reader.nextName(), DynamicSerializerHolder.getInstance().deserialize(reader));
+            elements.put(reader.nextName(), DynamicTypeAdapterHolder.getInstance().deserialize(reader));
         }
         reader.endObject();
         return DFinal.of(elements);

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DStringTypeAdapter.java

@@ -8,10 +8,10 @@ import io.gitlab.jfronny.commons.serialize.databind.SerializerFor;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.muscript.data.additional.DFinal;
 import io.gitlab.jfronny.muscript.data.dynamic.DString;
-import io.gitlab.jfronny.muscript.json.impl.DynamicSerializerHolder;
+import io.gitlab.jfronny.muscript.json.impl.DynamicTypeAdapterHolder;
 
 @SerializerFor(targets = DString.class, hierarchical = true)
-public class DStringSerializer extends TypeAdapter<DString> {
+public class DStringTypeAdapter extends TypeAdapter<DString> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DString value, Writer writer) throws TEx, MalformedDataException {
         writer.value(value.getValue());
@@ -20,6 +20,6 @@ public class DStringSerializer extends TypeAdapter<DString> {
     @Override
     public <TEx extends Throwable, Reader extends SerializeReader<TEx, Reader>> DString deserialize(Reader reader) throws TEx, MalformedDataException {
         if (reader.peek() == Token.STRING) return DFinal.of(reader.nextString());
-        else return DynamicSerializerHolder.getInstance().deserialize(reader).asString();
+        else return DynamicTypeAdapterHolder.getInstance().deserialize(reader).asString();
     }
 }

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DynamicBaseTypeAdapter.java

@@ -8,7 +8,7 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.muscript.data.dynamic.DynamicBase;
 
 @SerializerFor(targets = DynamicBase.class, hierarchical = true)
-public class DynamicBaseSerializer extends TypeAdapter<DynamicBase> {
+public class DynamicBaseTypeAdapter extends TypeAdapter<DynamicBase> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DynamicBase value, Writer writer) throws TEx, MalformedDataException {
         throw new UnsupportedOperationException("Tried to write unsupported custom dynamic: " + value);

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DDateTypeAdapter.java

@@ -10,7 +10,7 @@ import io.gitlab.jfronny.muscript.data.additional.DDate;
 import java.time.LocalDate;
 
 @SerializerFor(targets = DDate.class, hierarchical = true)
-public class DDateSerializer extends TypeAdapter<DDate> {
+public class DDateTypeAdapter extends TypeAdapter<DDate> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DDate value, Writer writer) throws TEx, MalformedDataException {
         writer.value(value.toString());

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DEnumTypeAdapter.java

@@ -8,7 +8,7 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.muscript.data.additional.DEnum;
 
 @SerializerFor(targets = DEnum.class, hierarchical = true)
-public class DEnumSerializer extends TypeAdapter<DEnum> {
+public class DEnumTypeAdapter extends TypeAdapter<DEnum> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DEnum value, Writer writer) throws TEx, MalformedDataException {
         if (value.value() == null) {

muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DTimeTypeAdapter.java

@@ -10,7 +10,7 @@ import io.gitlab.jfronny.muscript.data.additional.DTime;
 import java.time.LocalTime;
 
 @SerializerFor(targets = DTime.class, hierarchical = true)
-public class DTimeSerializer extends TypeAdapter<DTime> {
+public class DTimeTypeAdapter extends TypeAdapter<DTime> {
     @Override
     public <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(DTime value, Writer writer) throws TEx, MalformedDataException {
         writer.value(value.toString());

muscript-json/src/main/resources/META-INF/services/io.gitlab.jfronny.commons.serialize.databind.TypeAdapter

@@ -1,12 +1,12 @@
-io.gitlab.jfronny.muscript.json.impl.typed.additional.DDateSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.additional.DEnumSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.additional.DTimeSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DBoolSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DCallableSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DListSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DNullSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DNumberSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DObjectSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DStringSerializer
-io.gitlab.jfronny.muscript.json.impl.typed.DynamicBaseSerializer
-io.gitlab.jfronny.muscript.json.impl.DynamicSerializer
+io.gitlab.jfronny.muscript.json.impl.typed.additional.DDateTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.additional.DEnumTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.additional.DTimeTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DBoolTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DCallableTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DListTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DNullTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DNumberTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DObjectTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DStringTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.typed.DynamicBaseTypeAdapter
+io.gitlab.jfronny.muscript.json.impl.DynamicTypeAdapter