Upgrade DSL JSON.

eishay · Jul 3, 2020 · 65c0bf0 · 65c0bf0
1 parent fa60184
commit 65c0bf0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/tpc/lib/dsl-json-1.7.2.jar b/tpc/lib/dsl-json-1.7.2.jar
diff --git a/tpc/lib/dsl-json-1.9.5.jar b/tpc/lib/dsl-json-1.9.5.jar
diff --git a/tpc/lib/dsl-json-java8-1.7.2.jar b/tpc/lib/dsl-json-java8-1.7.2.jar
diff --git a/tpc/src/serializers/dsljson/DSLJson.java b/tpc/src/serializers/dsljson/DSLJson.java
@@ -4,7 +4,8 @@
 import serializers.*;
 
 import com.dslplatform.json.*;
-import com.dslplatform.json.runtime.Settings;
+
+import java.io.ByteArrayOutputStream;
 
 public class DSLJson {
 
@@ -17,37 +18,29 @@ public static void register(final TestGroups groups) {
     }
 
     static class DSLJsonSerializer extends Serializer<MediaContent> {
-        private final JsonWriter writer;
-        private final JsonReader reader;
-        private final JsonWriter.WriteObject<MediaContent> encoder;
-        private final JsonReader.ReadObject<MediaContent> decoder;
-        private final boolean asArray;
+        final boolean asArray;
+        final DslJson<Object> json;
+        final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 
         DSLJsonSerializer(boolean asArray) {
-            DslJson<Object> dslJson = new DslJson<>(Settings.withRuntime().allowArrayFormat(asArray).includeServiceLoader());
-            this.writer = dslJson.newWriter();
-            this.reader = dslJson.newReader();
-            this.encoder = dslJson.tryFindWriter(MediaContent.class);
-            this.decoder = dslJson.tryFindReader(MediaContent.class);
             this.asArray = asArray;
+            this.json = new DslJson<Object>(new DslJson.Settings<>().allowArrayFormat(asArray).includeServiceLoader());
         }
 
         @Override
         public String getName() {
-            return asArray ? "json-array/dsl-json/databind" : "json/dsl-json/databind";
+            return this.asArray ? "json-array/dsl-json/databind" : "json/dsl-json/databind";
         }
 
         @Override
         public MediaContent deserialize(final byte[] array) throws Exception {
-            reader.process(array, array.length).read();
-            return decoder.read(reader);
+            return json.deserialize(MediaContent.class, array, array.length);
         }
 
         @Override
         public byte[] serialize(final MediaContent content) throws Exception {
-            writer.reset();
-            encoder.write(writer, content);
-            return writer.toByteArray();
+            json.serialize(content, buffer);
+            return buffer.toByteArray();
         }
     }
 }