fix-to(params): 统一参数顺序

mini1798 · mini1798 · commit fb2e32e19ac9 · 2024-04-13T13:24:17.000+08:00
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
@@ -18,20 +18,20 @@
  */
 public class AbstractHandleFactory implements HandleFactory{
     @Override
-    public JsonNeat<? extends JsonDiff> generate(JsonDiff actual, JsonDiff expect, TravelPath travelPath) {
+    public JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath) {
         if (!ClassUtil.isSameClass(expect, actual)) {
             return null;
         }
         // TODO 返回系统默认处理器
         if (expect instanceof JsonDiffObject && actual instanceof JsonDiffObject) {
-            return new ComplexObjectJsonNeat(travelPath, actual, expect);
+            return new ComplexObjectJsonNeat(travelPath, expect, actual);
         }
         if (expect instanceof JsonDiffArray && actual instanceof JsonDiffArray) {
-            return new ComplexArrayJsonNeat(travelPath, actual, expect);
+            return new ComplexArrayJsonNeat(travelPath, expect, actual);
         }
         if (expect.isLeaf() && actual.isLeaf()) {
-            return new ComplexPrimitiveJsonNeat(travelPath, actual, expect);
+            return new ComplexPrimitiveJsonNeat(travelPath, expect, actual);
         }
-        return new ComplexOtherJsonNeat(travelPath, actual, expect);
+        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 actual, JsonDiff expect, TravelPath travelPath);
+    JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath);
 
 }
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java
@@ -19,9 +19,9 @@ public abstract class AbstractArrayJsonNeat<T extends JsonDiffArray> extends Abs
 
     protected final JsonDiffArray expect;
 
-    protected AbstractArrayJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
+    protected AbstractArrayJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
         super(travelPath);
