Merge pull request #140 from ashu01/dev

Refactor

Author: taowen

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;
     }
 

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;
 

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;
 

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;

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

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 {

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 {