Skip to content

Commit 855792e

Browse files
taowentaowen
committed
Merge branch 'master' of https://github.com/json-iterator/java 
2 parents 90160f5 + 4f2e515 commit 855792e

14 files changed

+25
-50
lines changed

‎src/main/java/com/jsoniter/any/Any.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.jsoniter.output.CodegenAccess;
44
import com.jsoniter.spi.JsonException;
5-
import com.jsoniter.JsonIterator;
65
import com.jsoniter.ValueType;
76
import com.jsoniter.output.JsonStream;
87
import com.jsoniter.spi.Encoder;
@@ -189,7 +188,7 @@ public Any mustBeValid() {
189188
}
190189
}
191190

192-
public Set<String> keys() {
191+
public Set keys() {
193192
return EMPTY_KEYS;
194193
}
195194

‎src/main/java/com/jsoniter/any/DoubleAny.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.jsoniter.ValueType;
44
import com.jsoniter.output.JsonStream;
5-
import com.jsoniter.spi.TypeLiteral;
65

76
import java.io.IOException;
87

‎src/main/java/com/jsoniter/any/LongAny.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.jsoniter.ValueType;
44
import com.jsoniter.output.JsonStream;
5-
import com.jsoniter.spi.TypeLiteral;
65

76
import java.io.IOException;
87

‎src/main/java/com/jsoniter/extra/Base64Support.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.jsoniter.JsonIterator;
44
import com.jsoniter.spi.Slice;
5-
import com.jsoniter.any.Any;
65
import com.jsoniter.output.JsonStream;
76
import com.jsoniter.spi.Decoder;
87
import com.jsoniter.spi.Encoder;

‎src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java

+12-9
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,18 @@ public boolean equals(Object o) {
176176

177177
Builder builder = (Builder) o;
178178

179-
if (excludeFieldsWithoutExposeAnnotation != builder.excludeFieldsWithoutExposeAnnotation) return false;
180-
if (disableHtmlEscaping != builder.disableHtmlEscaping) return false;
181-
if (!dateFormat.get().equals(builder.dateFormat.get())) return false;
182-
if (fieldNamingStrategy != null ? !fieldNamingStrategy.equals(builder.fieldNamingStrategy) : builder.fieldNamingStrategy != null)
183-
return false;
184-
if (version != null ? !version.equals(builder.version) : builder.version != null) return false;
185-
if (serializationExclusionStrategies != null ? !serializationExclusionStrategies.equals(builder.serializationExclusionStrategies) : builder.serializationExclusionStrategies != null)
186-
return false;
187-
return deserializationExclusionStrategies != null ? deserializationExclusionStrategies.equals(builder.deserializationExclusionStrategies) : builder.deserializationExclusionStrategies == null;
179+
return excludeFieldsWithoutExposeAnnotation == builder.excludeFieldsWithoutExposeAnnotation &&
180+
disableHtmlEscaping == builder.disableHtmlEscaping &&
181+
dateFormat.get().equals(builder.dateFormat.get()) &&
182+
(fieldNamingStrategy != null ? fieldNamingStrategy.equals(builder.fieldNamingStrategy) :
183+
builder.fieldNamingStrategy == null) &&
184+
(version != null ? version.equals(builder.version) : builder.version == null) &&
185+
(serializationExclusionStrategies != null ?
186+
serializationExclusionStrategies.equals(builder.serializationExclusionStrategies) :
187+
builder.serializationExclusionStrategies == null) &&
188+
(deserializationExclusionStrategies != null ?
189+
deserializationExclusionStrategies.equals(builder.deserializationExclusionStrategies) :
190+
builder.deserializationExclusionStrategies == null);
188191
}
189192

190193
@Override

‎src/main/java/com/jsoniter/output/Codegen.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.jsoniter.output;
22

3-
import com.jsoniter.any.Any;
43
import com.jsoniter.spi.*;
54

65
import java.io.File;
@@ -10,7 +9,6 @@
109
import java.lang.reflect.Modifier;
1110
import java.lang.reflect.ParameterizedType;
1211
import java.lang.reflect.Type;
13-
import java.lang.reflect.WildcardType;
1412
import java.util.*;
1513

1614
class Codegen {

‎src/main/java/com/jsoniter/output/CodegenResult.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.jsoniter.output;
22

3-
import com.jsoniter.spi.JsonException;
43
import com.jsoniter.spi.JsoniterSpi;
54

65
class CodegenResult {

‎src/test/java/com/jsoniter/any/TestList.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import java.util.ArrayList;
66
import java.util.Arrays;
7+
import java.util.Collections;
78

89
public class TestList extends TestCase {
910
public void test_size() {
@@ -12,14 +13,14 @@ public void test_size() {
1213
}
1314

1415
public void test_to_boolean() {
15-
Any any = Any.wrap(Arrays.asList());
16+
Any any = Any.wrap(Collections.emptyList());
1617
assertFalse(any.toBoolean());
1718
any = Any.wrap(Arrays.asList("hello", 1));
1819
assertTrue(any.toBoolean());
1920
}
2021

2122
public void test_to_int() {
22-
Any any = Any.wrap(Arrays.asList());
23+
Any any = Any.wrap(Collections.emptyList());
2324
assertEquals(0, any.toInt());
2425
any = Any.wrap(Arrays.asList("hello", 1));
2526
assertEquals(2, any.toInt());
@@ -31,7 +32,7 @@ public void test_get() {
3132
}
3233

3334
public void test_get_from_nested() {
34-
Any any = Any.wrap(Arrays.asList(Arrays.asList("hello"), Arrays.asList("world")));
35+
Any any = Any.wrap(Arrays.asList(Collections.singletonList("hello"), Collections.singletonList("world")));
3536
assertEquals("hello", any.get(0, 0).toString());
3637
assertEquals("[\"hello\",\"world\"]", any.get('*', 0).toString());
3738
}

‎src/test/java/com/jsoniter/any/TestMap.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.jsoniter.any;
22

3-
import com.jsoniter.JsonIterator;
43
import junit.framework.TestCase;
54

65
import java.util.HashMap;

‎src/test/java/com/jsoniter/extra/TestJdkDatetime.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.jsoniter.extra;
22

33
import com.jsoniter.JsonIterator;
4-
import com.jsoniter.extra.JdkDatetimeSupport;
54
import com.jsoniter.output.JsonStream;
65
import junit.framework.TestCase;
76

‎src/test/java/com/jsoniter/output/TestGson.java

-17
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import java.lang.reflect.Field;
1313
import java.text.DateFormat;
14-
import java.util.Calendar;
1514
import java.util.Date;
1615
import java.util.TimeZone;
1716

@@ -108,22 +107,6 @@ public void test_serializeNulls() {
108107
assertEquals("{\"field1\":null,\"field2\":0}", output);
109108
}
110109

111-
// public void test_setDateFormat_no_op() {
112-
// TimeZone orig = TimeZone.getDefault();
113-
// try {
114-
// TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
115-
// Gson gson = new GsonBuilder().create();
116-
// String output = gson.toJson(new Date(0));
117-
// assertEquals("\"Jan 1, 1970 12:00:00 AM\"", output);
118-
// GsonCompatibilityMode config = new GsonCompatibilityMode.Builder()
119-
// .build();
120-
// output = JsonStream.serialize(config, new Date(0));
121-
// assertEquals("\"Jan 1, 1970 12:00:00 AM\"", output);
122-
// } finally {
123-
// TimeZone.setDefault(orig);
124-
// }
125-
// }
126-
127110
public void test_setDateFormat_with_style() {
128111
TimeZone orig = TimeZone.getDefault();
129112
try {

‎src/test/java/com/jsoniter/output/TestObject.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void test_not_nullable() {
148148
try {
149149
JsonStream.serialize(config, new TestObject8());
150150
fail();
151-
} catch (NullPointerException e) {
151+
} catch (NullPointerException ignore) {
152152
}
153153
}
154154

@@ -176,7 +176,7 @@ public void test_collection_value_not_nullable() {
176176
try {
177177
JsonStream.serialize(config, obj);
178178
fail();
179-
} catch (NullPointerException e) {
179+
} catch (NullPointerException ignore) {
180180
}
181181

182182
obj = new TestObject9();
@@ -185,7 +185,7 @@ public void test_collection_value_not_nullable() {
185185
try {
186186
JsonStream.serialize(config, obj);
187187
fail();
188-
} catch (NullPointerException e) {
188+
} catch (NullPointerException ignore) {
189189
}
190190

191191
obj = new TestObject9();
@@ -194,7 +194,7 @@ public void test_collection_value_not_nullable() {
194194
try {
195195
JsonStream.serialize(config, obj);
196196
fail();
197-
} catch (NullPointerException e) {
197+
} catch (NullPointerException ignore) {
198198
}
199199

200200
obj = new TestObject9();
@@ -203,7 +203,7 @@ public void test_collection_value_not_nullable() {
203203
try {
204204
JsonStream.serialize(config, obj);
205205
fail();
206-
} catch (NullPointerException e) {
206+
} catch (NullPointerException ignore) {
207207
}
208208
}
209209

@@ -265,7 +265,7 @@ public void test_private_class() {
265265
try {
266266
JsonStream.serialize(new TestObject13());
267267
fail("should throw JsonException");
268-
} catch (JsonException e) {
268+
} catch (JsonException ignore) {
269269

270270
}
271271
}

‎src/test/java/com/jsoniter/output/TestSpiPropertyEncoder.java

-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package com.jsoniter.output;
22

3-
import com.jsoniter.any.Any;
43
import com.jsoniter.spi.Encoder;
54
import com.jsoniter.spi.JsoniterSpi;
65
import com.jsoniter.spi.TypeLiteral;
76
import junit.framework.TestCase;
8-
9-
import java.io.ByteArrayOutputStream;
107
import java.io.IOException;
118

129
public class TestSpiPropertyEncoder extends TestCase {

‎src/test/java/com/jsoniter/output/TestSpiTypeEncoder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import junit.framework.TestCase;
77

88
import java.io.IOException;
9-
import java.util.Arrays;
9+
import java.util.Collections;
1010
import java.util.Date;
1111
import java.util.List;
1212

@@ -47,7 +47,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {
4747
});
4848
MyDate myDate = new MyDate();
4949
myDate.date = new Date(1481365190000L);
50-
String output = JsonStream.serialize(typeLiteral, Arrays.asList(myDate));
50+
String output = JsonStream.serialize(typeLiteral, Collections.singletonList(myDate));
5151
assertEquals("1481365190000", output);
5252
}
5353
}

0 commit comments

Comments
 (0)