重新定义接口

Author: mini1798

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/JsonCompareResult.java

@@ -16,6 +16,8 @@ public class JsonCompareResult {
      */
     private Boolean match = true;
 
+    private Boolean diffed = false;
+
     /**
      * 差异列表
      */
@@ -35,6 +37,7 @@ public boolean isMatch(){
      * @return 返回是否添加成功
      */
     public boolean addDefects(Defects defects) {
+        diffed = true;
         if(defectsList == null) {
             defectsList = new ArrayList<>();
         }
@@ -46,6 +49,7 @@ public boolean addDefects(Defects defects) {
     }
 
     public void mergeDefects(List<Defects> defectsList) {
+        diffed = true;
         if (defectsList == null || defectsList.size() == 0) {
             return;
         }
@@ -65,6 +69,11 @@ public List<Defects> getDefectsList() {
     }
 
     public void setDefectsList(List<Defects> defectsList) {
+        diffed = true;
         this.defectsList = defectsList;
     }
+
+    public Boolean getDiffed() {
+        return diffed;
+    }
 }

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/neat/ArrayJsonNeat.java

@@ -9,4 +9,6 @@ public interface JsonDiff {
 
     Object format();
 
+    boolean isLeaf();
+
 }

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/neat/JsonDiff.java

@@ -15,22 +15,19 @@ public interface JsonDiffArray extends JsonDiff{
      */
     int size();
 
-
-
     /**
      * 获取key对应的值
      * @param index 索引
      * @return 值
      */
-    Object get(int index);
+    JsonDiff get(int index);
 
     /**
      * 添加元素
      * @param item 元素
      */
     void add(Object item);
 
-
     void addAll(Collection<?> c);
 
 }

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/neat/JsonDiffArray.java

@@ -14,7 +14,7 @@ public interface JsonDiffObject extends JsonDiff{
      * @param key key
      * @return 值
      */
-    Object get(String key);
+    JsonDiff get(String key);
 
 
     /**

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/neat/JsonDiffObject.java

@@ -0,0 +1,14 @@
+package me.codeleep.jsondiff.common.model.neat;
+
+/**
+ * @author: codeleep
+ * @createTime: 2024/04/11 上午11:06
+ * @description: other
+ */
+public interface JsonDiffOther extends JsonDiff{
+
+    Object getOther();
+
+    boolean isEquals(JsonDiff jsonDiff);
+
+}

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/neat/JsonDiffOther.java

@@ -0,0 +1,12 @@
+package me.codeleep.jsondiff.common.model.neat;
+
+/**
+ * @author: codeleep
+ * @createTime: 2024/04/11 上午9:50
+ * @description: 基础数据
+ */
+public interface JsonDiffPrimitive extends JsonDiff {
+
+    boolean isEquals(JsonDiff jsonDiff);
+
+}

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/neat/JsonDiffPrimitive.java

@@ -8,9 +8,18 @@
  * @createTime: 2023/02/19 19:14
  * @description:
  */
-public interface JsonNeat {
-    JsonCompareResult diff(JsonDiffArray expect, JsonDiffArray actual, TravelPath travelPath);
-    JsonCompareResult diff(JsonDiffObject expect, JsonDiffObject actual, TravelPath travelPath);
-    JsonCompareResult diff(Object expect, Object actual, TravelPath travelPath);
+public interface JsonNeat<T extends JsonDiff> {
+
+    JsonCompareResult diff();
+
+    int leaf();
+
+    JsonCompareResult getResult();
+
+    TravelPath getTravelPath();
+
+    T getExpectJsonDiff();
+
+    T getActualJsonDiff();
 
 }