jodd

fabienrenaud · fabienrenaud · commit 288a4e614965 · 2016-11-11T09:20:14.000-08:00
diff --git a/build.gradle b/build.gradle
@@ -58,11 +58,13 @@ dependencies {
     compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
     // nanojson
     compile group: 'com.grack', name: 'nanojson', version: '1.2'
+    // jodd
+    compile group: 'org.jodd', name: 'jodd-json', version: '3.8.0'
 
     // Test
     testCompile group: 'junit', name: 'junit', version: '4.12'
 
-    // IMPORANT: Leave JMH at the end!
+    // IMPORTANT: Leave JMH at the end!
     // JMH
     compile group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.15'
     apt group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.15'
diff --git a/src/main/java/com/github/fabienrenaud/jjb/JsonBench.java b/src/main/java/com/github/fabienrenaud/jjb/JsonBench.java
@@ -74,4 +74,8 @@ public Object nanojson() throws Exception {
         return null;
     }
 
+    public Object jodd() throws Exception {
+        return null;
+    }
+
 }
diff --git a/src/main/java/com/github/fabienrenaud/jjb/databind/Deserialization.java b/src/main/java/com/github/fabienrenaud/jjb/databind/Deserialization.java
@@ -80,4 +80,10 @@ public Object dsljson() throws Exception {
     public Object logansquare() throws Exception {
         return LoganSquare.parse(JSON_SOURCE.nextInputStream(), JSON_SOURCE.pojoType());
     }
+
+    @Benchmark
+    @Override
+    public Object jodd() throws Exception {
+        return JSON_SOURCE.provider().joddDeser().parse(JSON_SOURCE.nextString(), JSON_SOURCE.pojoType());
+    }
 }
diff --git a/src/main/java/com/github/fabienrenaud/jjb/databind/Serialization.java b/src/main/java/com/github/fabienrenaud/jjb/databind/Serialization.java
@@ -100,4 +100,10 @@ public Object logansquare() throws Exception {
         LoganSquare.serialize(JSON_SOURCE.nextPojo(), baos);
         return baos;
     }
+
+    @Benchmark
+    @Override
+    public Object jodd() throws Exception {
+        return JSON_SOURCE.provider().joddSer().serialize(JSON_SOURCE.nextPojo());
+    }
 }
diff --git a/src/main/java/com/github/fabienrenaud/jjb/model/Users.java b/src/main/java/com/github/fabienrenaud/jjb/model/Users.java
@@ -12,9 +12,11 @@
  */
 @JsonObject
 @CompiledJson
