修改部分序列化报错的BUG

Author: 许丹侠

example/main/java/cn/jpush/api/examples/PushExample.java

@@ -548,8 +548,8 @@ public static void testBatchSend() {
                         .setTarget("1507ffd3f79456757de");
                 pushPayloadList.add(builder2.build());
 
-                PushResult result = jPushClient.batchSendPushByAlias(pushPayloadList);
-                LOG.info("batchSendPushByAlias param: {}, result: {}", pushPayloadList, result);
+                BatchPushResult result = jPushClient.batchSendPushByAlias(pushPayloadList);
+                LOG.info("batchSendPushByAlias param: {}, result: {}", pushPayloadList, result.getBatchPushResult());
             }
 
             {
@@ -572,8 +572,8 @@ public static void testBatchSend() {
                         .setTarget("1507ffd3f79456757de");
                 pushPayloadList.add(builder2.build());
 
-                PushResult result = jPushClient.batchSendPushByRegId(pushPayloadList);
-                LOG.info("batchSendPushByRegId param: {}, result: {}", pushPayloadList, result);
+                BatchPushResult result = jPushClient.batchSendPushByRegId(pushPayloadList);
+                LOG.info("batchSendPushByRegId param: {}, result: {}", pushPayloadList, result.getBatchPushResult());
             }
 
         } catch (APIConnectionException e) {

example/main/java/cn/jpush/api/examples/ReportsExample.java

@@ -1,14 +1,13 @@
 package cn.jpush.api.examples;
 
-import cn.jpush.api.report.*;
-import cn.jpush.api.report.model.CheckMessagePayload;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import cn.jiguang.common.TimeUnit;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
 import cn.jpush.api.JPushClient;
+import cn.jpush.api.report.*;
+import cn.jpush.api.report.model.CheckMessagePayload;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
@@ -23,7 +22,8 @@ public class ReportsExample {
     public static final String REGISTRATION_ID3 = "18071adc030dcba91c0";
 
 	public static void main(String[] args) {
-        testGetReceivedsDetail();
+
+//        testGetReceivedsDetail();
         testGetMessagesDetail();
 //		testGetReport();
 //		testGetMessages();
@@ -115,7 +115,7 @@ public static void testGetMessagesDetail() {
         String msgIds = "3993287034,3993287035,3993287036";
         try {
             MessageDetailResult result = jPushClient.getMessagesDetail(msgIds);
-            LOG.info("msgIds: {}, MessageDetail: {}", msgIds, result);
+            LOG.info("msgIds: {}, MessageDetail: {}", msgIds, result.received_list);
         } catch (APIConnectionException e) {
             LOG.error("Connection error. Should retry later. ", e);
         } catch (APIRequestException e) {

src/main/java/cn/jpush/api/JPushClient.java

@@ -221,11 +221,11 @@ public PushResult sendPushValidate(String payloadString) throws APIConnectionExc
     	return _pushClient.sendPushValidate(payloadString);
     }
 
-    public PushResult batchSendPushByRegId(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
+    public BatchPushResult batchSendPushByRegId(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
         return _pushClient.batchSendPushByRegId(pushPayloadList);
     }
 
-    public PushResult batchSendPushByAlias(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
+    public BatchPushResult batchSendPushByAlias(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
         return _pushClient.batchSendPushByAlias(pushPayloadList);
     }
 

src/main/java/cn/jpush/api/push/PushClient.java

@@ -14,18 +14,21 @@
 import cn.jpush.api.push.model.*;
 import cn.jpush.api.push.model.audience.Audience;
 import com.google.gson.*;
+import com.google.gson.reflect.TypeToken;
 
+import java.lang.reflect.Type;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Entrance for sending Push.
- * 
- * For the following parameters, you can set them by instance creation. 
+ * <p>
+ * For the following parameters, you can set them by instance creation.
  * This action will override setting in PushPayload Optional.
  * * apnsProduction If not present, the default is true.
  * * timeToLive If not present, the default is 86400(s) (one day).
- * 
+ * <p>
  * Can be used directly.
  */
 public class PushClient {
@@ -41,7 +44,7 @@ public class PushClient {
 
     // If not present, true by default.
     private int _apnsProduction;
-    
+
     // If not present, the default value is 86400(s) (one day)
     private long _timeToLive;
 
@@ -50,36 +53,37 @@ public class PushClient {
 
     /**
      * Create a Push Client.
-     * 
+     *
      * @param masterSecret API access secret of the appKey.
-     * @param appKey The KEY of one application on JPush.
+     * @param appKey       The KEY of one application on JPush.
      */
-	public PushClient(String masterSecret, String appKey) {
-	    this(masterSecret, appKey, null, ClientConfig.getInstance());
-	}
+    public PushClient(String masterSecret, String appKey) {
+        this(masterSecret, appKey, null, ClientConfig.getInstance());
+    }
 
     /**
      * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig} instead of this constructor.
-     * @param masterSecret API access secret of the appKey.
-     * @param appKey The KEY of one application on JPush.
+     *
+     * @param masterSecret  API access secret of the appKey.
+     * @param appKey        The KEY of one application on JPush.
      * @param maxRetryTimes The max retry times.
      */
     @Deprecated
-	public PushClient(String masterSecret, String appKey, int maxRetryTimes) {
-	    this(masterSecret, appKey, maxRetryTimes, null);
-	}
-	
-	/**
-	 * Create a Push Client with max retry times.
-	 * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig} instead of this constructor.
+    public PushClient(String masterSecret, String appKey, int maxRetryTimes) {
+        this(masterSecret, appKey, maxRetryTimes, null);
+    }
+
+    /**
+     * Create a Push Client with max retry times.
+     * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig} instead of this constructor.
      *
-	 * @param masterSecret  API access secret of the appKey.
-	 * @param appKey The KEY of one application on JPush.
-	 * @param maxRetryTimes max retry times
-     * @param proxy The max retry times.
-	 */
+     * @param masterSecret  API access secret of the appKey.
+     * @param appKey        The KEY of one application on JPush.
+     * @param maxRetryTimes max retry times
+     * @param proxy         The max retry times.
+     */
     @Deprecated
-	public PushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
+    public PushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
         ServiceHelper.checkBasic(appKey, masterSecret);
 
         ClientConfig conf = ClientConfig.getInstance();
@@ -94,7 +98,7 @@ public PushClient(String masterSecret, String appKey, int maxRetryTimes, HttpPro
 
         String authCode = ServiceHelper.getBasicAuthorization(appKey, masterSecret);
         this._httpClient = new NativeHttpClient(authCode, proxy, conf);
-	}
+    }
 
     public PushClient(String masterSecret, String appKey, HttpProxy proxy, ClientConfig conf) {
         ServiceHelper.checkBasic(appKey, masterSecret);
@@ -115,21 +119,21 @@ public PushClient(String masterSecret, String appKey, HttpProxy proxy, ClientCon
 
     }
 
-	/**
+    /**
      * Create a Push Client with global settings.
-     * 
+     * <p>
      * If you want different settings from default globally, this constructor is what you needed.
      * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig} instead of this constructor.
      *
-     * @param masterSecret API access secret of the appKey.
-     * @param appKey The KEY of one application on JPush.
+     * @param masterSecret   API access secret of the appKey.
+     * @param appKey         The KEY of one application on JPush.
      * @param apnsProduction Global APNs environment setting. It will override PushPayload Options.
-     * @param timeToLive Global time_to_live setting. It will override PushPayload Options.
+     * @param timeToLive     Global time_to_live setting. It will override PushPayload Options.
      */
     @Deprecated
     public PushClient(String masterSecret, String appKey, boolean apnsProduction, long timeToLive) {
         this(masterSecret, appKey);
-        if(apnsProduction) {
+        if (apnsProduction) {
             _apnsProduction = 1;
         } else {
             _apnsProduction = 0;
@@ -141,28 +145,28 @@ public PushClient(String masterSecret, String appKey, boolean apnsProduction, lo
      * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig#setGlobalPushSetting} instead of this method.
      *
      * @param apnsProduction Global APNs environment setting. It will override PushPayload Options.
-     * @param timeToLive Global time_to_live setting. It will override PushPayload Options.
+     * @param timeToLive     Global time_to_live setting. It will override PushPayload Options.
      */
     @Deprecated
     public void setDefaults(boolean apnsProduction, long timeToLive) {
-        if(apnsProduction) {
+        if (apnsProduction) {
             _apnsProduction = 1;
         } else {
             _apnsProduction = 0;
         }
         this._timeToLive = timeToLive;
     }
-    
+
     public void setBaseUrl(String baseUrl) {
         this._baseUrl = baseUrl;
     }
-    
+
     public PushResult sendPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
-        Preconditions.checkArgument(! (null == pushPayload), "pushPayload should not be null");
-        
+        Preconditions.checkArgument(!(null == pushPayload), "pushPayload should not be null");
+
         if (_apnsProduction > 0) {
             pushPayload.resetOptionsApnsProduction(true);
-        } else if(_apnsProduction == 0) {
+        } else if (_apnsProduction == 0) {
             pushPayload.resetOptionsApnsProduction(false);
         }
 
@@ -171,65 +175,65 @@ public PushResult sendPush(PushPayload pushPayload) throws APIConnectionExceptio
         }
 
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _pushPath, getEncryptData(pushPayload));
-        
+
         return BaseResult.fromResponse(response, PushResult.class);
     }
-    
+
     public PushResult sendPushValidate(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
-        Preconditions.checkArgument(! (null == pushPayload), "pushPayload should not be null");
-        
+        Preconditions.checkArgument(!(null == pushPayload), "pushPayload should not be null");
+
         if (_apnsProduction > 0) {
             pushPayload.resetOptionsApnsProduction(true);
-        } else if(_apnsProduction == 0) {
+        } else if (_apnsProduction == 0) {
             pushPayload.resetOptionsApnsProduction(false);
         }
 
         if (_timeToLive >= 0) {
             pushPayload.resetOptionsTimeToLive(_timeToLive);
         }
-        
+
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _pushValidatePath, getEncryptData(pushPayload));
-        
+
         return BaseResult.fromResponse(response, PushResult.class);
     }
-    
+
     public PushResult sendPush(String payloadString) throws APIConnectionException, APIRequestException {
         Preconditions.checkArgument(StringUtils.isNotEmpty(payloadString), "pushPayload should not be empty");
-        
+
         try {
             _jsonParser.parse(payloadString);
         } catch (JsonParseException e) {
             Preconditions.checkArgument(false, "payloadString should be a valid JSON string.");
         }
-        
+
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _pushPath, getEncryptData(payloadString));
-        
+
         return BaseResult.fromResponse(response, PushResult.class);
     }
-    
+
     public PushResult sendPushValidate(String payloadString) throws APIConnectionException, APIRequestException {
         Preconditions.checkArgument(StringUtils.isNotEmpty(payloadString), "pushPayload should not be empty");
-        
+
         try {
             _jsonParser.parse(payloadString);
         } catch (JsonParseException e) {
             Preconditions.checkArgument(false, "payloadString should be a valid JSON string.");
         }
-        
+
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _pushValidatePath, getEncryptData(payloadString));
-        
+
         return BaseResult.fromResponse(response, PushResult.class);
     }
 
-    public PushResult batchSendPushByRegId(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
+    public BatchPushResult batchSendPushByRegId(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
         return batchSendPush(_baseUrl + batchRegidPushPath, pushPayloadList);
     }
 
-    public PushResult batchSendPushByAlias(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
+    public BatchPushResult batchSendPushByAlias(List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
         return batchSendPush(_baseUrl + batchAliasPushPath, pushPayloadList);
     }
 
-    public PushResult batchSendPush(String url, List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
+    public BatchPushResult batchSendPush(String url, List<PushPayload> pushPayloadList) throws APIConnectionException, APIRequestException {
 
         Preconditions.checkArgument((null != pushPayloadList), "param should not be null");
         Preconditions.checkArgument((!pushPayloadList.isEmpty()), "pushPayloadList should not be empty");
@@ -251,18 +255,20 @@ public PushResult batchSendPush(String url, List<PushPayload> pushPayloadList) t
         }
         json.add("pushlist", pushPayLoadList);
 
-        ResponseWrapper response = _httpClient.sendPost(url, getEncryptData(gson.toJson(pushPayLoadList)));
+        ResponseWrapper response = _httpClient.sendPost(url, getEncryptData(gson.toJson(json)));
+
+        return BatchPushResult.fromResponse(response);
 
-        return BaseResult.fromResponse(response, PushResult.class);
     }
 
     /**
      * Get cid list, the data form of cid is appKey-uuid.
+     *
      * @param count the count of cid list, from 1 to 1000. default is 1.
-     * @param type default is "push", option: "schedule"
+     * @param type  default is "push", option: "schedule"
      * @return CIDResult, an array of cid
      * @throws APIConnectionException connect exception
-     * @throws APIRequestException request exception
+     * @throws APIRequestException    request exception
      */
     public CIDResult getCidList(int count, String type) throws APIConnectionException, APIRequestException {
         Preconditions.checkArgument(count >= 1 && count <= 1000, "count should not less than 1 or larger than 1000");
@@ -273,7 +279,7 @@ public CIDResult getCidList(int count, String type) throws APIConnectionExceptio
         } else {
             responseWrapper = _httpClient.sendGet(_baseUrl + _pushPath + "/cid?count=" + count);
         }
-        return  BaseResult.fromResponse(responseWrapper, CIDResult.class);
+        return BaseResult.fromResponse(responseWrapper, CIDResult.class);
     }
 
     public void setHttpClient(IHttpClient client) {
@@ -291,6 +297,7 @@ public void close() {
 
     /**
      * 获取加密的payload数据
+     *
      * @param payloadData
      * @return
      */
@@ -303,6 +310,7 @@ private String getEncryptData(String payloadData) {
 
     /**
      * 获取加密的payload数据
+     *
      * @param pushPayload
      * @return
      */
@@ -326,6 +334,7 @@ private String getEncryptData(PushPayload pushPayload) {
 
     /**
      * 获取加密的payload数据
+     *
      * @param pushPayload
      * @return
      */