Skip to content

Commit 65d473e

Browse files
taowentaowen
authored
Merge pull request #1 from plokhotnyuk/master
update versions of dependencies
2 parents 4be792e + 4757414 commit 65d473e

File tree

28 files changed

+38
-47
lines changed

28 files changed

+38
-47
lines changed

Diff for: ‎pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -49,32 +49,32 @@
4949
<dependency>
5050
<groupId>com.jsoniter</groupId>
5151
<artifactId>jsoniter</artifactId>
52-
<version>0.9.8-SNAPSHOT</version>
52+
<version>0.9.16-SNAPSHOT</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.openjdk.jmh</groupId>
5656
<artifactId>jmh-core</artifactId>
57-
<version>1.17.3</version>
57+
<version>1.19</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.openjdk.jmh</groupId>
6161
<artifactId>jmh-generator-annprocess</artifactId>
62-
<version>1.17.3</version>
62+
<version>1.19</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>com.fasterxml.jackson.core</groupId>
6666
<artifactId>jackson-databind</artifactId>
67-
<version>2.8.5</version>
67+
<version>2.8.10</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>com.fasterxml.jackson.module</groupId>
7171
<artifactId>jackson-module-afterburner</artifactId>
72-
<version>2.8.5</version>
72+
<version>2.8.10</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.dslplatform</groupId>
7676
<artifactId>dsl-json</artifactId>
77-
<version>1.3.2</version>
77+
<version>1.4.3</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.apache.thrift</groupId>
@@ -89,22 +89,22 @@
8989
<!--<dependency>-->
9090
<!--<groupId>com.dslplatform</groupId>-->
9191
<!--<artifactId>dsl-json-processor</artifactId>-->
92-
<!--<version>1.4.1</version>-->
92+
<!--<version>1.4.3</version>-->
9393
<!--</dependency>-->
9494
<dependency>
9595
<groupId>com.alibaba</groupId>
9696
<artifactId>fastjson</artifactId>
97-
<version>1.2.22</version>
97+
<version>1.2.38</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>com.squareup.moshi</groupId>
101101
<artifactId>moshi</artifactId>
102-
<version>1.3.1</version>
102+
<version>1.5.0</version>
103103
</dependency>
104104
<dependency>
105105
<groupId>com.google.protobuf</groupId>
106106
<artifactId>protobuf-java</artifactId>
107-
<version>3.2.0rc2</version>
107+
<version>3.4.0</version>
108108
</dependency>
109109
</dependencies>
110110