+@jodd.json.meta.JSON
 public class Users {
 
     @JsonField
+    @jodd.json.meta.JSON
     public List<User> users;
 
     @Override
@@ -79,9 +81,11 @@ public static final class User {
         public double longitude;
         @JsonField
         @JsonAttribute(nullable = false)
+        @jodd.json.meta.JSON
         public List<String> tags;
         @JsonField
         @JsonAttribute(nullable = false)
+        @jodd.json.meta.JSON
         public List<Friend> friends;
         @JsonField
         public String greeting;
diff --git a/src/main/java/com/github/fabienrenaud/jjb/provider/JsonProvider.java b/src/main/java/com/github/fabienrenaud/jjb/provider/JsonProvider.java
@@ -37,4 +37,8 @@ public interface JsonProvider<T> {
     Map<String, Object> jsonioStreamOptions();
 
     DslJson<T> dsljson();
+
+    jodd.json.JsonParser joddDeser();
+
+    jodd.json.JsonSerializer joddSer();
 }
diff --git a/src/main/java/com/github/fabienrenaud/jjb/provider/UsersJsonProvider.java b/src/main/java/com/github/fabienrenaud/jjb/provider/UsersJsonProvider.java
@@ -102,4 +102,28 @@ public Map<String, Object> jsonioStreamOptions() {
     public DslJson<Users> dsljson() {
         return dsljson;
     }
+
+    @Override
+    public jodd.json.JsonParser joddDeser() {
+        return JODD_DESER.get();
+    }
+
+    @Override
+    public jodd.json.JsonSerializer joddSer() {
+        return JODD_SER.get();
+    }
+
+    private static final ThreadLocal<jodd.json.JsonParser> JODD_DESER = new ThreadLocal<jodd.json.JsonParser>() {
+        @Override
+        protected jodd.json.JsonParser initialValue() {
+            return new jodd.json.JsonParser();
+        }
+    };
+
+    private static final ThreadLocal<jodd.json.JsonSerializer> JODD_SER = new ThreadLocal<jodd.json.JsonSerializer>() {
+        @Override
+        protected jodd.json.JsonSerializer initialValue() {
+            return new jodd.json.JsonSerializer();
+        }
+    };
 }
diff --git a/src/main/java/com/github/fabienrenaud/jjb/support/BenchSupport.java b/src/main/java/com/github/fabienrenaud/jjb/support/BenchSupport.java
@@ -25,7 +25,8 @@ public enum BenchSupport {
         new Libapi(Library.DSLJSON, Api.DATABIND),
         new Libapi(Library.LOGANSQUARE, Api.DATABIND),
         new Libapi(Library.JSONSIMPLE, Api.STREAM),
-        new Libapi(Library.NANOJSON, Api.STREAM)
+        new Libapi(Library.NANOJSON, Api.STREAM),
+        new Libapi(Library.JODD, Api.DATABIND)
     );
 
     private final List<Libapi> libapis;
diff --git a/src/main/java/com/github/fabienrenaud/jjb/support/Library.java b/src/main/java/com/github/fabienrenaud/jjb/support/Library.java
@@ -22,7 +22,8 @@ public enum Library {
     DSLJSON,
     LOGANSQUARE,
     JSONSIMPLE,
-    NANOJSON;
+    NANOJSON,
+    JODD;
 
     public static Set<Library> fromCsv(String str) {
         if (str == null || str.trim().isEmpty()) {
diff --git a/src/test/java/com/github/fabienrenaud/jjb/JsonBenchmark.java b/src/test/java/com/github/fabienrenaud/jjb/JsonBenchmark.java
@@ -169,4 +169,11 @@ public void nanojson() throws Exception {
             test(Library.NANOJSON, BENCH.nanojson());
         }
     }
+
+    @Test
+    public void jodd() throws Exception {
+        for (int i = 0; i < ITERATIONS; i++) {
+            test(Library.JODD, BENCH.jodd());
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,8 @@ public Object nanojson() throws Exception {`
`74`	`74`	`return null;`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ public Object jodd() throws Exception {`
	`78`	`+ return null;`
	`79`	`+ }`
	`80`	`+`
`77`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,4 +80,10 @@ public Object dsljson() throws Exception {`
`80`	`80`	`public Object logansquare() throws Exception {`
`81`	`81`	`return LoganSquare.parse(JSON_SOURCE.nextInputStream(), JSON_SOURCE.pojoType());`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+ @Benchmark`
	`85`	`+ @Override`
	`86`	`+ public Object jodd() throws Exception {`
	`87`	`+ return JSON_SOURCE.provider().joddDeser().parse(JSON_SOURCE.nextString(), JSON_SOURCE.pojoType());`
	`88`	`+ }`
`83`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,10 @@ public Object logansquare() throws Exception {`
`100`	`100`	`LoganSquare.serialize(JSON_SOURCE.nextPojo(), baos);`
`101`	`101`	`return baos;`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ @Benchmark`
	`105`	`+ @Override`
	`106`	`+ public Object jodd() throws Exception {`
	`107`	`+ return JSON_SOURCE.provider().joddSer().serialize(JSON_SOURCE.nextPojo());`
	`108`	`+ }`
`103`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,8 @@ public interface JsonProvider<T> {`
`37`	`37`	`Map<String, Object> jsonioStreamOptions();`
`38`	`38`
`39`	`39`	`DslJson<T> dsljson();`
	`40`	`+`
	`41`	`+ jodd.json.JsonParser joddDeser();`
	`42`	`+`
	`43`	`+ jodd.json.JsonSerializer joddSer();`
`40`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,4 +169,11 @@ public void nanojson() throws Exception {`
`169`	`169`	`test(Library.NANOJSON, BENCH.nanojson());`
`170`	`170`	`}`
`171`	`171`	`}`
	`172`	`+`
	`173`	`+ @Test`
	`174`	`+ public void jodd() throws Exception {`
	`175`	`+ for (int i = 0; i < ITERATIONS; i++) {`
	`176`	`+ test(Library.JODD, BENCH.jodd());`
	`177`	`+ }`
	`178`	`+ }`
`172`	`179`	`}`