Merge pull request #98 from jpush/dev

prepare release 3.3.3

Author: KenChoi1992

README.md

@@ -26,7 +26,7 @@
 <dependency>
     <groupId>cn.jpush.api</groupId>
     <artifactId>jpush-client</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.3</version>
 </dependency>
 ```
 ### jar 包方式

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

@@ -6,8 +6,6 @@
 import java.util.Map;
 
 import cn.jiguang.common.ServiceHelper;
-import cn.jiguang.common.connection.ApacheHttpClient;
-import cn.jiguang.common.connection.HttpProxy;
 import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.connection.NettyHttpClient;
 import cn.jiguang.common.resp.ResponseWrapper;
@@ -183,13 +181,21 @@ public void run() {
         }
     }
 
-    public static void testSendGroupPush() {
+    public void testSendGroupPush() {
         GroupPushClient groupPushClient = new GroupPushClient(GROUP_MASTER_SECRET, GROUP_PUSH_KEY);
         final PushPayload payload = buildPushObject_android_and_ios();
         try {
-            PushResult result = groupPushClient.sendGroupPush(payload);
-            LOG.info("Got result - " + result);
+            Map<String, PushResult> result = groupPushClient.sendGroupPush(payload);
+            for (Map.Entry<String, PushResult> entry : result.entrySet()) {
+                PushResult pushResult = entry.getValue();
+                PushResult.Error error = pushResult.error;
+                if (error != null) {
+                    LOG.info("AppKey: " + entry.getKey() + " error code : " + error.getCode() + " error message: " + error.getMessage());
+                } else {
+                    LOG.info("AppKey: " + entry.getKey() + " sendno: " + pushResult.sendno + " msg_id:" + pushResult.msg_id);
+                }
 
+            }
         } catch (APIConnectionException e) {
             LOG.error("Connection error. Should retry later. ", e);
             LOG.error("Sendno: " + payload.getSendno());

pom.xml

@@ -35,7 +35,7 @@
 		<url>https://github.com/jpush/jpush-api-java-client</url>
 		<connection>scm:git:[email protected]:jpush/jpush-api-java-client.git</connection>
 		<developerConnection>scm:git:[email protected]:jpush/jpush-api-java-client.git</developerConnection>
-		<tag>v3.3.2</tag>
+		<tag>v3.3.3</tag>
 	</scm>
 
 	<dependencies>

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

@@ -7,10 +7,13 @@
 import cn.jiguang.common.connection.NativeHttpClient;
 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.utils.Preconditions;
 import cn.jpush.api.push.model.PushPayload;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.util.Map;
 
 /**
  * Created by caiyaoguan on 2017/7/4.
@@ -20,6 +23,7 @@ public class GroupPushClient {
     private IHttpClient _httpClient;
     private String _baseUrl;
     private String _groupPushPath;
+    private Gson _gson = new Gson();
 
     public GroupPushClient(String groupMasterSecret, String groupKey) {
         this(groupMasterSecret, groupKey, null, ClientConfig.getInstance());
@@ -33,12 +37,12 @@ public GroupPushClient(String groupMasterSecret, String groupKey, HttpProxy prox
         this._httpClient = new NativeHttpClient(authCode, proxy, conf);
     }
 
-    public PushResult sendGroupPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
+    public Map<String, PushResult> sendGroupPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
         Preconditions.checkArgument(! (null == pushPayload), "pushPayload should not be null");
 
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _groupPushPath, pushPayload.toString());
-
-        return BaseResult.fromResponse(response, PushResult.class);
+        return  _gson.fromJson(response.responseContent,
+                new TypeToken<Map<String, PushResult>>(){}.getType());
     }
 
 }

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

@@ -11,6 +11,19 @@ public class PushResult extends BaseResult {
     @Expose public long msg_id;
     @Expose public int sendno;
     @Expose public int statusCode;
+    @Expose public Error error;
+    public class Error {
+        @Expose String message;
+        @Expose int code;
+
+        public String getMessage() {
+            return this.message;
+        }
+
+        public int getCode() {
+            return this.code;
+        }
+    }
 
 }
 

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

@@ -13,6 +13,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 public class GroupPushClientTest extends BaseTest {
 
     protected static final Logger LOG = LoggerFactory.getLogger(GroupPushClientTest.class);
@@ -22,9 +24,17 @@ public void testSendGroupPush() {
         GroupPushClient groupPushClient = new GroupPushClient(GROUP_MASTER_SECRET, GROUP_PUSH_KEY);
         final PushPayload payload = buildPushObject_android();
         try {
-            PushResult result = groupPushClient.sendGroupPush(payload);
-            LOG.info("Got result - " + result);
+            Map<String, PushResult> result = groupPushClient.sendGroupPush(payload);
+            for (Map.Entry<String, PushResult> entry : result.entrySet()) {
+                PushResult pushResult = entry.getValue();
+                PushResult.Error error = pushResult.error;
+                if (error != null) {
+                    LOG.info("AppKey: " + entry.getKey() + " error code : " + error.getCode() + " error message: " + error.getMessage());
+                } else {
+                    LOG.info("AppKey: " + entry.getKey() + " sendno: " + pushResult.sendno + " msg_id:" + pushResult.msg_id);
+                }
 
+            }
         } catch (APIConnectionException e) {
             LOG.error("Connection error. Should retry later. ", e);
             LOG.error("Sendno: " + payload.getSendno());