Diff for: ‎src/main/java/com/jsoniter/benchmark/skip_multi_levels/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.skip_multi_levels;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/skip_same_level/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.skip_same_level;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_10_double_fields/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.jsoniter.benchmark.with_10_double_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.extra.Base64FloatSupport;
76
import com.jsoniter.output.EncodingMode;
87
import com.jsoniter.output.JsonStream;
8+
import com.jsoniter.spi.DecodingMode;
99
import com.jsoniter.spi.TypeLiteral;
1010
import org.junit.Test;
1111
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_10_double_fields/SerJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.jsoniter.benchmark.with_10_double_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.extra.Base64FloatSupport;
76
import com.jsoniter.output.EncodingMode;
87
import com.jsoniter.output.JsonStream;
8+
import com.jsoniter.spi.DecodingMode;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;
1111
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_10_int_fields/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_10_int_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_10_int_fields/SerJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_10_int_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import org.junit.Test;
99
import org.openjdk.jmh.Main;
1010
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_10_string_fields/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_10_string_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_10_string_fields/SerJsoniter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_10_string_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import org.junit.Test;
99
import org.openjdk.jmh.Main;
1010
import org.openjdk.jmh.annotations.*;
@@ -31,7 +31,7 @@ public class SerJsoniter {
3131

3232
@Setup(Level.Trial)
3333
public void benchSetup(BenchmarkParams params) {
34-
JsonIterator.enableAnnotationSupport();
34+
//JsonIterator.enableAnnotationSupport();
3535
JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
3636
JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_WITH_HASH);
3737
testObject = TestObject.createTestObject();

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_15_string_fields/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_15_string_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_1_string_field/DeserJsoniter.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package com.jsoniter.benchmark.with_1_string_field;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
9-
import javassist.NotFoundException;
109
import org.junit.Test;
1110
import org.openjdk.jmh.Main;
1211
import org.openjdk.jmh.annotations.*;
1312
import org.openjdk.jmh.infra.BenchmarkParams;
1413
import org.openjdk.jmh.infra.Blackhole;
1514
import org.openjdk.jmh.runner.RunnerException;
1615

17-
import java.io.ByteArrayOutputStream;
1816
import java.io.IOException;
1917
import java.util.concurrent.TimeUnit;
2018

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_1_string_field/SerJsoniter.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.jsoniter.benchmark.with_1_string_field;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
8-
import com.jsoniter.spi.TypeLiteral;
9-
import javassist.NotFoundException;
7+
import com.jsoniter.spi.DecodingMode;
108
import org.junit.Test;
119
import org.openjdk.jmh.Main;
1210
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_5_string_fields/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_5_string_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_5_string_fields/DeserPb.java

-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package com.jsoniter.benchmark.with_5_string_fields;
22

33
import com.google.protobuf.InvalidProtocolBufferException;
4-
import com.jsoniter.DecodingMode;
5-
import com.jsoniter.JsonIterator;
64
import com.jsoniter.benchmark.All;
7-
import com.jsoniter.output.EncodingMode;
8-
import com.jsoniter.output.JsonStream;
9-
import com.jsoniter.spi.TypeLiteral;
105
import org.junit.Test;
116
import org.openjdk.jmh.Main;
127
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_5_string_fields/SerJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_5_string_fields;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import org.junit.Test;
99
import org.openjdk.jmh.Main;
1010
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_double/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_double;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_double_array/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.jsoniter.benchmark.with_double_array;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.extra.Base64FloatSupport;
76
import com.jsoniter.output.EncodingMode;
87
import com.jsoniter.output.JsonStream;
8+
import com.jsoniter.spi.DecodingMode;
99
import com.jsoniter.spi.TypeLiteral;
1010
import org.junit.Test;
1111
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_double_array/SerJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.jsoniter.benchmark.with_double_array;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.extra.Base64FloatSupport;
76
import com.jsoniter.output.EncodingMode;
87
import com.jsoniter.output.JsonStream;
8+
import com.jsoniter.spi.DecodingMode;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;
1111
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_int/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_int;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_int_list/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_int_list;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_int_list/SerJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_int_list;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import org.junit.Test;
99
import org.openjdk.jmh.Main;
1010
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_long_string/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_long_string;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_long_string/SerJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_long_string;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import org.junit.Test;
99
import org.openjdk.jmh.Main;
1010
import org.openjdk.jmh.annotations.*;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_object_list/DeserJsoniter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_object_list;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import com.jsoniter.spi.TypeLiteral;
99
import org.junit.Test;
1010
import org.openjdk.jmh.Main;

Diff for: ‎src/main/java/com/jsoniter/benchmark/with_object_list/SerJsoniter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jsoniter.benchmark.with_object_list;
22

3-
import com.jsoniter.DecodingMode;
43
import com.jsoniter.JsonIterator;
54
import com.jsoniter.benchmark.All;
65
import com.jsoniter.output.EncodingMode;
76
import com.jsoniter.output.JsonStream;
7+
import com.jsoniter.spi.DecodingMode;
88
import org.junit.Test;
99
import org.openjdk.jmh.Main;
1010
import org.openjdk.jmh.annotations.*;
@@ -31,7 +31,7 @@ public class SerJsoniter {
3131

3232
@Setup(Level.Trial)
3333
public void benchSetup(BenchmarkParams params) {
34-
JsonIterator.enableAnnotationSupport();
34+
//JsonIterator.enableAnnotationSupport();
3535
JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
3636
JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_WITH_HASH);
3737
testObject = TestObject.createTestObject();

0 commit comments

Comments
 (0)