Simplified condition

ashutoshcp · ashutoshcp · commit da508a213f1b · 2018-01-03T23:26:02.000+05:30
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
