From 05a5c5b77dab8bb474ea4422a31711c9fa18ee99 Mon Sep 17 00:00:00 2001
From: lilanlong <356105485@qq.com>
Date: Tue, 23 Jul 2024 13:48:01 +0800
Subject: [PATCH] feat: JSON Object of method adds dynamic parameters (#2824)

* feat: JSON Object of method adds dynamic parameters

* Add unit testing
---
 .../com/alibaba/fastjson2/JSONObject.java     | 83 +++++++++++++++++++
 .../alibaba/fastjson2/JSONObjectTest3.java    |  2 +
 2 files changed, 85 insertions(+)

diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONObject.java b/core/src/main/java/com/alibaba/fastjson2/JSONObject.java
index b5317fd233..eff470fffe 100644
--- a/core/src/main/java/com/alibaba/fastjson2/JSONObject.java
+++ b/core/src/main/java/com/alibaba/fastjson2/JSONObject.java
@@ -23,6 +23,8 @@
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static com.alibaba.fastjson2.JSONWriter.Feature.*;
 import static com.alibaba.fastjson2.util.BeanUtils.getAnnotations;
@@ -2017,6 +2019,87 @@ public static JSONObject of(
         return object;
     }
 
+    /**
+     * Pack multiple key-value pairs as {@link JSONObject}
+     *
+     * <pre>
+     * JSONObject jsonObject = JSONObject.of("key1", "value1", "key2", "value2", "key3", "value3", "key4", "value4", "key5", "value5", kvArray);
+     * </pre>
+     *
+     * @param k1 first key
+     * @param v1 first value
+     * @param k2 second key
+     * @param v2 second value
+     * @param k3 third key
+     * @param v3 third value
+     * @param k4 four key
+     * @param v4 four value
+     * @param k5 five key
+     * @param v5 five value
+     * @param kvArray multiple key-value
+     * @since 2.0.53
+     */
+    public static JSONObject of(
+            String k1,
+            Object v1,
+            String k2,
+            Object v2,
+            String k3,
+            Object v3,
+            String k4,
+            Object v4,
+            String k5,
+            Object v5,
+            Object... kvArray
+
+    ) {
+        JSONObject object = new JSONObject(5);
+        object.put(k1, v1);
+        object.put(k2, v2);
+        object.put(k3, v3);
+        object.put(k4, v4);
+        object.put(k5, v5);
+        if (kvArray != null && kvArray.length > 0) {
+            of(object, kvArray);
+        }
+        return object;
+    }
+
+    /**
+     * Pack multiple key-value pairs as {@link JSONObject}
+     *
+     * <pre>
+     * JSONObject jsonObject = JSONObject.of(Object... kvArray);
+     * </pre>
+     *
+     * @param kvArray key-value
+     * @since 2.0.53
+     */
+    private static JSONObject of(JSONObject object, Object... kvArray) {
+        if (kvArray == null || kvArray.length <= 0) {
+            throw new JSONException("The kvArray cannot be empty");
+        }
+        int kvArrayLength = kvArray.length;
+        if ((kvArrayLength & 1) == 1) {
+            throw new JSONException("The length of kvArray cannot be odd");
+        }
+        List<Object> keyList = IntStream.range(0, kvArrayLength).filter(i -> i % 2 == 0).mapToObj(i -> kvArray[i]).collect(Collectors.toList());
+        keyList.forEach(key -> {
+            if (key == null || !(key instanceof String)) {
+                throw new JSONException("The value corresponding to the even bit index of kvArray is key, which cannot be null and must be of type string");
+            }
+        });
+        List<Object> distinctKeyList = keyList.stream().distinct().collect(Collectors.toList());
+        if (keyList.size() != distinctKeyList.size()) {
+            throw new JSONException("The value corresponding to the even bit index of kvArray is key and cannot be duplicated");
+        }
+        List<Object> valueList = IntStream.range(0, kvArrayLength).filter(i -> i % 2 != 0).mapToObj(i -> kvArray[i]).collect(Collectors.toList());
+        for (int i = 0; i < keyList.size(); i++) {
+            object.put(keyList.get(i).toString(), valueList.get(i));
+        }
+        return object;
+    }
+
     /**
      * See {@link JSON#parseObject} for details
      */
diff --git a/core/src/test/java/com/alibaba/fastjson2/JSONObjectTest3.java b/core/src/test/java/com/alibaba/fastjson2/JSONObjectTest3.java
index 7e03a73039..ee4fb6a543 100644
--- a/core/src/test/java/com/alibaba/fastjson2/JSONObjectTest3.java
+++ b/core/src/test/java/com/alibaba/fastjson2/JSONObjectTest3.java
@@ -88,6 +88,8 @@ public void of() {
         assertEquals(3, JSONObject.of("k0", 0, "k1", 1, "k2", 2).size());
         assertEquals(4, JSONObject.of("k0", 0, "k1", 1, "k2", 2, "k3", 3).size());
         assertEquals(5, JSONObject.of("k0", 0, "k1", 1, "k2", 2, "k3", 3, "k4", 4).size());
+        assertEquals(6, JSONObject.of("k0", 0, "k1", 1, "k2", 2, "k3", 3, "k4", 4, "k5", 5).size());
+        assertEquals(7, JSONObject.of("k0", 0, "k1", 1, "k2", 2, "k3", 3, "k4", 4, "k5", 5, "k6", 6).size());
     }
 
     @Test