fix-to: bugfix

mini1798 · mini1798 · commit dfdb35237b68 · 2024-05-28T22:11:13.000+08:00
1. 调整参数列表
2. 修复null属性判断错误
3. 优化handleFactory实现方法
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/AbstractHandleFactory.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/AbstractHandleFactory.java
@@ -1,13 +1,14 @@
 package me.codeleep.jsondiff.core.handle;
 
 import me.codeleep.jsondiff.common.model.TravelPath;
-import me.codeleep.jsondiff.common.model.neat.JsonDiff;
-import me.codeleep.jsondiff.common.model.neat.JsonDiffArray;
-import me.codeleep.jsondiff.common.model.neat.JsonDiffObject;
-import me.codeleep.jsondiff.common.model.neat.JsonNeat;
+import me.codeleep.jsondiff.common.model.neat.*;
+import me.codeleep.jsondiff.core.handle.array.AbstractArrayJsonNeat;
 import me.codeleep.jsondiff.core.handle.array.ComplexArrayJsonNeat;
+import me.codeleep.jsondiff.core.handle.object.AbstractObjectJsonNeat;
 import me.codeleep.jsondiff.core.handle.object.ComplexObjectJsonNeat;
+import me.codeleep.jsondiff.core.handle.other.AbstractOtherJsonNeat;
 import me.codeleep.jsondiff.core.handle.other.ComplexOtherJsonNeat;
+import me.codeleep.jsondiff.core.handle.primitive.AbstractPrimitiveJsonNeat;
 import me.codeleep.jsondiff.core.handle.primitive.ComplexPrimitiveJsonNeat;
 import me.codeleep.jsondiff.core.utils.ClassUtil;
 
@@ -18,20 +19,37 @@
  */
 public class AbstractHandleFactory implements HandleFactory{
     @Override
-    public JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath) {
+    public JsonNeat<? extends JsonDiff> generate(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
         if (!ClassUtil.isSameClass(expect, actual)) {
             return null;
         }
         // TODO 返回系统默认处理器
         if (expect instanceof JsonDiffObject && actual instanceof JsonDiffObject) {
-            return new ComplexObjectJsonNeat(travelPath, expect, actual);
+            return generateObjectJsonNeat(travelPath, expect, actual);
         }
         if (expect instanceof JsonDiffArray && actual instanceof JsonDiffArray) {
-            return new ComplexArrayJsonNeat(travelPath, expect, actual);
+            return generateArrayJsonNeat(travelPath, expect, actual);
         }
         if (expect.isLeaf() && actual.isLeaf()) {
-            return new ComplexPrimitiveJsonNeat(travelPath, expect, actual);
+            return generatePrimitiveJsonNeat(travelPath, expect, actual);
         }
+        return generateOtherJsonNeat(travelPath, expect, actual);
+    }
+
+    public AbstractObjectJsonNeat<JsonDiffObject> generateObjectJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        return new ComplexObjectJsonNeat(travelPath, expect, actual);
+    }
+
+    public AbstractArrayJsonNeat<JsonDiffArray> generateArrayJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        return new ComplexArrayJsonNeat(travelPath, expect, actual);
+    }
+
+    public AbstractPrimitiveJsonNeat<JsonDiffPrimitive> generatePrimitiveJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        return new ComplexPrimitiveJsonNeat(travelPath, expect, actual);
+    }
+
+    public AbstractOtherJsonNeat<JsonDiffOther> generateOtherJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
         return new ComplexOtherJsonNeat(travelPath, expect, actual);
     }
+
 }
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/HandleFactory.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/HandleFactory.java
@@ -11,6 +11,6 @@
  */
 public interface HandleFactory {
 
-    JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath);
+    JsonNeat<? extends JsonDiff> generate(TravelPath travelPath, JsonDiff expect, JsonDiff actual);
 
 }
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/ComplexArrayJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/ComplexArrayJsonNeat.java
@@ -39,7 +39,7 @@ protected JsonCompareResult ignoreOrder(JsonDiffArray expect, JsonDiffArray actu
                     continue;
                 }
                 TravelPath nextTravelPath = new TravelPath(this.travelPath, expectIndex, actualIndex);
