Skip to content

Commit c948847

Browse files
committed
Upgraded all libs
1 parent 7469e89 commit c948847

File tree

3 files changed

+83
-88
lines changed

3 files changed

+83
-88
lines changed

build.gradle

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'com.github.johnrengelman.shadow' version '1.2.4'
3-
id 'net.ltgt.apt' version '0.9'
3+
id 'net.ltgt.apt' version '0.15'
4+
id "com.github.ben-manes.versions" version '0.17.0'
45
}
56

67
apply plugin: 'java'
@@ -15,20 +16,25 @@ repositories {
1516
mavenCentral()
1617
}
1718

19+
ext {
20+
jacksonVersion = '2.9.5'
21+
dslJsonVersion = '1.7.1'
22+
johnzonVersion = '1.1.7'
23+
jmhVersion = '1.20'
24+
}
25+
1826
dependencies {
1927

2028
// CLI and misc
21-
compile group: 'io.airlift', name: 'airline', version: '0.7'
22-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
29+
compile group: 'io.airlift', name: 'airline', version: '0.8'
30+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
2331

2432
// org.json
2533
compile group: 'org.json', name: 'json', version: '20090211'
2634
// Jackson
27-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.4'
28-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.4'
29-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.4'
30-
compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.4'
31-
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.9.4';
35+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}"
36+
compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: "${jacksonVersion}"
37+
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "${jacksonVersion}"
3238
// GSON
3339
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
3440
// JSONP
@@ -42,22 +48,22 @@ dependencies {
4248
// FlexJson
4349
compile group: 'net.sf.flexjson', name: 'flexjson', version: '3.3'
4450
// FastJson
45-
compile group: 'com.alibaba', name: 'fastjson', version: '1.2.32'
51+
compile group: 'com.alibaba', name: 'fastjson', version: '1.2.47'
4652
// json-io
47-
compile group: 'com.cedarsoftware', name: 'json-io', version: '4.9.12'
53+
compile group: 'com.cedarsoftware', name: 'json-io', version: '4.10.0'
4854
// boon
4955
compile group: 'io.fastjson', name: 'boon', version: '0.34'
5056
// johnzon
51-
compile group: 'org.apache.johnzon', name: 'johnzon-core', version: '1.1.0'
52-
compile group: 'org.apache.johnzon', name: 'johnzon-mapper', version: '1.1.0'
57+
compile group: 'org.apache.johnzon', name: 'johnzon-core', version: "${johnzonVersion}"
58+
compile group: 'org.apache.johnzon', name: 'johnzon-mapper', version: "${johnzonVersion}"
5359
// json-smart
5460
compile group: 'net.minidev', name: 'json-smart', version: '2.3'
5561
// DSL-json
56-
compile group: 'com.dslplatform', name: 'dsl-json-java8', version: '1.7.0'
62+
compile group: 'com.dslplatform', name: 'dsl-json-java8', version: "${dslJsonVersion}"
5763
//by switching apt different compiler will be used
58-
//apt group: 'com.dslplatform', name: 'dsl-json-java8', version: '1.7.0'
64+
//apt group: 'com.dslplatform', name: 'dsl-json-java8', version: "${dslJsonVersion}"
5965
//processor is faster but requires Mono/.NET
60-
apt group: 'com.dslplatform', name: 'dsl-json-processor', version: '1.7.0'
66+
apt group: 'com.dslplatform', name: 'dsl-json-processor', version: "${dslJsonVersion}"
6167
// LoganSquare
6268
compile group: 'com.bluelinelabs', name: 'logansquare', version: '1.3.7'
6369
apt group: 'com.bluelinelabs', name: 'logansquare-compiler', version: '1.3.7'
@@ -66,24 +72,24 @@ dependencies {
6672
// nanojson
6773
compile group: 'com.grack', name: 'nanojson', version: '1.2'
6874
// jodd
69-
compile group: 'org.jodd', name: 'jodd-json', version: '3.8.5'
75+
compile group: 'org.jodd', name: 'jodd-json', version: '4.3.0'
7076
// moshi
7177
compile group: 'com.squareup.moshi', name: 'moshi', version: '1.5.0'
7278
// tapestry
7379
compile group: 'org.apache.tapestry', name: 'tapestry-json', version: '5.4.3'
7480
// jsoniter
75-
compile group: 'com.jsoniter', name: 'jsoniter', version: '0.9.11'
81+
compile group: 'com.jsoniter', name: 'jsoniter', version: '0.9.22'
7682
//compile group: 'org.javassist', name: 'javassist', version: '3.21.0-GA'
7783
// minimal-json
78-
compile group: 'com.eclipsesource.minimal-json', name: 'minimal-json', version: '0.9.4'
84+
compile group: 'com.eclipsesource.minimal-json', name: 'minimal-json', version: '0.9.5'
7985

8086
// Test
8187
testCompile group: 'junit', name: 'junit', version: '4.12'
8288

8389
// IMPORTANT: Leave JMH at the end!
8490
// JMH
85-
compile group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.19'
86-
apt group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.19'
91+
compile group: 'org.openjdk.jmh', name: 'jmh-core', version: "${jmhVersion}"
92+
apt group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: "${jmhVersion}"
8793
}
8894

8995
shadowJar {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.github.fabienrenaud.jjb.data;
22

3+
import com.github.fabienrenaud.jjb.RandomUtils;
34
import com.github.fabienrenaud.jjb.data.gen.DataGenerator;
45
import com.github.fabienrenaud.jjb.provider.JsonProvider;
56
import com.github.fabienrenaud.jjb.stream.StreamDeserializer;
67
import com.github.fabienrenaud.jjb.stream.StreamSerializer;
7-
import com.github.fabienrenaud.jjb.RandomUtils;
8-
import com.jsoniter.DecodingMode;
98
import com.jsoniter.JsonIterator;
10-
import com.jsoniter.annotation.JsoniterAnnotationSupport;
119
import com.jsoniter.extra.PreciseFloatSupport;
1210
import com.jsoniter.output.EncodingMode;
1311
import com.jsoniter.output.JsonStream;
12+
import com.jsoniter.spi.DecodingMode;
1413
import okio.BufferedSource;
1514
import okio.ForwardingSource;
1615
import okio.Okio;
@@ -32,7 +31,7 @@ public abstract class JsonSource<T> {
3231
//JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
3332
JsonIterator.setMode(DecodingMode.REFLECTION_MODE);
3433
JsonStream.setMode(EncodingMode.REFLECTION_MODE);
35-
JsoniterAnnotationSupport.enable();
34+
// JsoniterAnnotationSupport.enable();
3635
PreciseFloatSupport.enable();
3736
}
3837

src/main/java/com/github/fabienrenaud/jjb/provider/ClientsJsonProvider.java

Lines changed: 54 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.cedarsoftware.util.io.JsonReader;
44
import com.cedarsoftware.util.io.JsonWriter;
5-
import com.dslplatform.json.ConfigureJava8;
65
import com.dslplatform.json.DslJson;
76
import com.dslplatform.json.runtime.Settings;
87
import com.fasterxml.jackson.core.JsonFactory;
@@ -11,7 +10,11 @@
1110
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1211
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
1312
import com.github.fabienrenaud.jjb.model.Clients;
14-
import com.google.gson.*;
13+
import com.google.gson.Gson;
14+
import com.google.gson.GsonBuilder;
15+
import com.google.gson.JsonDeserializer;
16+
import com.google.gson.JsonPrimitive;
17+
import com.google.gson.JsonSerializer;
1518
import com.owlike.genson.Context;
1619
import com.owlike.genson.Converter;
1720
import com.owlike.genson.Genson;
@@ -22,6 +25,7 @@
2225
import flexjson.JSONDeserializer;
2326
import flexjson.JSONSerializer;
2427
import flexjson.transformer.AbstractTransformer;
28+
import jodd.bean.JoddBean;
2529
import jodd.json.TypeJsonSerializer;
2630
import jodd.typeconverter.TypeConverter;
2731
import jodd.typeconverter.TypeConverterManager;
@@ -33,7 +37,8 @@
3337
import javax.json.bind.Jsonb;
3438
import java.io.IOException;
3539
import java.math.BigDecimal;
36-
import java.time.*;
40+
import java.time.LocalDate;
41+
import java.time.OffsetDateTime;
3742
import java.util.Collections;
3843
import java.util.HashMap;
3944
import java.util.Map;
@@ -55,26 +60,25 @@ public class ClientsJsonProvider implements JsonProvider<Clients> {
5560
.registerModule(new JavaTimeModule())
5661
.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
5762
private final JsonFactory jacksonFactory = new JsonFactory();
58-
private final Genson genson =
59-
new GensonBuilder()
60-
.useDateAsTimestamp(false)
61-
.withConverter(new Converter<LocalDate>() {
62-
public void serialize(LocalDate object, com.owlike.genson.stream.ObjectWriter writer, Context ctx) {
63-
writer.writeString(object.toString());
64-
}
65-
public LocalDate deserialize(ObjectReader reader, Context ctx) {
66-
return LocalDate.parse(reader.valueAsString());
67-
}
68-
}, LocalDate.class)
69-
.withConverter(new Converter<OffsetDateTime>() {
70-
public void serialize(OffsetDateTime object, com.owlike.genson.stream.ObjectWriter writer, Context ctx) {
71-
writer.writeString(object.toString());
72-
}
73-
public OffsetDateTime deserialize(ObjectReader reader, Context ctx) {
74-
return OffsetDateTime.parse(reader.valueAsString());
75-
}
76-
}, OffsetDateTime.class)
77-
.create();
63+
private final Genson genson = new GensonBuilder()
64+
.useDateAsTimestamp(false)
65+
.withConverter(new Converter<LocalDate>() {
66+
public void serialize(LocalDate object, com.owlike.genson.stream.ObjectWriter writer, Context ctx) {
67+
writer.writeString(object.toString());
68+
}
69+
public LocalDate deserialize(ObjectReader reader, Context ctx) {
70+
return LocalDate.parse(reader.valueAsString());
71+
}
72+
}, LocalDate.class)
73+
.withConverter(new Converter<OffsetDateTime>() {
74+
public void serialize(OffsetDateTime object, com.owlike.genson.stream.ObjectWriter writer, Context ctx) {
75+
writer.writeString(object.toString());
76+
}
77+
public OffsetDateTime deserialize(ObjectReader reader, Context ctx) {
78+
return OffsetDateTime.parse(reader.valueAsString());
79+
}
80+
}, OffsetDateTime.class)
81+
.create();
7882
private final Jsonb yasson = new JsonBindingProvider().create()
7983
.withProvider(new org.glassfish.json.JsonProviderImpl())
8084
.build();
@@ -84,11 +88,10 @@ public void transform(Object o) {
8488
getContext().writeQuoted(o.toString());
8589
}
8690
};
87-
private final JSONDeserializer<Clients> flexjsonDeser =
88-
new JSONDeserializer<Clients>()
89-
.use(UUID.class, (objectBinder, o, type, aClass) -> UUID.fromString((String) o))
90-
.use(LocalDate.class, (objectBinder, o, type, aClass) -> LocalDate.parse((String) o))
91-
.use(OffsetDateTime.class, (objectBinder, o, type, aClass) -> OffsetDateTime.parse((String) o));
91+
private final JSONDeserializer<Clients> flexjsonDeser = new JSONDeserializer<Clients>()
92+
.use(UUID.class, (objectBinder, o, type, aClass) -> UUID.fromString((String) o))
93+
.use(LocalDate.class, (objectBinder, o, type, aClass) -> LocalDate.parse((String) o))
94+
.use(OffsetDateTime.class, (objectBinder, o, type, aClass) -> OffsetDateTime.parse((String) o));
9295

9396
private final org.boon.json.ObjectMapper boon = org.boon.json.JsonFactory.create();
9497
private final Mapper johnzon;
@@ -156,9 +159,11 @@ public ClientsJsonProvider() {
156159
.setAccessModeName("field") // default is "strict-method" which doesn't work nicely with public attributes
157160
.build();
158161

159-
TypeConverterManager.register(UUID.class, (TypeConverter<UUID>) value -> UUID.fromString((String)value));
160-
TypeConverterManager.register(LocalDate.class, (TypeConverter<LocalDate>) value -> LocalDate.parse((String)value));
161-
TypeConverterManager.register(OffsetDateTime.class, (TypeConverter<OffsetDateTime>) value -> OffsetDateTime.parse((String)value));
162+
TypeConverterManager joddTypeConverterManager = JoddBean.defaults().getTypeConverterManager();
163+
joddTypeConverterManager.register(UUID.class, (TypeConverter<UUID>) value -> UUID.fromString((String)value));
164+
joddTypeConverterManager.register(LocalDate.class, (TypeConverter<LocalDate>) value -> LocalDate.parse((String)value));
165+
joddTypeConverterManager.register(OffsetDateTime.class, (TypeConverter<OffsetDateTime>) value -> OffsetDateTime.parse((String)value));
166+
162167
}
163168

164169
@Override
@@ -239,39 +244,24 @@ public com.squareup.moshi.JsonAdapter<Clients> moshi() {
239244
return moshi;
240245
}
241246

242-
private static final ThreadLocal<JSONSerializer> FLEXJSON_SER = new ThreadLocal<JSONSerializer>() {
243-
@Override
244-
protected JSONSerializer initialValue() {
245-
return new JSONSerializer()
246-
.transform(FLEX_IDENTITY, UUID.class)
247-
.transform(FLEX_IDENTITY, LocalDate.class)
248-
.transform(FLEX_IDENTITY, OffsetDateTime.class);
249-
}
250-
};
247+
private static final ThreadLocal<JSONSerializer> FLEXJSON_SER = ThreadLocal.withInitial(() -> new JSONSerializer()
248+
.transform(FLEX_IDENTITY, UUID.class)
249+
.transform(FLEX_IDENTITY, LocalDate.class)
250+
.transform(FLEX_IDENTITY, OffsetDateTime.class));
251251

252-
private static final ThreadLocal<jodd.json.JsonParser> JODD_DESER = new ThreadLocal<jodd.json.JsonParser>() {
253-
@Override
254-
protected jodd.json.JsonParser initialValue() {
255-
return new jodd.json.JsonParser();
256-
}
257-
};
252+
private static final ThreadLocal<jodd.json.JsonParser> JODD_DESER = ThreadLocal.withInitial(jodd.json.JsonParser::new);
258253

259-
private static final ThreadLocal<jodd.json.JsonSerializer> JODD_SER = new ThreadLocal<jodd.json.JsonSerializer>() {
260-
@Override
261-
protected jodd.json.JsonSerializer initialValue() {
262-
return new jodd.json.JsonSerializer()
263-
.withSerializer(UUID.class, (TypeJsonSerializer<UUID>) (jsonContext, value) -> {
264-
jsonContext.writeString(value.toString());
265-
return true;
266-
})
267-
.withSerializer(LocalDate.class, (TypeJsonSerializer<LocalDate>) (jsonContext, value) -> {
268-
jsonContext.writeString(value.toString());
269-
return true;
270-
})
271-
.withSerializer(OffsetDateTime.class, (TypeJsonSerializer<OffsetDateTime>) (jsonContext, value) -> {
272-
jsonContext.writeString(value.toString());
273-
return true;
274-
});
275-
}
276-
};
254+
private static final ThreadLocal<jodd.json.JsonSerializer> JODD_SER = ThreadLocal.withInitial(() -> new jodd.json.JsonSerializer()
255+
.withSerializer(UUID.class, (TypeJsonSerializer<UUID>) (jsonContext, value) -> {
256+
jsonContext.writeString(value.toString());
257+
return true;
258+
})
259+
.withSerializer(LocalDate.class, (TypeJsonSerializer<LocalDate>) (jsonContext, value) -> {
260+
jsonContext.writeString(value.toString());
261+
return true;
262+
})
263+
.withSerializer(OffsetDateTime.class, (TypeJsonSerializer<OffsetDateTime>) (jsonContext, value) -> {
264+
jsonContext.writeString(value.toString());
265+
return true;
266+
}));
277267
}

0 commit comments

Comments
 (0)