Merge pull request #1 from plokhotnyuk/master

taowen · web-flow · commit 65d473e0103b · 2017-09-13T09:10:45.000-05:00
update versions of dependencies
diff --git a/pom.xml b/pom.xml
@@ -49,32 +49,32 @@
         <dependency>
             <groupId>com.jsoniter</groupId>
             <artifactId>jsoniter</artifactId>
-            <version>0.9.8-SNAPSHOT</version>
+            <version>0.9.16-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>1.17.3</version>
+            <version>1.19</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.17.3</version>
+            <version>1.19</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.10</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-afterburner</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.10</version>
         </dependency>
         <dependency>
             <groupId>com.dslplatform</groupId>
             <artifactId>dsl-json</artifactId>
-            <version>1.3.2</version>
+            <version>1.4.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.thrift</groupId>
@@ -89,22 +89,22 @@
         <!--<dependency>-->
             <!--<groupId>com.dslplatform</groupId>-->
             <!--<artifactId>dsl-json-processor</artifactId>-->
-            <!--<version>1.4.1</version>-->
+            <!--<version>1.4.3</version>-->
         <!--</dependency>-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.22</version>
+            <version>1.2.38</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.moshi</groupId>
             <artifactId>moshi</artifactId>
-            <version>1.3.1</version>
+            <version>1.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.2.0rc2</version>
+            <version>3.4.0</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/jsoniter/benchmark/skip_multi_levels/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/skip_multi_levels/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.skip_multi_levels;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/skip_same_level/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/skip_same_level/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.skip_same_level;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_10_double_fields/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_10_double_fields/DeserJsoniter.java
@@ -1,11 +1,11 @@
 package com.jsoniter.benchmark.with_10_double_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.extra.Base64FloatSupport;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_10_double_fields/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_10_double_fields/SerJsoniter.java
@@ -1,11 +1,11 @@
 package com.jsoniter.benchmark.with_10_double_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.extra.Base64FloatSupport;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_10_int_fields/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_10_int_fields/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_10_int_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_10_int_fields/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_10_int_fields/SerJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_10_int_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_10_string_fields/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_10_string_fields/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_10_string_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_10_string_fields/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_10_string_fields/SerJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_10_string_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
@@ -31,7 +31,7 @@ public class SerJsoniter {
 
     @Setup(Level.Trial)
     public void benchSetup(BenchmarkParams params) {
-        JsonIterator.enableAnnotationSupport();
+        //JsonIterator.enableAnnotationSupport();
         JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
         JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_WITH_HASH);
         testObject = TestObject.createTestObject();
diff --git a/src/main/java/com/jsoniter/benchmark/with_15_string_fields/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_15_string_fields/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_15_string_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_1_string_field/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_1_string_field/DeserJsoniter.java
@@ -1,20 +1,18 @@
 package com.jsoniter.benchmark.with_1_string_field;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
-import javassist.NotFoundException;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.BenchmarkParams;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/jsoniter/benchmark/with_1_string_field/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_1_string_field/SerJsoniter.java
@@ -1,12 +1,10 @@
 package com.jsoniter.benchmark.with_1_string_field;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
-import com.jsoniter.spi.TypeLiteral;
-import javassist.NotFoundException;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_5_string_fields/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_5_string_fields/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_5_string_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_5_string_fields/DeserPb.java b/src/main/java/com/jsoniter/benchmark/with_5_string_fields/DeserPb.java
@@ -1,12 +1,7 @@
 package com.jsoniter.benchmark.with_5_string_fields;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.jsoniter.DecodingMode;
-import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
-import com.jsoniter.output.EncodingMode;
-import com.jsoniter.output.JsonStream;
-import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_5_string_fields/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_5_string_fields/SerJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_5_string_fields;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_double/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_double/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_double;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_double_array/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_double_array/DeserJsoniter.java
@@ -1,11 +1,11 @@
 package com.jsoniter.benchmark.with_double_array;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.extra.Base64FloatSupport;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_double_array/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_double_array/SerJsoniter.java
@@ -1,11 +1,11 @@
 package com.jsoniter.benchmark.with_double_array;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.extra.Base64FloatSupport;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_int/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_int/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_int;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_int_list/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_int_list/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_int_list;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_int_list/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_int_list/SerJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_int_list;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_long_string/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_long_string/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_long_string;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_long_string/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_long_string/SerJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_long_string;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
diff --git a/src/main/java/com/jsoniter/benchmark/with_object_list/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_object_list/DeserJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_object_list;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.TypeLiteral;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
diff --git a/src/main/java/com/jsoniter/benchmark/with_object_list/SerJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_object_list/SerJsoniter.java
@@ -1,10 +1,10 @@
 package com.jsoniter.benchmark.with_object_list;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.benchmark.All;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
@@ -31,7 +31,7 @@ public class SerJsoniter {
 
     @Setup(Level.Trial)
     public void benchSetup(BenchmarkParams params) {
-        JsonIterator.enableAnnotationSupport();
+        //JsonIterator.enableAnnotationSupport();
         JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
         JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_WITH_HASH);
         testObject = TestObject.createTestObject();
diff --git a/src/main/java/com/jsoniter/benchmark/with_string_array/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_string_array/DeserJsoniter.java
diff --git a/src/main/java/com/jsoniter/benchmark/with_string_list/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_string_list/DeserJsoniter.java
diff --git a/src/main/java/com/jsoniter/benchmark/with_string_map_string/DeserJsoniter.java b/src/main/java/com/jsoniter/benchmark/with_string_map_string/DeserJsoniter.java
