Refactor: Correct the data types of elements within Map<String, Object> and List<Object>

samurai00 · samurai00 · commit 176106dd5b49 · 2024-11-27T15:17:26.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 2.5.2
+
+- 修改: 正确 `Map<String, Object>` 以及 `List<Object>` 内的元素类型
+
 ## 2.5.0
 
 - 新增: 响应签名验签
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ mavenCentral
 <dependency>
     <groupId>com.pingxx</groupId>
     <artifactId>pingpp-java</artifactId>
-    <version>2.4.1</version>
+    <version>2.5.2</version>
     <type>jar</type>
 </dependency>
 ```
@@ -56,7 +56,7 @@ repositories {
 安装 Ping++ SDK
 
 ```
-implementation 'com.pingxx:pingpp-java:2.4.1'
+implementation 'com.pingxx:pingpp-java:2.5.2'
 ```
 
 ## 初始化
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0
+2.5.2
diff --git a/build.gradle b/build.gradle
@@ -10,13 +10,3 @@ allprojects {
     }
     apply plugin: 'java'
 }
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-dependencies {
-    implementation 'com.google.code.gson:gson:2.10'
-    implementation 'commons-codec:commons-codec:1.17.0'
-
-    testImplementation 'junit:junit:4.13.2'
-}
diff --git a/example/build.gradle b/example/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     // 方法 1. 本地文件系统依赖
     // implementation fileTree(dir: 'lib', includes: ['*jar'])
     // 方法 2. 仓库依赖
-    // implementation 'com.pingxx:pingpp-sdk:1.2.0'
+    //  implementation 'com.pingxx:pingpp-java:2.5.2'
     // 方法 3.模块依赖
     implementation project(':pingpp-sdk')
 }
diff --git a/pingpp-sdk/build.gradle b/pingpp-sdk/build.gradle
@@ -13,6 +13,9 @@ plugins {
     id "java"
 }
 
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
 configurations {
     compileOnly {
         extendsFrom annotationProcessor
diff --git a/pingpp-sdk/pom.xml b/pingpp-sdk/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.pingxx</groupId>
   <artifactId>pingpp-java</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2</version>
   <packaging>jar</packaging>
 
   <description>A Java SDK for Ping++ Payment API.</description>
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/Pingpp.java b/pingpp-sdk/src/main/java/com/pingplusplus/Pingpp.java
@@ -17,7 +17,7 @@ public abstract class Pingpp {
     /**
      * version
      */
-    public static final String VERSION = "2.5.0";
+    public static final String VERSION = "2.5.2";
     /**
      * api key
      */
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/net/APIResource.java b/pingpp-sdk/src/main/java/com/pingplusplus/net/APIResource.java
@@ -3,9 +3,9 @@
 import com.google.gson.*;
 import com.pingplusplus.Pingpp;
 import com.pingplusplus.exception.*;
-import com.pingplusplus.exception.InvalidRequestException;
 import com.pingplusplus.model.*;
 import com.pingplusplus.serializer.*;
+import com.pingplusplus.util.GsonUtils;
 
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
@@ -41,8 +41,7 @@ protected enum RequestMethod {
     /**
      * Gson object use to transform json string to resource object
      */
-    public static final Gson GSON = new GsonBuilder()
-            .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+    public static final Gson GSON = GsonUtils.baseGsonBuilder()
             .registerTypeAdapter(Charge.class, new ChargeDeserializer())
             .registerTypeAdapter(RedEnvelope.class, new RedEnvelopeDeserializer())
             .registerTypeAdapter(Transfer.class, new TransferDeserializer())
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/serializer/ChargeDeserializer.java b/pingpp-sdk/src/main/java/com/pingplusplus/serializer/ChargeDeserializer.java
@@ -1,8 +1,6 @@
 package com.pingplusplus.serializer;
 
-import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -11,6 +9,7 @@
 import com.pingplusplus.model.App;
 import com.pingplusplus.model.Charge;
 import com.pingplusplus.model.ChargeRefundCollection;
+import com.pingplusplus.util.GsonUtils;
 
 import java.lang.reflect.Type;
 
@@ -20,40 +19,41 @@
 public class ChargeDeserializer implements JsonDeserializer<Charge> {
 
     @Override
-    public Charge deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
-
+    public Charge deserialize(JsonElement jsonElement,
+                              Type type,
+                              JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
         JsonObject chargeJson = jsonElement.getAsJsonObject();
         if (null != chargeJson.getAsJsonObject("credential")) {
             JsonObject credentialJson = chargeJson.getAsJsonObject("credential");
             JsonObject channelCredential;
             if (credentialJson.getAsJsonObject("wx") != null) {
                 JsonObject wx = credentialJson.getAsJsonObject("wx");
-                Long timeStamp = wx.get("timeStamp").getAsLong();
+                long timeStamp = wx.get("timeStamp").getAsLong();
                 wx.addProperty("timeStamp", Long.toString(timeStamp));
             } else if (credentialJson.getAsJsonObject("wx_pub") != null) {
                 JsonObject wxPub = credentialJson.getAsJsonObject("wx_pub");
                 if (null == wxPub.get("signed_data") && wxPub.get("timeStamp") != null) {
-                    Long timeStamp = wxPub.get("timeStamp").getAsLong();
+                    long timeStamp = wxPub.get("timeStamp").getAsLong();
                     wxPub.addProperty("timeStamp", Long.toString(timeStamp));
                 }
             } else if ((channelCredential = credentialJson.getAsJsonObject("bfb")) != null
                     || (channelCredential = credentialJson.getAsJsonObject("bfb_wap")) != null) {
                 if (channelCredential.has("total_amount")) {
-                    Long total_amount = channelCredential.get("total_amount").getAsLong();
+                    long total_amount = channelCredential.get("total_amount").getAsLong();
                     channelCredential.addProperty("total_amount", Long.toString(total_amount));
                 }
             } else if ((channelCredential = credentialJson.getAsJsonObject("alipay")) != null
                     || (channelCredential = credentialJson.getAsJsonObject("alipay_wap")) != null
                     || (channelCredential = credentialJson.getAsJsonObject("alipay_pc_direct")) != null) {
                 if (channelCredential.has("payment_type")) {
-                    Long paymentType = channelCredential.get("payment_type").getAsLong();
+                    long paymentType = channelCredential.get("payment_type").getAsLong();
                     channelCredential.addProperty("payment_type", Long.toString(paymentType));
                 }
             }
         }
 
-        Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).
-                registerTypeAdapter(ChargeRefundCollection.class, new ChargeRefundCollectionDeserializer())
+        Gson gson = GsonUtils.baseGsonBuilder()
+                .registerTypeAdapter(ChargeRefundCollection.class, new ChargeRefundCollectionDeserializer())
                 .create();
         JsonElement appElement = chargeJson.get("app");
         Charge charge = gson.fromJson(jsonElement, Charge.class);
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/serializer/ChargeRefundCollectionDeserializer.java b/pingpp-sdk/src/main/java/com/pingplusplus/serializer/ChargeRefundCollectionDeserializer.java
@@ -1,26 +1,20 @@
 package com.pingplusplus.serializer;
 
-import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
 import com.pingplusplus.model.ChargeRefundCollection;
-import com.pingplusplus.model.Refund;
+import com.pingplusplus.util.GsonUtils;
 
 import java.lang.reflect.Type;
-import java.util.List;
 
 public class ChargeRefundCollectionDeserializer implements JsonDeserializer<ChargeRefundCollection> {
 
     public ChargeRefundCollection deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
             throws JsonParseException {
-        Gson gson = new GsonBuilder()
-                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
-                .create();
+        Gson gson = GsonUtils.baseGsonBuilder().create();
 
         return gson.fromJson(json, typeOfT);
     }
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/serializer/ObjectListDeserializer.java b/pingpp-sdk/src/main/java/com/pingplusplus/serializer/ObjectListDeserializer.java
@@ -0,0 +1,49 @@
+package com.pingplusplus.serializer;
+
+import com.google.gson.*;
+import com.pingplusplus.util.GsonUtils;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ObjectListDeserializer implements JsonDeserializer<List<Object>> {
+
+    @Override
+    public List<Object> deserialize(JsonElement elem,
+            Type type,
+            JsonDeserializationContext context) {
+        List<Object> list = new ArrayList<>();
+        JsonArray jsonArray = elem.getAsJsonArray();
+
+        for (JsonElement element : jsonArray) {
+            if (element.isJsonNull()) {
+                list.add(null);
+            } else if (element.isJsonPrimitive()) {
+                JsonPrimitive primitive = element.getAsJsonPrimitive();
+                if (primitive.isNumber()) {
+                    String numStr = primitive.getAsString();
+                    if (numStr.contains(".")) {
+                        list.add(primitive.getAsDouble());
+                    } else {
+                        try {
+                            list.add(primitive.getAsLong());
+                        } catch (NumberFormatException e) {
+                            list.add(primitive.getAsBigDecimal());
+                        }
+                    }
+                } else if (primitive.isString()) {
+                    list.add(primitive.getAsString());
+                } else if (primitive.isBoolean()) {
+                    list.add(primitive.getAsBoolean());
+                }
+            } else if (element.isJsonArray()) {
+                list.add(context.deserialize(element, GsonUtils.LIST_OBJ));
+            } else if (element.isJsonObject()) {
+                list.add(context.deserialize(element, GsonUtils.MAP_STR_OBJ));
+            }
+        }
+
+        return list;
+    }
+}
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/serializer/RedEnvelopeDeserializer.java b/pingpp-sdk/src/main/java/com/pingplusplus/serializer/RedEnvelopeDeserializer.java
@@ -1,8 +1,6 @@
 package com.pingplusplus.serializer;
 
-import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -11,6 +9,7 @@
 import com.pingplusplus.model.App;
 import com.pingplusplus.model.ChargeRefundCollection;
 import com.pingplusplus.model.RedEnvelope;
+import com.pingplusplus.util.GsonUtils;
 
 import java.lang.reflect.Type;
 
@@ -21,8 +20,8 @@ public class RedEnvelopeDeserializer implements JsonDeserializer<RedEnvelope> {
     @Override
     public RedEnvelope deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         JsonObject transFerJson = json.getAsJsonObject();
-        Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).
-                registerTypeAdapter(ChargeRefundCollection.class, new ChargeRefundCollectionDeserializer())
+        Gson gson = GsonUtils.baseGsonBuilder()
+                .registerTypeAdapter(ChargeRefundCollection.class, new ChargeRefundCollectionDeserializer())
                 .create();
         JsonElement appElement = transFerJson.get("app");
         RedEnvelope redEnvelope = gson.fromJson(json, RedEnvelope.class);
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/serializer/StringObjectMapDeserializer.java b/pingpp-sdk/src/main/java/com/pingplusplus/serializer/StringObjectMapDeserializer.java
@@ -0,0 +1,52 @@
+package com.pingplusplus.serializer;
+
+import com.google.gson.*;
+import com.pingplusplus.util.GsonUtils;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+public class StringObjectMapDeserializer implements JsonDeserializer<Map<String, Object>> {
+
+    @Override
+    public Map<String, Object> deserialize(JsonElement elem,
+            Type type,
+            JsonDeserializationContext context) {
+        Map<String, Object> map = new HashMap<>();
+        JsonObject jsonObject = elem.getAsJsonObject();
+
+        for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+            String key = entry.getKey();
+            JsonElement value = entry.getValue();
+
+            if (value.isJsonNull()) {
+                map.put(key, null);
+            } else if (value.isJsonPrimitive()) {
+                JsonPrimitive primitive = value.getAsJsonPrimitive();
+                if (primitive.isNumber()) {
+                    String numStr = primitive.getAsString();
+                    if (numStr.contains(".")) {
+                        map.put(key, primitive.getAsDouble());
+                    } else {
+                        try {
+                            map.put(key, primitive.getAsLong());
+                        } catch (NumberFormatException e) {
+                            map.put(key, primitive.getAsBigDecimal());
+                        }
+                    }
+                } else if (primitive.isString()) {
+                    map.put(key, primitive.getAsString());
+                } else if (primitive.isBoolean()) {
+                    map.put(key, primitive.getAsBoolean());
+                }
+            } else if (value.isJsonArray()) {
+                map.put(key, context.deserialize(value, GsonUtils.LIST_OBJ));
+            } else if (value.isJsonObject()) {
+                map.put(key, context.deserialize(value, GsonUtils.MAP_STR_OBJ));
+            }
+        }
+
+        return map;
+    }
+}
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/serializer/SubAppDeserializer.java b/pingpp-sdk/src/main/java/com/pingplusplus/serializer/SubAppDeserializer.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.*;
 import com.pingplusplus.model.*;
+import com.pingplusplus.util.GsonUtils;
 
 import java.lang.reflect.Type;
 
@@ -16,9 +17,7 @@ public SubApp deserialize(JsonElement jsonElement, Type type, JsonDeserializatio
         JsonObject subAppJson = jsonElement.getAsJsonObject();
 
 
-        Gson gson = new GsonBuilder()
-                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
-                .create();
+        Gson gson = GsonUtils.baseGsonBuilder().create();
         JsonElement userElement = subAppJson.get("user");
         SubApp subApp = gson.fromJson(jsonElement, SubApp.class);
 
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/serializer/TransferDeserializer.java b/pingpp-sdk/src/main/java/com/pingplusplus/serializer/TransferDeserializer.java
@@ -1,8 +1,6 @@
 package com.pingplusplus.serializer;
 
-import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -11,6 +9,7 @@
 import com.pingplusplus.model.App;
 import com.pingplusplus.model.ChargeRefundCollection;
 import com.pingplusplus.model.Transfer;
+import com.pingplusplus.util.GsonUtils;
 
 import java.lang.reflect.Type;
 
@@ -22,7 +21,7 @@ public class TransferDeserializer implements JsonDeserializer<Transfer> {
     public Transfer deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
 
         JsonObject transFerJson = json.getAsJsonObject();
-        Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+        Gson gson = GsonUtils.baseGsonBuilder()
                 .registerTypeAdapter(ChargeRefundCollection.class, new ChargeRefundCollectionDeserializer())
                 .create();
         JsonElement appElement = transFerJson.get("app");
diff --git a/pingpp-sdk/src/main/java/com/pingplusplus/util/GsonUtils.java b/pingpp-sdk/src/main/java/com/pingplusplus/util/GsonUtils.java
diff --git a/pingpp-sdk/src/test/java/com/pingplusplus/PingppTest.java b/pingpp-sdk/src/test/java/com/pingplusplus/PingppTest.java
diff --git a/pom.xml b/pom.xml
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,3 @@ allprojects {`
`10`	`10`	`}`
`11`	`11`	`apply plugin: 'java'`
`12`	`12`	`}`
`13`		`-`
`14`		`-sourceCompatibility = 1.8`
`15`		`-targetCompatibility = 1.8`
`16`		`-`
`17`		`-dependencies {`
`18`		`- implementation 'com.google.code.gson:gson:2.10'`
`19`		`- implementation 'commons-codec:commons-codec:1.17.0'`
`20`		`-`
`21`		`- testImplementation 'junit:junit:4.13.2'`
`22`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ dependencies {`
`7`	`7`	`// 方法 1. 本地文件系统依赖`
`8`	`8`	`// implementation fileTree(dir: 'lib', includes: ['*jar'])`
`9`	`9`	`// 方法 2. 仓库依赖`
`10`		`- // implementation 'com.pingxx:pingpp-sdk:1.2.0'`
	`10`	`+ // implementation 'com.pingxx:pingpp-java:2.5.2'`
`11`	`11`	`// 方法 3.模块依赖`
`12`	`12`	`implementation project(':pingpp-sdk')`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ plugins {`
`13`	`13`	`id "java"`
`14`	`14`	`}`
`15`	`15`
	`16`	`+sourceCompatibility = 1.8`
	`17`	`+targetCompatibility = 1.8`
	`18`	`+`
`16`	`19`	`configurations {`
`17`	`20`	`compileOnly {`
`18`	`21`	`extendsFrom annotationProcessor`