fix DuplicateKeyValueAsArray, for issue #1100

alibaba · Feb 8, 2023 · 1874faf · 1874faf
1 parent a7134cc
commit 1874faf
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReader.java b/core/src/main/java/com/alibaba/fastjson2/JSONReader.java
@@ -1560,10 +1560,10 @@ public void read(Map object, long features) {
                 if ((contextFeatures & JSONReader.Feature.DuplicateKeyValueAsArray.mask) != 0) {
                     if (origin instanceof Collection) {
                         ((Collection) origin).add(value);
-                        object.put(name, value);
+                        map.put(name, origin);
                     } else {
                         JSONArray array = JSONArray.of(origin, value);
-                        object.put(name, array);
+                        map.put(name, array);
                     }
                 }
             }
@@ -1611,7 +1611,7 @@ public void read(Map object, Type keyType, Type valueType, long features) {
                 if ((contextFeatures & JSONReader.Feature.DuplicateKeyValueAsArray.mask) != 0) {
                     if (origin instanceof Collection) {
                         ((Collection) origin).add(value);
-                        object.put(name, value);
+                        object.put(name, origin);
                     } else {
                         JSONArray array = JSONArray.of(origin, value);
                         object.put(name, array);

diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplMapString.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplMapString.java
@@ -65,7 +65,7 @@ public Object readObject(JSONReader jsonReader, Type fieldType, Object fieldName
                 if ((contextFeatures & JSONReader.Feature.DuplicateKeyValueAsArray.mask) != 0) {
                     if (origin instanceof Collection) {
                         ((Collection) origin).add(value);
-                        object.put(name, value);
+                        object.put(name, origin);
                     } else {
                         JSONArray array = JSONArray.of(origin, value);
                         object.put(name, array);

diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplMapTyped.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplMapTyped.java
@@ -341,7 +341,7 @@ public Object readObject(JSONReader jsonReader, Type fieldType, Object fieldName
                 if ((contextFeatures & JSONReader.Feature.DuplicateKeyValueAsArray.mask) != 0) {
                     if (origin instanceof Collection) {
                         ((Collection) origin).add(value);
-                        object.put(name, value);
+                        object.put(name, origin);
                     } else {
                         JSONArray array = JSONArray.of(origin, value);
                         object.put(name, array);

diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplObject.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderImplObject.java
@@ -232,7 +232,7 @@ public Object readObject(JSONReader jsonReader, Type fieldType, Object fieldName
                     if ((contextFeatures & JSONReader.Feature.DuplicateKeyValueAsArray.mask) != 0) {
                         if (origin instanceof Collection) {
                             ((Collection) origin).add(value);
-                            object.put(name, value);
+                            object.put(name, origin);
                         } else {
                             JSONArray array = JSONArray.of(origin, value);
                             object.put(name, array);

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_1000/Issue1100.java b/core/src/test/java/com/alibaba/fastjson2/issues_1000/Issue1100.java
@@ -0,0 +1,17 @@
+package com.alibaba.fastjson2.issues_1000;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONReader;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue1100 {
+    @Test
+    public void test() {
+        String str = "{\"a\":0,\"b\":1,\"b\":2,\"b\":3}";
+        JSONObject jsonObject = JSON.parseObject(str, JSONReader.Feature.DuplicateKeyValueAsArray);
+        assertEquals("[1,2,3]", jsonObject.get("b").toString());
+    }
+}