-                JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expect.get(expectIndex), actual.get(actualIndex), nextTravelPath);
+                JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(nextTravelPath, expect.get(expectIndex), actual.get(actualIndex));
                 if (jsonNeat == null) {
                     continue;
                 }
@@ -65,7 +65,7 @@ protected JsonCompareResult ignoreOrder(JsonDiffArray expect, JsonDiffArray actu
                 JsonDiff actualItem = actual.get(actualIndex);
                 TravelPath nextTravelPath = new TravelPath(this.travelPath, expectIndex, actualIndex);
                 // 判断类型, 根据类型去实例化JsonNeat。
-                JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expectItem, actualItem, nextTravelPath);
+                JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(nextTravelPath, expectItem, actualItem);
                 // 类型不一致
                 if (jsonNeat != null) {
                     JsonCompareResult diff = jsonNeat.diff();
@@ -93,7 +93,7 @@ protected JsonCompareResult keepOrder(JsonDiffArray expect, JsonDiffArray actual
             JsonDiff actualItem = actual.get(i);
             TravelPath nextTravelPath = new TravelPath(this.travelPath, i, i);
             // 判断类型, 根据类型去实例化JsonNeat。
-            JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expectItem, actualItem, nextTravelPath);
+            JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(nextTravelPath, expectItem, actualItem);
             // 类型不一致
             if (jsonNeat == null) {
                 Defects defects = new Defects()
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/custom/AlignArrayJsonDiff.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/custom/AlignArrayJsonDiff.java
@@ -14,7 +14,7 @@
  */
 public class AlignArrayJsonDiff extends ComplexArrayJsonNeat {
 
-    protected AlignArrayJsonDiff(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+    public AlignArrayJsonDiff(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
         super(travelPath, expect, actual);
     }
 
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java
@@ -122,7 +122,7 @@ protected JsonCompareResult diff1() {
             JsonDiff actualDiffJson = actual.get(mappingKey.getActualKey());
             TravelPath nextTravelPath = new TravelPath(travelPath, mappingKey);
             // 判断类型, 根据类型去实例化JsonNeat。
-            JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expectDiffJson, actualDiffJson, nextTravelPath);
+            JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(nextTravelPath, expectDiffJson, actualDiffJson);
             if (jsonNeat == null) {
                 Defects defects = new Defects()
                         .setActual(actualDiffJson)
diff --git a/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonOther.java b/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonOther.java
@@ -22,10 +22,10 @@ public Object getOther() {
 
     @Override
     public boolean isEquals(JsonDiffOther jsonDiffOther) {
-        if (jsonDiffOther == null && object == null)  {
+        if (jsonDiffOther != null && jsonDiffOther.getOther() == null && object == null)  {
             return true;
         }
-        if (jsonDiffOther == null) {
+        if (jsonDiffOther == null || jsonDiffOther.getOther() == null) {
             return false;
         }
         Object target = jsonDiffOther.getOther();
diff --git a/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonPrimitive.java b/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonPrimitive.java
@@ -17,10 +17,10 @@ public FastJsonPrimitive(Object object) {
 
     @Override
     public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive)  {
-        if (jsonDiffPrimitive == null && object == null)  {
+        if (jsonDiffPrimitive != null && jsonDiffPrimitive.getTarget() == null && object == null)  {
             return true;
         }
-        if (jsonDiffPrimitive == null) {
+        if (jsonDiffPrimitive == null || jsonDiffPrimitive.getTarget() == null) {
             return false;
         }
         Object target = jsonDiffPrimitive.getTarget();
diff --git a/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Other.java b/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Other.java
@@ -23,10 +23,10 @@ public Object getOther() {
 
     @Override
     public boolean isEquals(JsonDiffOther jsonDiffOther) {
-        if (jsonDiffOther == null && object == null)  {
+        if (jsonDiffOther != null && jsonDiffOther.getOther() == null && object == null)  {
             return true;
         }
-        if (jsonDiffOther == null) {
+        if (jsonDiffOther == null || jsonDiffOther.getOther() == null) {
             return false;
         }
         Object target = jsonDiffOther.getOther();
diff --git a/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Primitive.java b/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Primitive.java
@@ -17,10 +17,10 @@ public FastJson2Primitive(Object object) {
 
     @Override
     public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive) {
-        if (jsonDiffPrimitive == null && object == null)  {
+        if (jsonDiffPrimitive != null && jsonDiffPrimitive.getTarget() == null && object == null)  {
             return true;
         }
-        if (jsonDiffPrimitive == null) {
+        if (jsonDiffPrimitive == null || jsonDiffPrimitive.getTarget() == null) {
             return false;
         }
         Object target = jsonDiffPrimitive.getTarget();
diff --git a/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Util.java b/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Util.java
@@ -28,7 +28,7 @@ public static JsonDiff formatJsonDiff(Object value) {
     }
 
     public static boolean isJavaPrimitive(Object value) {
-        return value instanceof String || value instanceof Integer || value instanceof BigInteger || value instanceof BigDecimal || value instanceof Boolean || value instanceof Double || value instanceof Float || value instanceof Long || value instanceof Short || value instanceof Byte || value instanceof Character;
+        return value == null || value instanceof String || value instanceof Integer || value instanceof BigInteger || value instanceof BigDecimal || value instanceof Boolean || value instanceof Double || value instanceof Float || value instanceof Long || value instanceof Short || value instanceof Byte || value instanceof Character;
     }
 
 }
diff --git a/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonOther.java b/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonOther.java
@@ -39,10 +39,10 @@ public Object getOther() {
 
     @Override
     public boolean isEquals(JsonDiffOther jsonDiffOther) {
-        if (jsonDiffOther == null && object == null)  {
+        if (jsonDiffOther != null && jsonDiffOther.getOther() == null && object == null)  {
             return true;
         }
-        if (jsonDiffOther == null) {
+        if (jsonDiffOther == null || jsonDiffOther.getOther() == null) {
             return false;
         }
         Object target = jsonDiffOther.getOther();
diff --git a/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonPrimitive.java b/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonPrimitive.java
@@ -33,10 +33,10 @@ public boolean isLeaf() {
     }
     @Override
     public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive) {
-        if (jsonDiffPrimitive == null && object == null)  {
+        if (jsonDiffPrimitive != null && jsonDiffPrimitive.getTarget() == null && object == null)  {
             return true;
         }
-        if (jsonDiffPrimitive == null) {
+        if (jsonDiffPrimitive == null || jsonDiffPrimitive.getTarget() == null) {
             return false;
         }
         Object target = jsonDiffPrimitive.getTarget();
diff --git a/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonOther.java b/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonOther.java
@@ -39,10 +39,10 @@ public Object getOther() {
 
     @Override
     public boolean isEquals(JsonDiffOther jsonDiffOther) {
-        if (jsonDiffOther == null && object == null)  {
+        if (jsonDiffOther != null && jsonDiffOther.getOther() == null && object == null)  {
             return true;
         }
-        if (jsonDiffOther == null) {
+        if (jsonDiffOther == null || jsonDiffOther.getOther() == null) {
             return false;
         }
         Object target = jsonDiffOther.getOther();
diff --git a/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonPrimitive.java b/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonPrimitive.java
@@ -33,10 +33,10 @@ public boolean isLeaf() {
     }
     @Override
     public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive) {
-        if (jsonDiffPrimitive == null && object == null)  {
+        if (jsonDiffPrimitive != null && jsonDiffPrimitive.getTarget() == null && object == null)  {
             return true;
         }
-        if (jsonDiffPrimitive == null) {
+        if (jsonDiffPrimitive == null || jsonDiffPrimitive.getTarget() == null) {
             return false;
         }
         Object target = jsonDiffPrimitive.getTarget();
diff --git a/json-diff-test/pom.xml b/json-diff-test/pom.xml
@@ -30,6 +30,18 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.xiaoandcai</groupId>
+            <artifactId>json-diff-impl-fastjson</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.xiaoandcai</groupId>
+            <artifactId>json-diff-impl-fastjson2</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
@@ -60,11 +72,6 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.74</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-            <version>2.0.7</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/json-diff-test/src/main/java/me/codeleep/jsondiff/test/FastJson2HandleFactoryTest.java b/json-diff-test/src/main/java/me/codeleep/jsondiff/test/FastJson2HandleFactoryTest.java
@@ -58,7 +58,7 @@ private JsonDiff DisposeExpect(JsonDiff expect) {
             }
 
             @Override
-            public JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath) {
+            public JsonNeat<? extends JsonDiff> generate(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
                 if (!ClassUtil.isSameClass(expect, actual)) {
                     return null;
                 }
diff --git a/json-diff-test/src/main/java/me/codeleep/jsondiff/test/FastJsonHandleFactoryTest.java b/json-diff-test/src/main/java/me/codeleep/jsondiff/test/FastJsonHandleFactoryTest.java
@@ -58,7 +58,7 @@ private JsonDiff DisposeExpect(JsonDiff expect) {
             }
 
             @Override
-            public JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath) {
+            public JsonNeat<? extends JsonDiff> generate(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
                 if (!ClassUtil.isSameClass(expect, actual)) {
                     return null;
                 }
diff --git a/json-diff-test/src/main/java/me/codeleep/jsondiff/test/GasonHandleFactoryTest.java b/json-diff-test/src/main/java/me/codeleep/jsondiff/test/GasonHandleFactoryTest.java
@@ -58,7 +58,7 @@ private JsonDiff DisposeExpect(JsonDiff expect) {
             }
 
             @Override
-            public JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath) {
+            public JsonNeat<? extends JsonDiff> generate( TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
                 if (!ClassUtil.isSameClass(expect, actual)) {
                     return null;
                 }
diff --git a/json-diff-test/src/main/java/me/codeleep/jsondiff/test/JacksonHandleFactoryTest.java b/json-diff-test/src/main/java/me/codeleep/jsondiff/test/JacksonHandleFactoryTest.java
@@ -58,7 +58,7 @@ private JsonDiff DisposeExpect(JsonDiff expect) {
             }
 
             @Override
-            public JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath) {
+            public JsonNeat<? extends JsonDiff> generate(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
                 if (!ClassUtil.isSameClass(expect, actual)) {
                     return null;
                 }
diff --git a/json-diff-test/src/main/java/me/codeleep/jsondiff/test/SimpleTest.java b/json-diff-test/src/main/java/me/codeleep/jsondiff/test/SimpleTest.java
@@ -3,7 +3,9 @@
 import com.alibaba.fastjson2.JSON;
 import me.codeleep.jsondiff.DefaultJsonDifference;
 import me.codeleep.jsondiff.common.model.JsonCompareResult;
+import me.codeleep.jsondiff.common.utils.ImplType;
 import me.codeleep.jsondiff.core.config.JsonComparedOption;
+import me.codeleep.jsondiff.core.config.JsonDiffOption;
 import org.testng.annotations.Test;
 
 import java.util.HashSet;
@@ -17,11 +19,12 @@ public class SimpleTest {
 
     @Test
     public void test1() {
-        String expect = "{\"name\":\"baron\",\"age\":12}";
-        String actual = "{\"name\":\"baron\"}";
+        String expect = "{\"name\": null}";
+        String actual = "{\"name\": null}";
 
         HashSet<String> ignorePath = new HashSet<>();
-        ignorePath.add("$.age");
+
+        JsonDiffOption.setDefaultJsonFramework(ImplType.FASTJSON2);
 
         JsonComparedOption jsonComparedOption = new JsonComparedOption().setIgnoreOrder(true).setIgnorePath(ignorePath);
         JsonCompareResult jsonCompareResult = new DefaultJsonDifference()
diff --git a/json-diff/src/main/java/me/codeleep/jsondiff/DefaultJsonDifference.java b/json-diff/src/main/java/me/codeleep/jsondiff/DefaultJsonDifference.java
@@ -23,7 +23,7 @@ public JsonCompareResult detectDiff(String expect, String actual) {
     }
 
     public JsonCompareResult detectDiff(JsonDiff expect, JsonDiff actual) {
-        JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expect, actual, new TravelPath());
+        JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(new TravelPath(), expect, actual);
         if (jsonNeat == null) {
             throw new JsonDiffException("Unable to find JsonNeat");
         }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`*/`
`12`	`12`	`public interface HandleFactory {`
`13`	`13`
`14`		`- JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath);`
	`14`	`+ JsonNeat<? extends JsonDiff> generate(TravelPath travelPath, JsonDiff expect, JsonDiff actual);`
`15`	`15`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`public class AlignArrayJsonDiff extends ComplexArrayJsonNeat {`
`16`	`16`
`17`		`- protected AlignArrayJsonDiff(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {`
	`17`	`+ public AlignArrayJsonDiff(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {`
`18`	`18`	`super(travelPath, expect, actual);`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ public Object getOther() {`
`22`	`22`
`23`	`23`	`@Override`
`24`	`24`	`public boolean isEquals(JsonDiffOther jsonDiffOther) {`
`25`		`- if (jsonDiffOther == null && object == null) {`
	`25`	`+ if (jsonDiffOther != null && jsonDiffOther.getOther() == null && object == null) {`
`26`	`26`	`return true;`
`27`	`27`	`}`
`28`		`- if (jsonDiffOther == null) {`
	`28`	`+ if (jsonDiffOther == null \|\| jsonDiffOther.getOther() == null) {`
`29`	`29`	`return false;`
`30`	`30`	`}`
`31`	`31`	`Object target = jsonDiffOther.getOther();`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ public FastJsonPrimitive(Object object) {`
`17`	`17`
`18`	`18`	`@Override`
`19`	`19`	`public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive) {`
`20`		`- if (jsonDiffPrimitive == null && object == null) {`
	`20`	`+ if (jsonDiffPrimitive != null && jsonDiffPrimitive.getTarget() == null && object == null) {`
`21`	`21`	`return true;`
`22`	`22`	`}`
`23`		`- if (jsonDiffPrimitive == null) {`
	`23`	`+ if (jsonDiffPrimitive == null \|\| jsonDiffPrimitive.getTarget() == null) {`
`24`	`24`	`return false;`
`25`	`25`	`}`
`26`	`26`	`Object target = jsonDiffPrimitive.getTarget();`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ public Object getOther() {`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public boolean isEquals(JsonDiffOther jsonDiffOther) {`
`26`		`- if (jsonDiffOther == null && object == null) {`
	`26`	`+ if (jsonDiffOther != null && jsonDiffOther.getOther() == null && object == null) {`
`27`	`27`	`return true;`
`28`	`28`	`}`
`29`		`- if (jsonDiffOther == null) {`
	`29`	`+ if (jsonDiffOther == null \|\| jsonDiffOther.getOther() == null) {`
`30`	`30`	`return false;`
`31`	`31`	`}`
`32`	`32`	`Object target = jsonDiffOther.getOther();`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ public FastJson2Primitive(Object object) {`
`17`	`17`
`18`	`18`	`@Override`
`19`	`19`	`public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive) {`
`20`		`- if (jsonDiffPrimitive == null && object == null) {`
	`20`	`+ if (jsonDiffPrimitive != null && jsonDiffPrimitive.getTarget() == null && object == null) {`
`21`	`21`	`return true;`
`22`	`22`	`}`
`23`		`- if (jsonDiffPrimitive == null) {`
	`23`	`+ if (jsonDiffPrimitive == null \|\| jsonDiffPrimitive.getTarget() == null) {`
`24`	`24`	`return false;`
`25`	`25`	`}`
`26`	`26`	`Object target = jsonDiffPrimitive.getTarget();`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static JsonDiff formatJsonDiff(Object value) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public static boolean isJavaPrimitive(Object value) {`
`31`		`- return value instanceof String \|\| value instanceof Integer \|\| value instanceof BigInteger \|\| value instanceof BigDecimal \|\| value instanceof Boolean \|\| value instanceof Double \|\| value instanceof Float \|\| value instanceof Long \|\| value instanceof Short \|\| value instanceof Byte \|\| value instanceof Character;`
	`31`	`+ return value == null \|\| value instanceof String \|\| value instanceof Integer \|\| value instanceof BigInteger \|\| value instanceof BigDecimal \|\| value instanceof Boolean \|\| value instanceof Double \|\| value instanceof Float \|\| value instanceof Long \|\| value instanceof Short \|\| value instanceof Byte \|\| value instanceof Character;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`}`