feature(frame): 支持多json框架

1. 支持多json框架

Author: mini1798

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

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

@@ -9,6 +9,6 @@ public interface JsonDiffOther extends JsonDiff{
 
     Object getOther();
 
-    boolean isEquals(JsonDiff jsonDiff);
+    boolean isEquals(JsonDiffOther jsonDiffOther);
 
 }

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

@@ -7,6 +7,8 @@
  */
 public interface JsonDiffPrimitive extends JsonDiff {
 
-    boolean isEquals(JsonDiff jsonDiff);
+    boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive);
+
+    Object getTarget();
 
 }

json-diff-core/src/main/java/me/codeleep/jsondiff/core/DefaultJsonDifference.java

@@ -23,7 +23,7 @@ public JsonCompareResult detectDiff(String expect, String actual) {
         JsonDiff actualJson = JsonDiffBuilder.buildObject(actual);
 
         TravelPath travelPath = new TravelPath(PATH_ROOT);
-        JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(expectJson, actualJson, travelPath);
+        JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(actualJson, expectJson, travelPath);
         if (jsonNeat == null) {
             throw new JsonDiffException("无法找到适配比较器");
         }

json-diff-core/src/main/java/me/codeleep/jsondiff/core/config/JsonComparedOption.java

@@ -35,11 +35,6 @@ public class JsonComparedOption {
      */
     private HashSet<String> ignoreKey;
 
-    /**
-     * 强制使用系统默认比较器
-     */
-    private Boolean mandatoryDefaultNeat = false;
-
     /**
      * 默认的比较器工厂
      */
@@ -95,14 +90,6 @@ public HashSet<String> getIgnoreKey() {
         return ignoreKey;
     }
 
-    public boolean isMandatoryDefaultNeat() {
-        return mandatoryDefaultNeat;
-    }
-
-    public void setMandatoryDefaultNeat(boolean mandatoryDefaultNeat) {
-        this.mandatoryDefaultNeat = mandatoryDefaultNeat;
-    }
-
     public HandleFactory getJsonNeatFactory() {
         return jsonNeatFactory;
     }

json-diff-core/src/main/java/me/codeleep/jsondiff/core/config/JsonDiffOption.java

@@ -24,8 +24,6 @@ public class JsonDiffOption {
      */
     private static ImplType defaultJsonFramework = ImplType.detectJsonParser();
 
-
-
     public static JsonComparedOption getGloballyUniqueOption() {
         if (globallyUniqueOption == null) {
             return new JsonComparedOption();

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(JsonDiff actual, JsonDiff expect, TravelPath travelPath);
 
 }

json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java

@@ -107,11 +107,11 @@ protected JsonCompareResult diff1() {
                 continue;
             }
 
-            Object expectDiffJson = expect.get(mappingKey.getExpectKey());
-            Object actualDiffJson = actual.get(mappingKey.getActualKey());
+            JsonDiff expectDiffJson = expect.get(mappingKey.getExpectKey());
+            JsonDiff actualDiffJson = actual.get(mappingKey.getActualKey());
             TravelPath nextTravelPath = new TravelPath(travelPath, mappingKey);
             // 判断类型, 根据类型去实例化JsonNeat。
-            JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(actual, expect, nextTravelPath);
+            JsonNeat<? extends JsonDiff> jsonNeat = RunTimeDataFactory.getOptionInstance().getJsonNeatFactory().generate(actualDiffJson, expectDiffJson, nextTravelPath);
             if (jsonNeat == null) {
                 Defects defects = new Defects()
                         .setActual(actualDiffJson)

json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/other/ComplexOtherJsonNeat.java

@@ -42,7 +42,7 @@ protected JsonCompareResult diff1() {
                 .setActual(actual)
                 .setExpect(expect)
                 .setTravelPath(travelPath)
-                .setIllustrateTemplate(DATA_INCONSISTENT, String.valueOf(expect), String.valueOf(actual));
+                .setIllustrateTemplate(DATA_INCONSISTENT, String.valueOf(expect.format()), String.valueOf(actual.format()));
         result.addDefects(defects);
         return result;
     }

json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/primitive/ComplexPrimitiveJsonNeat.java

@@ -42,7 +42,7 @@ protected JsonCompareResult diff1() {
                 .setActual(actual)
                 .setExpect(expect)
                 .setTravelPath(travelPath)
-                .setIllustrateTemplate(DATA_INCONSISTENT, String.valueOf(expect), String.valueOf(actual));
+                .setIllustrateTemplate(DATA_INCONSISTENT, String.valueOf(expect.format()), String.valueOf(actual.format()));
         result.addDefects(defects);
         return result;
     }