support float/double/BigDecimal/BigInteger sum

Author: wenshao

core/src/main/java/com/alibaba/fastjson2/JSONPathSegment.java

@@ -11,6 +11,8 @@
 import com.alibaba.fastjson2.writer.ObjectWriterProvider;
 
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
@@ -1745,6 +1747,21 @@ static Number add(Number a, Number b) {
             if (aIsInt && bIsInt) {
                 return a.longValue() + b.longValue();
             }
+
+            boolean aIsDouble = a instanceof Float || a instanceof Double;
+            boolean bIsDouble = b instanceof Float || b instanceof Double;
+            if (aIsDouble || bIsDouble) {
+                return a.doubleValue() + b.doubleValue();
+            }
+
+            if (a instanceof BigDecimal || b instanceof BigDecimal) {
+                return TypeUtils.toBigDecimal(a).add(TypeUtils.toBigDecimal(b));
+            }
+
+            if (a instanceof BigInteger || b instanceof BigInteger) {
+                return TypeUtils.toBigInteger(a).add(TypeUtils.toBigInteger(b));
+            }
+
             throw new JSONException("not support operation");
         }
 

core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterImplDouble.java

@@ -31,8 +31,16 @@ public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type f
             return;
         }
 
-        if (format != null) {
-            String str = format.format(object);
+        DecimalFormat decimalFormat = this.format;
+        if (decimalFormat == null) {
+            String format = jsonWriter.getContext().getDateFormat();
+            if (format != null && format.indexOf("#") != -1) {
+                decimalFormat = new DecimalFormat(format);
+            }
+        }
+
+        if (decimalFormat != null) {
+            String str = decimalFormat.format(object);
             jsonWriter.writeRaw(str);
             return;
         }

core/src/test/java/com/alibaba/fastjson2/issues_2000/Issue2065.java

@@ -0,0 +1,59 @@
+package com.alibaba.fastjson2.issues_2000;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONPath;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue2065 {
+    @Test
+    public void multiClassSum() {
+        JSONObject json = new JSONObject();
+        JSONArray jsonArr = new JSONArray();
+        jsonArr.add(new JSONObject().fluentPut("price", 10L));
+        jsonArr.add(new JSONObject().fluentPut("price", 10.1f));
+        jsonArr.add(new JSONObject().fluentPut("price", 10.1d));
+        jsonArr.add(new JSONObject().fluentPut("price", BigInteger.valueOf(10L)));
+        jsonArr.add(new JSONObject().fluentPut("price", BigDecimal.valueOf(10.1d)));
+
+        json.put("arr", jsonArr);
+        Object o = JSONPath.eval(json, "$.arr[*].price.sum()");
+
+        assertEquals(JSON.toJSONString(o, "##.#"), "50.3");
+    }
+
+    @Test
+    public void multiClassSum1() {
+        JSONObject json = new JSONObject();
+        JSONArray jsonArr = new JSONArray();
+        jsonArr.add(new JSONObject().fluentPut("price", 10L));
+        jsonArr.add(new JSONObject().fluentPut("price", BigInteger.valueOf(10L)));
+
+        json.put("arr", jsonArr);
+        // 这一步eval会提示 not support operation 。
+        // 原因是 com.alibaba.fastjson2.JSONPathSegment$SumSegment#add方法类型判断不够全面,无法支持Float，Double，BigInteger,BigDecimal
+        Object o = JSONPath.eval(json, "$.arr[*].price.sum()");
+
+        assertEquals(JSON.toJSONString(o, "##.#"), "20");
+    }
+
+    @Test
+    public void integerSum() {
+        JSONObject json = new JSONObject();
+        JSONArray jsonArr = new JSONArray();
+        jsonArr.add(new JSONObject().fluentPut("price", 10L));
+        jsonArr.add(new JSONObject().fluentPut("price", 10L));
+
+        json.put("arr", jsonArr);
+        //由于此时 price都是long类型sum正常
+        Object o = JSONPath.eval(json, "$.arr[*].price.sum()");
+
+        assertEquals(o.toString(), "20");
+    }
+}