diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicSerializerHolder.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicSerializerHolder.java deleted file mode 100644 index d8bbd36..0000000 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicSerializerHolder.java +++ /dev/null @@ -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); - } -} diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicTypeAdapter.java similarity index 73% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicTypeAdapter.java index 671fc6f..1bfcb73 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicSerializer.java +++ b/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 { - 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 { + 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 diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicTypeAdapterHolder.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/DynamicTypeAdapterHolder.java new file mode 100644 index 0000000..03e9c39 --- /dev/null +++ b/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); + } +} diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DBoolSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DBoolTypeAdapter.java similarity index 94% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DBoolSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DBoolTypeAdapter.java index 7939145..1a27479 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DBoolSerializer.java +++ b/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 { +public class DBoolTypeAdapter extends TypeAdapter { @Override public > void serialize(DBool value, Writer writer) throws TEx, MalformedDataException { writer.value(value.getValue()); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DCallableSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DCallableTypeAdapter.java similarity index 94% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DCallableSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DCallableTypeAdapter.java index c164e9e..bb81531 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DCallableSerializer.java +++ b/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 { +public class DCallableTypeAdapter extends TypeAdapter { @Override public > 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"); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DListSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DListTypeAdapter.java similarity index 82% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DListSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DListTypeAdapter.java index d252d24..88c8aba 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DListSerializer.java +++ b/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 { +public class DListTypeAdapter extends TypeAdapter { @Override public > 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 { List 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); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNullSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNullTypeAdapter.java similarity index 93% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNullSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNullTypeAdapter.java index 9be1c4e..2ba3a08 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNullSerializer.java +++ b/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 { +public class DNullTypeAdapter extends TypeAdapter { @Override public > void serialize(DNull value, Writer writer) throws TEx, MalformedDataException { writer.nullValue(); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNumberSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNumberTypeAdapter.java similarity index 94% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNumberSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNumberTypeAdapter.java index 44d05ee..66f8ebf 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DNumberSerializer.java +++ b/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 { +public class DNumberTypeAdapter extends TypeAdapter { @Override public > void serialize(DNumber value, Writer writer) throws TEx, MalformedDataException { double d = value.getValue(); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DObjectSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DObjectTypeAdapter.java similarity index 81% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DObjectSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DObjectTypeAdapter.java index b0d9679..407e0aa 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DObjectSerializer.java +++ b/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 { +public class DObjectTypeAdapter extends TypeAdapter { @Override public > void serialize(DObject value, Writer writer) throws TEx, MalformedDataException { writer.beginObject(); for (Map.Entry 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 { Map 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); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DStringSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DStringTypeAdapter.java similarity index 82% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DStringSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DStringTypeAdapter.java index b888460..2c7fe41 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DStringSerializer.java +++ b/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 { +public class DStringTypeAdapter extends TypeAdapter { @Override public > void serialize(DString value, Writer writer) throws TEx, MalformedDataException { writer.value(value.getValue()); @@ -20,6 +20,6 @@ public class DStringSerializer extends TypeAdapter { @Override public > 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(); } } diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DynamicBaseSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DynamicBaseTypeAdapter.java similarity index 93% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DynamicBaseSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DynamicBaseTypeAdapter.java index 95b7df4..95847a9 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/DynamicBaseSerializer.java +++ b/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 { +public class DynamicBaseTypeAdapter extends TypeAdapter { @Override public > void serialize(DynamicBase value, Writer writer) throws TEx, MalformedDataException { throw new UnsupportedOperationException("Tried to write unsupported custom dynamic: " + value); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DDateSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DDateTypeAdapter.java similarity index 94% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DDateSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DDateTypeAdapter.java index a7fb6f3..ef41958 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DDateSerializer.java +++ b/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 { +public class DDateTypeAdapter extends TypeAdapter { @Override public > void serialize(DDate value, Writer writer) throws TEx, MalformedDataException { writer.value(value.toString()); diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DEnumSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DEnumTypeAdapter.java similarity index 95% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DEnumSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DEnumTypeAdapter.java index 8776a4e..b24f541 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DEnumSerializer.java +++ b/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 { +public class DEnumTypeAdapter extends TypeAdapter { @Override public > void serialize(DEnum value, Writer writer) throws TEx, MalformedDataException { if (value.value() == null) { diff --git a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DTimeSerializer.java b/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DTimeTypeAdapter.java similarity index 94% rename from muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DTimeSerializer.java rename to muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DTimeTypeAdapter.java index 805ec0f..2de47cc 100644 --- a/muscript-json/src/main/java/io/gitlab/jfronny/muscript/json/impl/typed/additional/DTimeSerializer.java +++ b/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 { +public class DTimeTypeAdapter extends TypeAdapter { @Override public > void serialize(DTime value, Writer writer) throws TEx, MalformedDataException { writer.value(value.toString()); diff --git a/muscript-json/src/main/resources/META-INF/services/io.gitlab.jfronny.commons.serialize.databind.TypeAdapter b/muscript-json/src/main/resources/META-INF/services/io.gitlab.jfronny.commons.serialize.databind.TypeAdapter index e7fbd59..9c305dc 100644 --- a/muscript-json/src/main/resources/META-INF/services/io.gitlab.jfronny.commons.serialize.databind.TypeAdapter +++ b/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 \ No newline at end of file +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 \ No newline at end of file