jsoniter in dynamic mode is back; fixed json iter for clients model

Author: fabienrenaud

build.gradle

@@ -78,7 +78,7 @@ dependencies {
     compile group: 'org.apache.tapestry', name: 'tapestry-json', version: '5.4.3'
     // jsoniter
     compile group: 'com.jsoniter', name: 'jsoniter', version: '0.9.22'
-    //compile group: 'org.javassist', name: 'javassist', version: '3.21.0-GA'
+    compile group: 'org.javassist', name: 'javassist', version: '3.22.0-GA'
     // minimal-json
     compile group: 'com.eclipsesource.minimal-json', name: 'minimal-json', version: '0.9.5'
 

src/main/java/com/github/fabienrenaud/jjb/data/JsonSource.java

@@ -5,17 +5,11 @@
 import com.github.fabienrenaud.jjb.provider.JsonProvider;
 import com.github.fabienrenaud.jjb.stream.StreamDeserializer;
 import com.github.fabienrenaud.jjb.stream.StreamSerializer;
-import com.jsoniter.JsonIterator;
-import com.jsoniter.extra.PreciseFloatSupport;
-import com.jsoniter.output.EncodingMode;
-import com.jsoniter.output.JsonStream;
-import com.jsoniter.spi.DecodingMode;
 import okio.BufferedSource;
 import okio.ForwardingSource;
 import okio.Okio;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -26,13 +20,7 @@
 public abstract class JsonSource<T> {
 
     static {
-        //TODO: disabled since it causes test compilation to fail for all libs
-        //JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_STRICTLY);
-        //JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
-        JsonIterator.setMode(DecodingMode.REFLECTION_MODE);
-        JsonStream.setMode(EncodingMode.REFLECTION_MODE);
-//        JsoniterAnnotationSupport.enable();
-        PreciseFloatSupport.enable();
+        JsonSourceInits.jsoniter();
     }
 
     private final JsonProvider<T> provider;
@@ -58,17 +46,13 @@ public abstract class JsonSource<T> {
         this.streamDeserializer = streamDeserializer;
         populateFields(quantity, individualSize);
 
-        this.jsonAsByteArrayInputStream = new ThreadLocal<ByteArrayInputStream[]>() {
-
-            @Override
-            protected ByteArrayInputStream[] initialValue() {
-                ByteArrayInputStream[] arr = new ByteArrayInputStream[quantity];
-                for (int i = 0; i < arr.length; i++) {
-                    arr[i] = new ByteArrayInputStream(jsonAsBytes[i]);
-                }
-                return arr;
+        this.jsonAsByteArrayInputStream = ThreadLocal.withInitial(() -> {
+            ByteArrayInputStream[] arr = new ByteArrayInputStream[quantity];
+            for (int i = 0; i < arr.length; i++) {
+                arr[i] = new ByteArrayInputStream(jsonAsBytes[i]);
             }
-        };
+            return arr;
+        });
     }
 
     private final void populateFields(final int quantity, final int individualSize) {
@@ -114,7 +98,7 @@ public Reader nextReader() {
     public BufferedSource nextOkioBufferedSource() {
         return Okio.buffer(new ForwardingSource(Okio.source(nextInputStream())) {
             @Override
-            public void close() throws IOException {
+            public void close() {
             }
         });
     }

src/main/java/com/github/fabienrenaud/jjb/data/JsonSourceInits.java

@@ -0,0 +1,30 @@
+package com.github.fabienrenaud.jjb.data;
+
+import com.jsoniter.JsonIterator;
+import com.jsoniter.extra.PreciseFloatSupport;
+import com.jsoniter.output.EncodingMode;
+import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
+import com.jsoniter.spi.JsoniterSpi;
+
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+public final class JsonSourceInits {
+
+    private JsonSourceInits() {
+    }
+
+    public static void jsoniter() {
+        JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_STRICTLY);
+        JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
+        JsoniterSpi.registerTypeEncoder(UUID.class, (obj, stream) -> stream.writeVal(obj.toString()));
+        JsoniterSpi.registerTypeDecoder(UUID.class, iter -> UUID.fromString(iter.readString()));
+        JsoniterSpi.registerTypeEncoder(LocalDate.class, (obj, stream) -> stream.writeVal(obj.toString()));
+        JsoniterSpi.registerTypeDecoder(LocalDate.class, iter -> LocalDate.parse(iter.readString()));
+        JsoniterSpi.registerTypeEncoder(OffsetDateTime.class, (obj, stream) -> stream.writeVal(obj.toString()));
+        JsoniterSpi.registerTypeDecoder(OffsetDateTime.class, iter -> OffsetDateTime.parse(iter.readString()));
+        PreciseFloatSupport.enable();
+    }
+}

src/main/java/com/github/fabienrenaud/jjb/support/BenchSupport.java

@@ -56,7 +56,7 @@ public enum BenchSupport {
             new Libapi(Library.JODD, Api.DATABIND),
             new Libapi(Library.MOSHI, Api.DATABIND),
             new Libapi(Library.TAPESTRY),
-            new Libapi(false, Library.JSONITER, Api.DATABIND),
+            new Libapi(Library.JSONITER, Api.DATABIND),
             new Libapi(Library.MINIMALJSON)
     );
 

src/test/java/com/github/fabienrenaud/jjb/databind/ClientsDeserializationTest.java

@@ -41,9 +41,4 @@ public void jsonsmart() throws Exception {
     public void johnzon() throws Exception {
         // FIXME: does not work
     }
-
-    @Override
-    public void jsoniter() throws Exception {
-        // FIXME: does not work
-    }
 }

src/test/java/com/github/fabienrenaud/jjb/databind/ClientsSerializationTest.java

@@ -37,11 +37,6 @@ public void johnzon() throws Exception {
         // FIXME: does not work
     }
 
-    @Override
-    public void jsoniter() throws Exception {
-        // FIXME: does not work
-    }
-
     @Override
     public void jsonsmart() throws Exception {
         // FIXME: tried to access field java.time.LocalDate.month