支持推送撤销

Author: yutaipu

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

@@ -860,6 +860,16 @@ public PushResult sendMessageWithRegistrationID(String title, String msgContent,
         return _pushClient.sendPush(payload);
     }
 
+    /**
+     * Delete a push by msgId.
+     * @param msgId  The message id
+     * @return delete result
+     * @throws APIConnectionException if a remote or network exception occurs.
+     * @throws APIRequestException    if a request exception occurs
+     */
+    public DefaultResult deletePush(String msgId) throws APIConnectionException, APIRequestException {
+        return _pushClient.deletePush(msgId);
+    }
 
 
     // ----------------------- Device

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

@@ -3,10 +3,7 @@
 import cn.jiguang.common.ClientConfig;
 import cn.jiguang.common.ServiceHelper;
 import cn.jiguang.common.connection.*;
-import cn.jiguang.common.resp.APIConnectionException;
-import cn.jiguang.common.resp.APIRequestException;
-import cn.jiguang.common.resp.BaseResult;
-import cn.jiguang.common.resp.ResponseWrapper;
+import cn.jiguang.common.resp.*;
 import cn.jiguang.common.utils.Base64;
 import cn.jiguang.common.utils.Preconditions;
 import cn.jiguang.common.utils.StringUtils;
@@ -272,6 +269,21 @@ public CIDResult getCidList(int count, String type) throws APIConnectionExceptio
         return BaseResult.fromResponse(responseWrapper, CIDResult.class);
     }
 
+    /**
+     * Delete a push by msgId.
+     * @param msgId  The message id
+     * @return delete result
+     * @throws APIConnectionException connect exception
+     * @throws APIRequestException    request exception
+     */
+    public DefaultResult deletePush(String msgId) throws APIConnectionException, APIRequestException {
+        Preconditions.checkArgument(StringUtils.isNotEmpty(msgId), "msgId should not be empty");
+
+        ResponseWrapper responseWrapper = _httpClient.sendDelete(_baseUrl + _pushPath + "/" + msgId);
+
+        return DefaultResult.fromResponse(responseWrapper);
+    }
+
     public void setHttpClient(IHttpClient client) {
         this._httpClient = client;
     }

src/test/java/cn/jpush/api/push/PushClientTest.java

@@ -6,6 +6,7 @@
 import cn.jiguang.common.ClientConfig;
 import cn.jiguang.common.ServiceHelper;
 import cn.jiguang.common.connection.NettyHttpClient;
+import cn.jiguang.common.resp.DefaultResult;
 import cn.jiguang.common.resp.ResponseWrapper;
 import cn.jpush.api.JPushClient;
 import cn.jpush.api.push.model.Options;
@@ -181,6 +182,23 @@ public void testSendFilePush() {
         }
     }
 
+    @Test
+    public void testDeletePush() {
+        JPushClient jPushClient = new JPushClient(MASTER_SECRET, APP_KEY);
+        try {
+            String msgId = "58546877793854733";
+            DefaultResult result = jPushClient.deletePush(msgId);
+            LOG.info("Got result - " + result);
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+        }
+    }
+
     private static PushPayload buildFilePushPayload() {
         return PushPayload.newBuilder()
                 .setPlatform(Platform.android())