fix Set deserialize error, for issue #1417

alibaba · May 13, 2023 · 76415d5 · 76415d5
1 parent 08f3fa6
commit 76415d5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReader.java b/core/src/main/java/com/alibaba/fastjson2/JSONReader.java
@@ -1927,6 +1927,13 @@ public Map<String, Object> readObject() {
                     } else {
                         throw new JSONException(info("illegal input " + ch));
                     }
+                case 'S':
+                    if (nextIfSet()) {
+                        val = read(Set.class);
+                        break;
+                    } else {
+                        throw new JSONException(info("illegal input " + ch));
+                    }
                 default:
                     throw new JSONException(info("illegal input " + ch));
             }

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_1000/Issue1417.java b/core/src/test/java/com/alibaba/fastjson2/issues_1000/Issue1417.java
@@ -0,0 +1,21 @@
+package com.alibaba.fastjson2.issues_1000;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONReader;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue1417 {
+    @Test
+    public void test() {
+        String str = "{\"value\":Set[1]}";
+        JSONReader jsonReader = JSONReader.of(str);
+        Map<String, Object> object = jsonReader.readObject();
+        Set value = (Set) object.get("value");
+        assertEquals("[1]", JSON.toJSONString(value));
+    }
+}