-        if (!(actual instanceof JsonDiffArray) || !(expect instanceof JsonDiffArray)) {
+        if (!(expect instanceof JsonDiffArray) || !(actual instanceof JsonDiffArray)) {
             throw new IllegalArgumentException("Parameter type error, actual and expect must be JsonDiffArray");
         }
         this.actual = (JsonDiffArray) 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
@@ -19,8 +19,8 @@
  */
 public class ComplexArrayJsonNeat extends AbstractArrayJsonNeat<JsonDiffArray> {
 
-    public ComplexArrayJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
-        super(travelPath, actual, expect);
+    public ComplexArrayJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        super(travelPath, expect, actual);
     }
 
     protected JsonCompareResult ignoreOrder(JsonDiffArray expect, JsonDiffArray actual) {
@@ -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(actual.get(actualIndex), expect.get(expectIndex), nextTravelPath);
+                JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate( expect.get(expectIndex), actual.get(actualIndex), nextTravelPath);
                 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(actualItem, expectItem, nextTravelPath);
+                JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expectItem, actualItem, nextTravelPath);
                 // 类型不一致
                 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(actualItem, expectItem, nextTravelPath);
+            JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expectItem, actualItem, nextTravelPath);
             // 类型不一致
             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,8 +14,8 @@
  */
 public class AlignArrayJsonDiff extends ComplexArrayJsonNeat {
 
-    protected AlignArrayJsonDiff(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
-        super(travelPath, actual, expect);
+    protected AlignArrayJsonDiff(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        super(travelPath, expect, actual);
     }
 
     @Override
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/AbstractObjectJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/AbstractObjectJsonNeat.java
@@ -18,9 +18,9 @@ public abstract class AbstractObjectJsonNeat<T extends JsonDiffObject> extends A
 
     protected final JsonDiffObject expect;
 
-    protected AbstractObjectJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
+    protected AbstractObjectJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
         super(travelPath);
-        if (!(actual instanceof JsonDiffObject) || !(expect instanceof JsonDiffObject)) {
+        if (!(expect instanceof JsonDiffObject) || !(actual instanceof JsonDiffObject)) {
             throw new IllegalArgumentException("Parameter type error, actual and expect must be JsonDiffObject");
         }
         this.actual = (JsonDiffObject) 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
@@ -31,8 +31,8 @@ public class ComplexObjectJsonNeat extends AbstractObjectJsonNeat<JsonDiffObject
      */
     private final List<MappingKey> keyMap = new ArrayList<>();
 
-    public ComplexObjectJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
-        super(travelPath, actual, expect);
+    public ComplexObjectJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        super(travelPath, expect, actual);
     }
 
     /**
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/other/AbstractOtherJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/other/AbstractOtherJsonNeat.java
@@ -20,9 +20,9 @@ public abstract class AbstractOtherJsonNeat<T extends JsonDiffOther> extends Abs
 
     protected final JsonDiffOther expect;
 
-    protected AbstractOtherJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
+    protected AbstractOtherJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
         super(travelPath);
-        if (!(actual instanceof JsonDiffOther) || !(expect instanceof JsonDiffOther)) {
+        if (!(expect instanceof JsonDiffOther) || !(actual instanceof JsonDiffOther)) {
             throw new IllegalArgumentException("Parameter type error, actual and expect must be JsonDiffOther");
         }
         this.actual = (JsonDiffOther) actual;
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/other/ComplexOtherJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/other/ComplexOtherJsonNeat.java
@@ -17,8 +17,8 @@
  */
 public class ComplexOtherJsonNeat extends AbstractOtherJsonNeat<JsonDiffOther> {
 
-    public ComplexOtherJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
-        super(travelPath, actual, expect);
+    public ComplexOtherJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        super(travelPath, expect, actual);
     }
 
     @Override
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/primitive/AbstractPrimitiveJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/primitive/AbstractPrimitiveJsonNeat.java
@@ -4,7 +4,6 @@
 import me.codeleep.jsondiff.common.model.JsonCompareResult;
 import me.codeleep.jsondiff.common.model.TravelPath;
 import me.codeleep.jsondiff.common.model.neat.JsonDiff;
-import me.codeleep.jsondiff.common.model.neat.JsonDiffObject;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffPrimitive;
 import me.codeleep.jsondiff.core.handle.AbstractJsonNeat;
 
@@ -19,9 +18,9 @@ public abstract class AbstractPrimitiveJsonNeat<T extends JsonDiffPrimitive> ext
 
     protected final JsonDiffPrimitive expect;
 
-    protected AbstractPrimitiveJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
+    protected AbstractPrimitiveJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
         super(travelPath);
-        if (!(actual instanceof JsonDiffPrimitive) || !(expect instanceof JsonDiffPrimitive)) {
+        if (!(expect instanceof JsonDiffPrimitive) || !(actual instanceof JsonDiffPrimitive)) {
             throw new IllegalArgumentException("Parameter type error, actual and expect must be JsonDiffPrimitive");
         }
         this.actual = (JsonDiffPrimitive) actual;
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/primitive/ComplexPrimitiveJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/primitive/ComplexPrimitiveJsonNeat.java
@@ -17,8 +17,8 @@
  */
 public class ComplexPrimitiveJsonNeat extends AbstractPrimitiveJsonNeat<JsonDiffPrimitive> {
 
-    public ComplexPrimitiveJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {
-        super(travelPath, actual, expect);
+    public ComplexPrimitiveJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {
+        super(travelPath, expect, actual);
     }
 
     @Override
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
@@ -0,0 +1,32 @@
+package me.codeleep.jsondiff.test;
+
+import com.alibaba.fastjson2.JSON;
+import me.codeleep.jsondiff.DefaultJsonDifference;
+import me.codeleep.jsondiff.common.model.JsonCompareResult;
+import me.codeleep.jsondiff.core.config.JsonComparedOption;
+import org.testng.annotations.Test;
+
+import java.util.HashSet;
+
+/**
+ * @author: codeleep
+ * @createTime: 2024/04/12 上午10:22
+ * @description:
+ */
+public class SimpleTest {
+
+    @Test
+    public void test1() {
+        String expect = "{\"name\":\"baron\",\"age\":12}";
+        String actual = "{\"name\":\"baron\"}";
+
+        HashSet<String> ignorePath = new HashSet<>();
+        ignorePath.add("$.age");
+
+        JsonComparedOption jsonComparedOption = new JsonComparedOption().setIgnoreOrder(true).setIgnorePath(ignorePath);
+        JsonCompareResult jsonCompareResult = new DefaultJsonDifference()
+                .option(jsonComparedOption)
+                .detectDiff(expect, actual);
+        System.out.printf(JSON.toJSONString(jsonCompareResult));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -18,20 +18,20 @@`
`18`	`18`	`*/`
`19`	`19`	`public class AbstractHandleFactory implements HandleFactory{`
`20`	`20`	`@Override`
`21`		`- public JsonNeat<? extends JsonDiff> generate(JsonDiff actual, JsonDiff expect, TravelPath travelPath) {`
	`21`	`+ public JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath) {`
`22`	`22`	`if (!ClassUtil.isSameClass(expect, actual)) {`
`23`	`23`	`return null;`
`24`	`24`	`}`
`25`	`25`	`// TODO 返回系统默认处理器`
`26`	`26`	`if (expect instanceof JsonDiffObject && actual instanceof JsonDiffObject) {`
`27`		`- return new ComplexObjectJsonNeat(travelPath, actual, expect);`
	`27`	`+ return new ComplexObjectJsonNeat(travelPath, expect, actual);`
`28`	`28`	`}`
`29`	`29`	`if (expect instanceof JsonDiffArray && actual instanceof JsonDiffArray) {`
`30`		`- return new ComplexArrayJsonNeat(travelPath, actual, expect);`
	`30`	`+ return new ComplexArrayJsonNeat(travelPath, expect, actual);`
`31`	`31`	`}`
`32`	`32`	`if (expect.isLeaf() && actual.isLeaf()) {`
`33`		`- return new ComplexPrimitiveJsonNeat(travelPath, actual, expect);`
	`33`	`+ return new ComplexPrimitiveJsonNeat(travelPath, expect, actual);`
`34`	`34`	`}`
`35`		`- return new ComplexOtherJsonNeat(travelPath, actual, expect);`
	`35`	`+ return new ComplexOtherJsonNeat(travelPath, expect, actual);`
`36`	`36`	`}`
`37`	`37`	`}`
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 actual, JsonDiff expect, TravelPath travelPath);`
	`14`	`+ JsonNeat<? extends JsonDiff> generate(JsonDiff expect, JsonDiff actual, TravelPath travelPath);`
`15`	`15`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`*/`
`15`	`15`	`public class AlignArrayJsonDiff extends ComplexArrayJsonNeat {`
`16`	`16`
`17`		`- protected AlignArrayJsonDiff(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {`
`18`		`- super(travelPath, actual, expect);`
	`17`	`+ protected AlignArrayJsonDiff(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {`
	`18`	`+ super(travelPath, expect, actual);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public class ComplexObjectJsonNeat extends AbstractObjectJsonNeat<JsonDiffObject`
`31`	`31`	`*/`
`32`	`32`	`private final List<MappingKey> keyMap = new ArrayList<>();`
`33`	`33`
`34`		`- public ComplexObjectJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {`
`35`		`- super(travelPath, actual, expect);`
	`34`	`+ public ComplexObjectJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {`
	`35`	`+ super(travelPath, expect, actual);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`*/`
`18`	`18`	`public class ComplexOtherJsonNeat extends AbstractOtherJsonNeat<JsonDiffOther> {`
`19`	`19`
`20`		`- public ComplexOtherJsonNeat(TravelPath travelPath, JsonDiff actual, JsonDiff expect) {`
`21`		`- super(travelPath, actual, expect);`
	`20`	`+ public ComplexOtherJsonNeat(TravelPath travelPath, JsonDiff expect, JsonDiff actual) {`
	`21`	`+ super(travelPath, expect, actual);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`