feat(serialize): implement data binding

commons-gson/build.gradle.kts

@@ -17,7 +17,7 @@ publishing {
     publications {
         create<MavenPublication>("maven") {
             groupId = "io.gitlab.jfronny"
-            artifactId = "commons-serialize-gson"
+            artifactId = "commons-gson"
 
             from(components["java"])
         }

commons-gson/src/main/java/io/gitlab/jfronny/commons/serialize/gson/api/v2/GsonHolders.java

@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.commons.serialize.gson.api.v2;
 
 import io.gitlab.jfronny.commons.ref.WeakSet;
-import io.gitlab.jfronny.commons.serialize.Serializer;
+import io.gitlab.jfronny.commons.Serializer;
 import io.gitlab.jfronny.commons.serialize.gson.impl.GsonHolderSerializer;
 import org.jetbrains.annotations.ApiStatus;
 

commons-gson/src/main/java/io/gitlab/jfronny/commons/serialize/gson/impl/GsonHolderSerializer.java

@@ -1,6 +1,6 @@
 package io.gitlab.jfronny.commons.serialize.gson.impl;
 
-import io.gitlab.jfronny.commons.serialize.Serializer;
+import io.gitlab.jfronny.commons.Serializer;
 import io.gitlab.jfronny.commons.serialize.gson.api.v2.GsonHolder;
 import io.gitlab.jfronny.gson.*;
 

commons-gson/src/test/java/io/gitlab/jfronny/commons/test/GsonTest.java

@@ -2,7 +2,7 @@ package io.gitlab.jfronny.commons.test;
 
 import io.gitlab.jfronny.commons.ComparableVersion;
 import io.gitlab.jfronny.commons.data.String2ObjectMap;
-import io.gitlab.jfronny.commons.serialize.Serializer;
+import io.gitlab.jfronny.commons.Serializer;
 import io.gitlab.jfronny.commons.serialize.annotations.Ignore;
 import io.gitlab.jfronny.commons.serialize.gson.api.v2.GsonHolders;
 import io.gitlab.jfronny.gson.reflect.TypeToken;

commons-http-client/build.gradle.kts

@@ -6,7 +6,6 @@ plugins {
 
 dependencies {
     implementation(projects.commons)
-    implementation(projects.commonsSerialize)
 }
 
 publishing {
@@ -22,5 +21,4 @@ publishing {
 
 tasks.javadoc {
     linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", projects.commons)
-    linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-serialize/$version/raw", projects.commonsSerialize)
 }

commons-http-client/src/main/java/io/gitlab/jfronny/commons/http/client/RequestBuilder.java

@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.commons.http.client;
 
 import io.gitlab.jfronny.commons.data.Either;
-import io.gitlab.jfronny.commons.serialize.Serializer;
+import io.gitlab.jfronny.commons.Serializer;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

commons-http-client/src/main/java/io/gitlab/jfronny/commons/http/client/SerializedHandler.java

@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.commons.http.client;
 
 import io.gitlab.jfronny.commons.data.Either;
-import io.gitlab.jfronny.commons.serialize.Serializer;
+import io.gitlab.jfronny.commons.Serializer;
 
 import java.io.IOException;
 import java.io.Reader;

commons-http-client/src/main/java/module-info.java

@@ -1,6 +1,5 @@
 module io.gitlab.jfronny.commons.http.client {
     requires java.net.http;
     requires io.gitlab.jfronny.commons;
-    requires io.gitlab.jfronny.commons.serialize;
     exports io.gitlab.jfronny.commons.http.client;
 }

commons-io/src/main/java/io/gitlab/jfronny/commons/io/JFiles.java

@@ -1,6 +1,6 @@
 package io.gitlab.jfronny.commons.io;
 
-import io.gitlab.jfronny.commons.serialize.Serializer;
+import io.gitlab.jfronny.commons.Serializer;
 import io.gitlab.jfronny.commons.throwable.ThrowingConsumer;
 import org.jetbrains.annotations.Nullable;
 

commons-serialize-databind-sql/src/main/java/io/gitlab/jfronny/commons/serialize/databind/sql/SqlDateTypeAdapter.java

@@ -17,9 +17,9 @@
 package io.gitlab.jfronny.commons.serialize.databind.sql;
 
 import io.gitlab.jfronny.commons.serialize.databind.*;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.text.DateFormat;
 import java.text.ParseException;

commons-serialize-databind-sql/src/main/java/io/gitlab/jfronny/commons/serialize/databind/sql/SqlTimeTypeAdapter.java

@@ -19,10 +19,10 @@ package io.gitlab.jfronny.commons.serialize.databind.sql;
 
 import io.gitlab.jfronny.commons.serialize.databind.SerializerFor;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.Token;
 
 import java.sql.Time;
 import java.text.DateFormat;

commons-serialize-databind-sql/src/main/java/io/gitlab/jfronny/commons/serialize/databind/sql/SqlTimestampTypeAdapter.java

@@ -20,9 +20,9 @@ import io.gitlab.jfronny.commons.serialize.databind.ObjectMapper;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapterFactory;
 import io.gitlab.jfronny.commons.serialize.databind.TypeToken;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.sql.Timestamp;
 import java.util.Date;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/DatabindSerializer.java

@@ -0,0 +1,56 @@
+package io.gitlab.jfronny.commons.serialize.databind;
+
+import io.gitlab.jfronny.commons.Serializer;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.Transport;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.Objects;
+
+public class DatabindSerializer<TEx extends Throwable, Reader extends SerializeReader<TEx, Reader>, Writer extends SerializeWriter<TEx, Writer>> implements Serializer {
+    private final Transport<TEx, Reader, Writer> transport;
+    private final ObjectMapper mapper;
+
+    public DatabindSerializer(Transport<TEx, Reader, Writer> transport, ObjectMapper mapper) {
+        this.transport = Objects.requireNonNull(transport);
+        this.mapper = Objects.requireNonNull(mapper);
+    }
+
+    @Override
+    public String serialize(Object object) throws IOException {
+        try {
+            return transport.write(writer -> mapper.serialize(object, writer));
+        } catch (Throwable e) {
+            throw e instanceof IOException x ? x : new IOException(e);
+        }
+    }
+
+    @Override
+    public <T> T deserialize(java.io.Reader source, Type typeOfT) throws IOException {
+        try (Reader reader = transport.createReader(source)) {
+            return (T) mapper.getAdapter(TypeToken.get(typeOfT)).deserialize(reader);
+        } catch (IOException e) {
+            throw e;
+        } catch (Throwable e) {
+            throw new IOException(e);
+        }
+    }
+
+    @Override
+    public <T> T deserialize(String source, Type typeOfT) throws IOException {
+        try (Reader reader = transport.createReader(source)) {
+            return (T) mapper.getAdapter(TypeToken.get(typeOfT)).deserialize(reader);
+        } catch (IOException e) {
+            throw e;
+        } catch (Throwable e) {
+            throw new IOException(e);
+        }
+    }
+
+    @Override
+    public String getFormatMime() {
+        return transport.getFormatMime();
+    }
+}

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/ObjectMapper.java

@@ -1,9 +1,9 @@
 package io.gitlab.jfronny.commons.serialize.databind;
 
 import io.gitlab.jfronny.commons.serialize.databind.impl.adapter.SerializationDelegatingTypeAdapter;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.lang.reflect.Type;
 import java.util.*;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/TypeAdapter.java

@@ -1,8 +1,8 @@
 package io.gitlab.jfronny.commons.serialize.databind;
 
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 public abstract class TypeAdapter<T> {
     public abstract <TEx extends Throwable, Writer extends SerializeWriter<TEx, Writer>> void serialize(T value, Writer writer) throws TEx, MalformedDataException;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/MapKeyReader.java

@@ -1,9 +1,9 @@
 package io.gitlab.jfronny.commons.serialize.databind.impl;
 
 import io.gitlab.jfronny.commons.data.LazilyParsedNumber;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.Token;
 
 import java.util.Locale;
 

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/MapKeyWriter.java

@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.commons.serialize.databind.impl;
 
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.util.ArrayList;
 import java.util.List;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/adapter/ArrayTypeAdapterFactory.java

@@ -5,10 +5,10 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapterFactory;
 import io.gitlab.jfronny.commons.serialize.databind.TypeToken;
 import io.gitlab.jfronny.commons.serialize.databind.impl.TypeUtils;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.Token;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/adapter/DefaultDateTypeAdapter.java

@@ -4,9 +4,9 @@ import io.gitlab.jfronny.commons.serialize.databind.SerializerFor;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.commons.serialize.databind.impl.ISO8601Utils;
 import io.gitlab.jfronny.commons.serialize.databind.impl.PreJava9DateFormatProvider;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.text.DateFormat;
 import java.text.ParseException;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/adapter/EnumTypeAdapterFactory.java

@@ -5,9 +5,9 @@ import io.gitlab.jfronny.commons.serialize.databind.ObjectMapper;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapterFactory;
 import io.gitlab.jfronny.commons.serialize.databind.TypeToken;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/adapter/MapTypeAdapterFactory.java

@@ -7,10 +7,10 @@ import io.gitlab.jfronny.commons.serialize.databind.TypeToken;
 import io.gitlab.jfronny.commons.serialize.databind.impl.MapKeyReader;
 import io.gitlab.jfronny.commons.serialize.databind.impl.MapKeyWriter;
 import io.gitlab.jfronny.commons.serialize.databind.impl.TypeUtils;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.Token;
 import io.gitlab.jfronny.commons.tuple.Tuple;
 
 import java.lang.reflect.Type;

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/adapter/TypeAdapterRuntimeTypeWrapper.java

@@ -2,8 +2,8 @@ package io.gitlab.jfronny.commons.serialize.databind.impl.adapter;
 
 import io.gitlab.jfronny.commons.serialize.databind.ObjectMapper;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.lang.reflect.Type;
 

commons-serialize-databind/src/main/java/io/gitlab/jfronny/commons/serialize/databind/impl/adapter/TypeAdapters.java

@@ -4,12 +4,12 @@ import io.gitlab.jfronny.commons.data.LazilyParsedNumber;
 import io.gitlab.jfronny.commons.data.NumberLimits;
 import io.gitlab.jfronny.commons.serialize.databind.SerializerFor;
 import io.gitlab.jfronny.commons.serialize.databind.TypeAdapter;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
-import io.gitlab.jfronny.commons.serialize.stream.emulated.DataElement;
-import io.gitlab.jfronny.commons.serialize.stream.emulated.DataElementSerializer;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.Token;
+import io.gitlab.jfronny.commons.serialize.emulated.DataElement;
+import io.gitlab.jfronny.commons.serialize.emulated.DataElementSerializer;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

commons-serialize-gson-dsl/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.commonsSerializeGson)
+    implementation(projects.commonsGson)
 
     testImplementation(kotlin("test"))
 }
@@ -30,6 +30,6 @@ tasks.javadoc {
     enabled = false
     linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", projects.commons)
     linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-serialize/$version/raw", projects.commonsSerialize)
-    linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-serialize-gson/$version/raw", projects.commonsSerializeGson)
+    linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-gson/$version/raw", projects.commonsGson)
     //TODO link gson javadoc (harder to generate than expected)
 }

commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonReader.java

@@ -3,9 +3,9 @@ package io.gitlab.jfronny.commons.serialize.json;
 import io.gitlab.jfronny.commons.data.LazilyParsedNumber;
 import io.gitlab.jfronny.commons.serialize.StringEscapeUtil;
 import io.gitlab.jfronny.commons.serialize.json.impl.JsonScope;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.Token;
 
 import java.io.Closeable;
 import java.io.EOFException;

commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonTransport.java

@@ -0,0 +1,27 @@
+package io.gitlab.jfronny.commons.serialize.json;
+
+import io.gitlab.jfronny.commons.serialize.Transport;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringWriter;
+
+public class JsonTransport implements Transport<IOException, JsonReader, JsonWriter> {
+    @Override
+    public JsonReader createReader(Reader source) {
+        return new JsonReader(source);
+    }
+
+    @Override
+    public String write(PerformWrite<IOException, JsonWriter> write) throws IOException {
+        try (StringWriter sw = new StringWriter(); JsonWriter writer = new JsonWriter(sw)) {
+            write.write(writer);
+            return sw.toString();
+        }
+    }
+
+    @Override
+    public String getFormatMime() {
+        return "application/json";
+    }
+}

commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java

@@ -1,8 +1,8 @@
 package io.gitlab.jfronny.commons.serialize.json;
 
 import io.gitlab.jfronny.commons.serialize.StringEscapeUtil;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.io.Closeable;
 import java.io.IOException;

commons-serialize-json/src/test/java/io/gitlab/jfronny/commons/serialize/json/test/JsonReaderPathTest.java

@@ -17,10 +17,10 @@
 package io.gitlab.jfronny.commons.serialize.json.test;
 
 import io.gitlab.jfronny.commons.serialize.json.JsonReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
-import io.gitlab.jfronny.commons.serialize.stream.emulated.DataElementSerializer;
-import io.gitlab.jfronny.commons.serialize.stream.emulated.EmulatedReader;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.Token;
+import io.gitlab.jfronny.commons.serialize.emulated.DataElementSerializer;
+import io.gitlab.jfronny.commons.serialize.emulated.EmulatedReader;
 import io.gitlab.jfronny.commons.throwable.Try;
 import org.junit.Test;
 import org.junit.runner.RunWith;

commons-serialize-json/src/test/java/io/gitlab/jfronny/commons/serialize/json/test/JsonReaderTest.java

@@ -17,8 +17,8 @@
 package io.gitlab.jfronny.commons.serialize.json.test;
 
 import io.gitlab.jfronny.commons.serialize.json.JsonReader;
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.Token;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -29,7 +29,7 @@ import java.io.StringReader;
 import java.util.Arrays;
 
 import static com.google.common.truth.Truth.assertThat;
-import static io.gitlab.jfronny.commons.serialize.stream.Token.*;
+import static io.gitlab.jfronny.commons.serialize.Token.*;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/MalformedDataException.java

@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.commons.serialize.stream;
+package io.gitlab.jfronny.commons.serialize;
 
 import java.io.IOException;
 

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/SerializeReader.java

@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.commons.serialize.stream;
+package io.gitlab.jfronny.commons.serialize;
 
 import io.gitlab.jfronny.commons.SamWithReceiver;
 

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/SerializeWriter.java

@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.commons.serialize.stream;
+package io.gitlab.jfronny.commons.serialize;
 
 import io.gitlab.jfronny.commons.SamWithReceiver;
 

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/Token.java

@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.commons.serialize.stream;
+package io.gitlab.jfronny.commons.serialize;
 
 public enum Token {
     BEGIN_ARRAY, END_ARRAY, BEGIN_OBJECT, END_OBJECT, NAME, STRING, NUMBER, BOOLEAN, NULL, END_DOCUMENT

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/Transport.java

@@ -0,0 +1,20 @@
+package io.gitlab.jfronny.commons.serialize;
+
+import java.io.StringReader;
+
+public interface Transport<TEx extends Throwable, Reader extends SerializeReader<TEx, Reader>, Writer extends SerializeWriter<TEx, Writer>> {
+    Reader createReader(java.io.Reader source) throws TEx;
+
+    default Reader createReader(String source) throws TEx {
+        return createReader(new StringReader(source));
+    }
+
+    String write(PerformWrite<TEx, Writer> write) throws TEx;
+
+    String getFormatMime();
+
+    @FunctionalInterface
+    interface PerformWrite<TEx extends Throwable, W extends SerializeWriter<TEx, W>> {
+        void write(W writer) throws TEx, MalformedDataException;
+    }
+}

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/emulated/DataElement.java

@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.commons.serialize.stream.emulated;
+package io.gitlab.jfronny.commons.serialize.emulated;
 
 import io.gitlab.jfronny.commons.data.LinkedTreeMap;
 

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/emulated/DataElementSerializer.java

@@ -1,7 +1,7 @@
-package io.gitlab.jfronny.commons.serialize.stream.emulated;
+package io.gitlab.jfronny.commons.serialize.emulated;
 
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.util.Map;
 

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/emulated/EmulatedReader.java

@@ -1,8 +1,8 @@
-package io.gitlab.jfronny.commons.serialize.stream.emulated;
+package io.gitlab.jfronny.commons.serialize.emulated;
 
-import io.gitlab.jfronny.commons.serialize.stream.MalformedDataException;
-import io.gitlab.jfronny.commons.serialize.stream.SerializeReader;
-import io.gitlab.jfronny.commons.serialize.stream.Token;
+import io.gitlab.jfronny.commons.serialize.MalformedDataException;
+import io.gitlab.jfronny.commons.serialize.SerializeReader;
+import io.gitlab.jfronny.commons.serialize.Token;
 
 import java.util.Arrays;
 import java.util.Iterator;

commons-serialize/src/main/java/io/gitlab/jfronny/commons/serialize/emulated/EmulatedWriter.java

@@ -1,6 +1,6 @@
-package io.gitlab.jfronny.commons.serialize.stream.emulated;
+package io.gitlab.jfronny.commons.serialize.emulated;
 
-import io.gitlab.jfronny.commons.serialize.stream.SerializeWriter;
+import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;

commons-serialize/src/main/java/module-info.java

@@ -2,7 +2,6 @@ module io.gitlab.jfronny.commons.serialize {
     requires static org.jetbrains.annotations;
     requires io.gitlab.jfronny.commons;
     exports io.gitlab.jfronny.commons.serialize;
-    exports io.gitlab.jfronny.commons.serialize.stream;
-    exports io.gitlab.jfronny.commons.serialize.stream.emulated;
+    exports io.gitlab.jfronny.commons.serialize.emulated;
     exports io.gitlab.jfronny.commons.serialize.annotations;
 }

commons/src/main/java/io/gitlab/jfronny/commons/Serializer.java

@@ -1,4 +1,6 @@
-package io.gitlab.jfronny.commons.serialize;
+package io.gitlab.jfronny.commons;
+
+import io.gitlab.jfronny.commons.impl.SerializerHolder;
 
 import java.io.IOException;
 import java.io.Reader;

commons/src/main/java/io/gitlab/jfronny/commons/impl/SerializerHolder.java

@@ -1,5 +1,6 @@
-package io.gitlab.jfronny.commons.serialize;
+package io.gitlab.jfronny.commons.impl;
 
+import io.gitlab.jfronny.commons.Serializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
@@ -7,7 +8,7 @@ import java.util.Objects;
 /**
  * Holds a serializer for use elsewhere
  */
-class SerializerHolder {
+public class SerializerHolder {
     private static Serializer instance;
 
     /**

muscript-gson/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     implementation(projects.muscriptDataAdditional)
-    implementation(projects.commonsSerializeGson)
+    implementation(projects.commonsGson)
 
     testImplementation(libs.junit.jupiter.api)
     testImplementation(projects.muscriptParser)
@@ -28,7 +28,7 @@ publishing {
 tasks.javadoc {
     linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", projects.commons)
     linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-serialize/$version/raw", projects.commonsSerialize)
-    linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-serialize-gson/$version/raw", projects.commonsSerializeGson)
+    linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-gson/$version/raw", projects.commonsGson)
     linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/muscript-data-dynamic/$version/raw", projects.muscriptDataDynamic)
     linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/muscript-data-additional/$version/raw", projects.muscriptDataAdditional)
 }

settings.gradle.kts

@@ -2,7 +2,6 @@ rootProject.name = "JfCommons"
 
 include("commons")
 include("commons-serialize")
-include("commons-serialize-gson")
 include("commons-serialize-gson-dsl")
 include("commons-serialize-json")
 include("commons-serialize-databind")
@@ -12,6 +11,7 @@ include("commons-logger")
 include("commons-http-client")
 include("commons-http-server")
 include("commons-manifold")
+include("commons-gson")
 include("commons-unsafe")
 // new muscript
 include("muscript-core")