feature(json): 支持多个json框架

1. 支持多个json框架

Author: mini1798

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

@@ -1,5 +1,7 @@
 package me.codeleep.jsondiff.common.model;
 
+import me.codeleep.jsondiff.common.model.neat.JsonDiff;
+
 import java.util.HashMap;
 
 /**
@@ -36,12 +38,20 @@ public class Defects {
 
 
     public Defects setExpect(Object expect) {
-        this.expect = expect;
+        if (expect instanceof JsonDiff) {
+            this.expect = ((JsonDiff)expect).format();
+        } else {
+            this.expect = expect;
+        }
         return this;
     }
 
     public Defects setActual(Object actual) {
-        this.actual = actual;
+        if (actual instanceof JsonDiff) {
+            this.actual = ((JsonDiff)actual).format();
+        } else {
+            this.actual = actual;
+        }
         return this;
     }
 

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

@@ -6,4 +6,7 @@
  * @description:
  */
 public interface JsonDiff {
+
+    Object format();
+
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonArray.java

@@ -2,9 +2,12 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffArray;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 
 /**
  * @author: codeleep
@@ -51,4 +54,9 @@ public void add(Object item) {
     public void addAll(Collection<?> c) {
         jsonArray.addAll(c);
     }
+
+    @Override
+    public Object format() {
+        return JSON.to(ArrayList.class, jsonArray);
+    }
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonObject.java

@@ -2,8 +2,10 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffObject;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -43,4 +45,9 @@ public Set<String> keySet() {
         return this.jsonObject.keySet();
     }
 
+    @Override
+    public Object format() {
+        return JSON.to(HashMap.class, jsonObject);
+    }
+
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Array.java

@@ -1,10 +1,13 @@
 package me.codeleep.jsondiff.impl.fastjson2;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffArray;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 
 /**
  * @author: codeleep
@@ -51,4 +54,9 @@ public void add(Object item) {
     public void addAll(Collection<?> c) {
         jsonArray.addAll(c);
     }
+
+    @Override
+    public Object format() {
+        return JSON.to(ArrayList.class, jsonArray);
+    }
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Object.java

@@ -1,9 +1,12 @@
 package me.codeleep.jsondiff.impl.fastjson2;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffObject;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -43,4 +46,9 @@ public Set<String> keySet() {
         return this.jsonObject.keySet();
     }
 
+    @Override
+    public Object format() {
+        return JSON.to(HashMap.class, jsonObject);
+    }
+
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/gson/GsonArray.java

@@ -3,7 +3,9 @@
 import com.google.gson.*;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffArray;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @author: codeleep
@@ -55,7 +57,11 @@ public void add(Object item) {
 
     @Override
     public void addAll(Collection<?> cs) {
-        JsonArray jsonElements = new JsonArray();
         cs.forEach(this::add);
     }
+
+    @Override
+    public Object format() {
+        return gson.fromJson(jsonArray, ArrayList.class);
+    }
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/gson/GsonObject.java

@@ -1,10 +1,13 @@
 package me.codeleep.jsondiff.impl.gson;
 
+import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffObject;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -14,6 +17,8 @@
  */
 public class GsonObject implements JsonDiffObject {
 
+    private static final Gson gson = new Gson();
+
     private final JsonObject jsonObject;
 
     public GsonObject(JsonObject jsonObject) {
@@ -43,4 +48,9 @@ public Set<String> keySet() {
         return this.jsonObject.keySet();
     }
 
+    @Override
+    public Object format() {
+        return gson.fromJson(jsonObject, HashMap.class);
+    }
+
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonArray.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffArray;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -60,4 +61,9 @@ public void add(Object item) {
     public void addAll(Collection<?> cs) {
         cs.forEach(this::add);
     }
+
+    @Override
+    public Object format() {
+        return mapper.convertValue(jsonArray, ArrayList.class);
+    }
 }

json-diff-impl/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonObject.java

@@ -1,13 +1,11 @@
 package me.codeleep.jsondiff.impl.jackson;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffObject;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Spliterator;
-import java.util.Spliterators;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -18,6 +16,8 @@
  */
 public class JacksonObject implements JsonDiffObject {
 
+    private static final ObjectMapper mapper = new ObjectMapper();
+
     private final ObjectNode jsonObject;
 
     public JacksonObject(ObjectNode jsonObject) {
@@ -47,4 +47,9 @@ public Set<String> keySet() {
         return StreamSupport.stream(Spliterators.spliteratorUnknownSize(jsonObject.fieldNames(), Spliterator.ORDERED), false).collect(Collectors.toSet());
     }
 
+    @Override
+    public Object format() {
+        return mapper.convertValue(jsonObject, HashMap.class);
+    }
+
 }