fix-to(return): 格式化返回值

mini1798 · mini1798 · commit 1d804da30585 · 2024-04-13T14:34:52.000+08:00
diff --git a/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonArray.java b/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonArray.java
@@ -1,9 +1,11 @@
 package me.codeleep.jsondiff.impl.fastjson;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import me.codeleep.jsondiff.common.model.neat.JsonDiff;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffArray;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -47,7 +49,10 @@ public void addAll(Collection<?> c) {
 
     @Override
     public Object format() {
-        return String.valueOf(jsonArray);
+        if (jsonArray == null) {
+            return null;
+        }
+        return jsonArray.toJSONString();
     }
 
     @Override
diff --git a/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonObject.java b/json-diff-impl/json-diff-impl-fastjson/src/main/java/me/codeleep/jsondiff/impl/fastjson/FastJsonObject.java
@@ -5,6 +5,8 @@
 import me.codeleep.jsondiff.common.model.neat.JsonDiff;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffObject;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -39,7 +41,10 @@ public Set<String> keySet() {
 
     @Override
     public Object format() {
-        return JSON.toJSONString(jsonObject);
+        if (jsonObject == null) {
+            return null;
+        }
+        return jsonObject.toJSONString();
     }
 
     @Override
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
@@ -34,6 +34,9 @@ public boolean isEquals(JsonDiffOther jsonDiffOther) {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
         return String.valueOf(object);
     }
 
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
@@ -29,6 +29,9 @@ public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive)  {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
         return String.valueOf(object);
     }
 
diff --git a/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Array.java b/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Array.java
@@ -49,7 +49,10 @@ public void addAll(Collection<?> c) {
 
     @Override
     public Object format() {
-        return JSON.to(ArrayList.class, jsonArray);
+        if (jsonArray == null) {
+            return null;
+        }
+        return jsonArray.toJSONString();
     }
 
     @Override
diff --git a/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Object.java b/json-diff-impl/json-diff-impl-fastjson2/src/main/java/me/codeleep/jsondiff/impl/fastjson2/FastJson2Object.java
@@ -40,7 +40,10 @@ public Set<String> keySet() {
 
     @Override
     public Object format() {
-        return JSON.to(HashMap.class, jsonObject);
+        if (this.jsonObject == null) {
+            return null;
+        }
+        return jsonObject.toJSONString();
     }
 
     @Override
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
@@ -35,6 +35,9 @@ public boolean isEquals(JsonDiffOther jsonDiffOther) {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
         return String.valueOf(object);
     }
 
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
@@ -29,6 +29,9 @@ public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive) {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
         return String.valueOf(object);
     }
 
diff --git a/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonArray.java b/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonArray.java
@@ -65,7 +65,10 @@ public void addAll(Collection<?> cs) {
 
     @Override
     public Object format() {
-        return gson.fromJson(jsonArray, ArrayList.class);
+        if (jsonArray == null) {
+            return null;
+        }
+        return gson.toJson(jsonArray);
     }
 
     @Override
diff --git a/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonObject.java b/json-diff-impl/json-diff-impl-gson/src/main/java/me/codeleep/jsondiff/impl/gson/GsonObject.java
@@ -54,7 +54,10 @@ public Set<String> keySet() {
 
     @Override
     public Object format() {
-        return gson.fromJson(jsonObject, HashMap.class);
+        if (jsonObject == null) {
+            return null;
+        }
+        return gson.toJson(jsonObject);
     }
 
     @Override
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
@@ -1,5 +1,6 @@
 package me.codeleep.jsondiff.impl.gson;
 
+import com.google.gson.JsonPrimitive;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffOther;
 
 /**
@@ -17,6 +18,12 @@ public GsonOther(Object object) {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
+        if (object instanceof JsonPrimitive) {
+            return ((JsonPrimitive) object).getAsString();
+        }
         return String.valueOf(object);
     }
 
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
@@ -1,5 +1,6 @@
 package me.codeleep.jsondiff.impl.gson;
 
+import com.google.gson.JsonPrimitive;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffPrimitive;
 
 /**
@@ -17,6 +18,12 @@ public GsonPrimitive(Object object) {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
+        if (object instanceof JsonPrimitive) {
+            return ((JsonPrimitive) object).getAsString();
+        }
         return String.valueOf(object);
     }
 
diff --git a/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonArray.java b/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonArray.java
@@ -1,5 +1,6 @@
 package me.codeleep.jsondiff.impl.jackson;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -57,7 +58,14 @@ public void addAll(Collection<?> cs) {
 
     @Override
     public Object format() {
-        return mapper.convertValue(jsonArray, ArrayList.class);
+        if (jsonArray == null) {
+            return null;
+        }
+        try {
+            return mapper.writeValueAsString(jsonArray);
+        } catch (JsonProcessingException e) {
+            return null;
+        }
     }
 
     @Override
diff --git a/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonObject.java b/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonObject.java
@@ -1,5 +1,6 @@
 package me.codeleep.jsondiff.impl.jackson;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import me.codeleep.jsondiff.common.model.neat.JsonDiff;
@@ -42,7 +43,14 @@ public Set<String> keySet() {
 
     @Override
     public Object format() {
-        return mapper.convertValue(jsonObject, HashMap.class);
+        if (jsonObject == null) {
+            return null;
+        }
+        try {
+            return mapper.writeValueAsString(jsonObject);
+        } catch (JsonProcessingException e) {
+            return null;
+        }
     }
 
     @Override
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
@@ -1,5 +1,6 @@
 package me.codeleep.jsondiff.impl.jackson;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffOther;
 
 /**
@@ -17,6 +18,12 @@ public JacksonOther(Object object) {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
+        if (object instanceof JsonNode) {
+            return ((JsonNode)this.object).asText();
+        }
         return String.valueOf(object);
     }
 
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
@@ -1,5 +1,6 @@
 package me.codeleep.jsondiff.impl.jackson;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import me.codeleep.jsondiff.common.model.neat.JsonDiffPrimitive;
 
 /**
@@ -17,6 +18,12 @@ public JacksonPrimitive(Object object) {
 
     @Override
     public Object format() {
+        if (object == null || object instanceof String) {
+            return object;
+        }
+        if (object instanceof JsonNode) {
+            return ((JsonNode)this.object).asText();
+        }
         return String.valueOf(object);
     }
 
diff --git a/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonUtil.java b/json-diff-impl/json-diff-impl-jackson/src/main/java/me/codeleep/jsondiff/impl/jackson/JacksonUtil.java
@@ -18,7 +18,7 @@ public static JsonDiff formatJsonDiff(Object value) {
             return new JacksonArray((ArrayNode) value);
         }
         if (isJackPrimitive(value)) {
-            return new JacksonOther(value);
+            return new JacksonPrimitive(value);
         }
         return new JacksonOther(value);
     }
diff --git a/json-diff-test/pom.xml b/json-diff-test/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>cn.xiaoandcai</groupId>
-            <artifactId>json-diff-impl-gson</artifactId>
+            <artifactId>json-diff-impl-jackson</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ public boolean isEquals(JsonDiffOther jsonDiffOther) {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public Object format() {`
	`37`	`+ if (object == null \|\| object instanceof String) {`
	`38`	`+ return object;`
	`39`	`+ }`
`37`	`40`	`return String.valueOf(object);`
`38`	`41`	`}`
`39`	`42`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ public boolean isEquals(JsonDiffPrimitive jsonDiffPrimitive) {`
`29`	`29`
`30`	`30`	`@Override`
`31`	`31`	`public Object format() {`
	`32`	`+ if (object == null \|\| object instanceof String) {`
	`33`	`+ return object;`
	`34`	`+ }`
`32`	`35`	`return String.valueOf(object);`
`33`	`36`	`}`
`34`	`37`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ public boolean isEquals(JsonDiffOther jsonDiffOther) {`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public Object format() {`
	`38`	`+ if (object == null \|\| object instanceof String) {`
	`39`	`+ return object;`
	`40`	`+ }`
`38`	`41`	`return String.valueOf(object);`
`39`	`42`	`}`
`40`	`43`