change timeStamp type from int to string in wx credential

samurai00 · samurai00 · commit 2126bcaa2df1 · 2015-01-05T14:22:27.000+08:00
diff --git a/src/main/java/com/pingplusplus/model/Charge.java b/src/main/java/com/pingplusplus/model/Charge.java
@@ -46,7 +46,7 @@ public class Charge extends APIResource implements MetadataStore<Charge> {
             setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).
             setLongSerializationPolicy(LongSerializationPolicy.STRING).
             registerTypeAdapter(Double.class, new JsonSerializer<Double>() {
-//                @Override
+                @Override
                 public JsonElement serialize(Double src, Type typeOfSrc, JsonSerializationContext context) {
                     if (src == src.longValue())
                         return new JsonPrimitive(src.longValue());
@@ -202,6 +202,7 @@ public void setApp(Object app) {
 
     public String getCredential() {
         Map<String, Object> credParams = new HashMap<String, Object>();
+        credParams.put("object", "credential");
         credParams.put(channel, credential.get(channel));
         return PRETTY_PRINT_GSON.toJson(credParams);
     }
diff --git a/src/main/java/com/pingplusplus/model/ChargeDeserializer.java b/src/main/java/com/pingplusplus/model/ChargeDeserializer.java
@@ -1,8 +1,10 @@
 package com.pingplusplus.model;
 
 import com.google.gson.*;
+import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
+import java.util.Map;
 
 /**
  * Created by afon on 14/11/25.
@@ -23,6 +25,14 @@ public Charge deserialize(JsonElement jsonElement, Type type, JsonDeserializatio
             App app = gson.fromJson(appElement, App.class);
             charge.setApp(app);
         }
+        String creStr = charge.getCredential();
+        Type hashMapType = new TypeToken<Map<String, Object>>(){}.getType();
+        Map<String, Object> creMap = gson.fromJson(creStr, hashMapType);
+        if (creMap.containsKey("wx")) {
+            Map<String, Object> wx = (Map<String, Object>) creMap.get("wx");
+            wx.put("timeStamp", String.valueOf(((Double)(wx.get("timeStamp"))).longValue()));
+            charge.setCredential(creMap);
+        }
         return charge;
     }
 }
