Merge branch 'master' of https://github.com/json-iterator/java

taowen · taowen · commit 855792e52c17 · 2018-01-12T09:04:42.000+08:00
diff --git a/src/main/java/com/jsoniter/any/Any.java b/src/main/java/com/jsoniter/any/Any.java
@@ -2,7 +2,6 @@
 
 import com.jsoniter.output.CodegenAccess;
 import com.jsoniter.spi.JsonException;
-import com.jsoniter.JsonIterator;
 import com.jsoniter.ValueType;
 import com.jsoniter.output.JsonStream;
 import com.jsoniter.spi.Encoder;
@@ -189,7 +188,7 @@ public Any mustBeValid() {
         }
     }
 
-    public Set<String> keys() {
+    public Set keys() {
         return EMPTY_KEYS;
     }
 
diff --git a/src/main/java/com/jsoniter/any/DoubleAny.java b/src/main/java/com/jsoniter/any/DoubleAny.java
@@ -2,7 +2,6 @@
 
 import com.jsoniter.ValueType;
 import com.jsoniter.output.JsonStream;
-import com.jsoniter.spi.TypeLiteral;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/jsoniter/any/LongAny.java b/src/main/java/com/jsoniter/any/LongAny.java
@@ -2,7 +2,6 @@
 
 import com.jsoniter.ValueType;
 import com.jsoniter.output.JsonStream;
-import com.jsoniter.spi.TypeLiteral;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/jsoniter/extra/Base64Support.java b/src/main/java/com/jsoniter/extra/Base64Support.java
@@ -2,7 +2,6 @@
 
 import com.jsoniter.JsonIterator;
 import com.jsoniter.spi.Slice;
-import com.jsoniter.any.Any;
 import com.jsoniter.output.JsonStream;
 import com.jsoniter.spi.Decoder;
 import com.jsoniter.spi.Encoder;
diff --git a/src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java b/src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java
@@ -176,15 +176,18 @@ public boolean equals(Object o) {
 
             Builder builder = (Builder) o;
 
-            if (excludeFieldsWithoutExposeAnnotation != builder.excludeFieldsWithoutExposeAnnotation) return false;
-            if (disableHtmlEscaping != builder.disableHtmlEscaping) return false;
-            if (!dateFormat.get().equals(builder.dateFormat.get())) return false;
-            if (fieldNamingStrategy != null ? !fieldNamingStrategy.equals(builder.fieldNamingStrategy) : builder.fieldNamingStrategy != null)
-                return false;
-            if (version != null ? !version.equals(builder.version) : builder.version != null) return false;
-            if (serializationExclusionStrategies != null ? !serializationExclusionStrategies.equals(builder.serializationExclusionStrategies) : builder.serializationExclusionStrategies != null)
-                return false;
-            return deserializationExclusionStrategies != null ? deserializationExclusionStrategies.equals(builder.deserializationExclusionStrategies) : builder.deserializationExclusionStrategies == null;
+            return excludeFieldsWithoutExposeAnnotation == builder.excludeFieldsWithoutExposeAnnotation &&
+                    disableHtmlEscaping == builder.disableHtmlEscaping &&
+                    dateFormat.get().equals(builder.dateFormat.get()) &&
+                    (fieldNamingStrategy != null ? fieldNamingStrategy.equals(builder.fieldNamingStrategy) :
+                            builder.fieldNamingStrategy == null) &&
+                    (version != null ? version.equals(builder.version) : builder.version == null) &&
+                    (serializationExclusionStrategies != null ?
+                            serializationExclusionStrategies.equals(builder.serializationExclusionStrategies) :
+                            builder.serializationExclusionStrategies == null) &&
+                    (deserializationExclusionStrategies != null ?
+                            deserializationExclusionStrategies.equals(builder.deserializationExclusionStrategies) :
+                            builder.deserializationExclusionStrategies == null);
         }
 
         @Override
diff --git a/src/main/java/com/jsoniter/output/Codegen.java b/src/main/java/com/jsoniter/output/Codegen.java
@@ -1,6 +1,5 @@
 package com.jsoniter.output;
 
-import com.jsoniter.any.Any;
 import com.jsoniter.spi.*;
 
 import java.io.File;
@@ -10,7 +9,6 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.lang.reflect.WildcardType;
 import java.util.*;
 
 class Codegen {
diff --git a/src/main/java/com/jsoniter/output/CodegenResult.java b/src/main/java/com/jsoniter/output/CodegenResult.java
@@ -1,6 +1,5 @@
 package com.jsoniter.output;
 
-import com.jsoniter.spi.JsonException;
 import com.jsoniter.spi.JsoniterSpi;
 
 class CodegenResult {
diff --git a/src/test/java/com/jsoniter/any/TestList.java b/src/test/java/com/jsoniter/any/TestList.java
@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 public class TestList extends TestCase {
     public void test_size() {
@@ -12,14 +13,14 @@ public void test_size() {
     }
 
     public void test_to_boolean() {
-        Any any = Any.wrap(Arrays.asList());
+        Any any = Any.wrap(Collections.emptyList());
         assertFalse(any.toBoolean());
         any = Any.wrap(Arrays.asList("hello", 1));
         assertTrue(any.toBoolean());
     }
 
     public void test_to_int() {
-        Any any = Any.wrap(Arrays.asList());
+        Any any = Any.wrap(Collections.emptyList());
         assertEquals(0, any.toInt());
         any = Any.wrap(Arrays.asList("hello", 1));
         assertEquals(2, any.toInt());
@@ -31,7 +32,7 @@ public void test_get() {
     }
 
     public void test_get_from_nested() {
-        Any any = Any.wrap(Arrays.asList(Arrays.asList("hello"), Arrays.asList("world")));
+        Any any = Any.wrap(Arrays.asList(Collections.singletonList("hello"), Collections.singletonList("world")));
         assertEquals("hello", any.get(0, 0).toString());
         assertEquals("[\"hello\",\"world\"]", any.get('*', 0).toString());
     }
diff --git a/src/test/java/com/jsoniter/any/TestMap.java b/src/test/java/com/jsoniter/any/TestMap.java
@@ -1,6 +1,5 @@
 package com.jsoniter.any;
 
-import com.jsoniter.JsonIterator;
 import junit.framework.TestCase;
 
 import java.util.HashMap;
diff --git a/src/test/java/com/jsoniter/extra/TestJdkDatetime.java b/src/test/java/com/jsoniter/extra/TestJdkDatetime.java
@@ -1,7 +1,6 @@
 package com.jsoniter.extra;
 
 import com.jsoniter.JsonIterator;
-import com.jsoniter.extra.JdkDatetimeSupport;
 import com.jsoniter.output.JsonStream;
 import junit.framework.TestCase;
 
diff --git a/src/test/java/com/jsoniter/output/TestGson.java b/src/test/java/com/jsoniter/output/TestGson.java
@@ -11,7 +11,6 @@
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
@@ -108,22 +107,6 @@ public void test_serializeNulls() {
         assertEquals("{\"field1\":null,\"field2\":0}", output);
     }
 
-//    public void test_setDateFormat_no_op() {
-//        TimeZone orig = TimeZone.getDefault();
-//        try {
-//            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-//            Gson gson = new GsonBuilder().create();
-//            String output = gson.toJson(new Date(0));
-//            assertEquals("\"Jan 1, 1970 12:00:00 AM\"", output);
-//            GsonCompatibilityMode config = new GsonCompatibilityMode.Builder()
-//                    .build();
-//            output = JsonStream.serialize(config, new Date(0));
-//            assertEquals("\"Jan 1, 1970 12:00:00 AM\"", output);
-//        } finally {
-//            TimeZone.setDefault(orig);
-//        }
-//    }
-
     public void test_setDateFormat_with_style() {
         TimeZone orig = TimeZone.getDefault();
         try {
diff --git a/src/test/java/com/jsoniter/output/TestObject.java b/src/test/java/com/jsoniter/output/TestObject.java
@@ -148,7 +148,7 @@ public void test_not_nullable() {
         try {
             JsonStream.serialize(config, new TestObject8());
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
     }
 
@@ -176,7 +176,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
 
         obj = new TestObject9();
@@ -185,7 +185,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
 
         obj = new TestObject9();
@@ -194,7 +194,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
 
         obj = new TestObject9();
@@ -203,7 +203,7 @@ public void test_collection_value_not_nullable() {
         try {
             JsonStream.serialize(config, obj);
             fail();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException ignore) {
         }
     }
 
@@ -265,7 +265,7 @@ public void test_private_class() {
         try {
             JsonStream.serialize(new TestObject13());
             fail("should throw JsonException");
-        } catch (JsonException e) {
+        } catch (JsonException ignore) {
 
         }
     }
diff --git a/src/test/java/com/jsoniter/output/TestSpiPropertyEncoder.java b/src/test/java/com/jsoniter/output/TestSpiPropertyEncoder.java
@@ -1,12 +1,9 @@
 package com.jsoniter.output;
 
-import com.jsoniter.any.Any;
 import com.jsoniter.spi.Encoder;
 import com.jsoniter.spi.JsoniterSpi;
 import com.jsoniter.spi.TypeLiteral;
 import junit.framework.TestCase;
-
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 public class TestSpiPropertyEncoder extends TestCase {
diff --git a/src/test/java/com/jsoniter/output/TestSpiTypeEncoder.java b/src/test/java/com/jsoniter/output/TestSpiTypeEncoder.java
@@ -6,7 +6,7 @@
 import junit.framework.TestCase;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -47,7 +47,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {
         });
         MyDate myDate = new MyDate();
         myDate.date = new Date(1481365190000L);
-        String output = JsonStream.serialize(typeLiteral, Arrays.asList(myDate));
+        String output = JsonStream.serialize(typeLiteral, Collections.singletonList(myDate));
         assertEquals("1481365190000", output);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import com.jsoniter.output.CodegenAccess;`
`4`	`4`	`import com.jsoniter.spi.JsonException;`
`5`		`-import com.jsoniter.JsonIterator;`
`6`	`5`	`import com.jsoniter.ValueType;`
`7`	`6`	`import com.jsoniter.output.JsonStream;`
`8`	`7`	`import com.jsoniter.spi.Encoder;`
`@@ -189,7 +188,7 @@ public Any mustBeValid() {`
`189`	`188`	`}`
`190`	`189`	`}`
`191`	`190`
`192`		`- public Set<String> keys() {`
	`191`	`+ public Set keys() {`
`193`	`192`	`return EMPTY_KEYS;`
`194`	`193`	`}`
`195`	`194`