Bug fix: handle new API response.

Author: Javen

src/cn/jpush/api/common/BaseResult.java

@@ -1,5 +1,7 @@
 package cn.jpush.api.common;
 
+import cn.jpush.api.common.ResponseResult.ErrorObject;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -13,12 +15,34 @@ public abstract class BaseResult {
 
     public ResponseResult responseResult;
 
-    public abstract boolean isResultOK();
+    protected ErrorObject getErrorObject() {
+        if (null != responseResult) {
+            return responseResult.error;
+        }
+        return null;
+    }
 
-    public abstract int getErrorCode();
+    public int getErrorCode() {
+        ErrorObject eo = getErrorObject();
+        if (null != eo) {
+            return eo.code;
+        }
+        return ERROR_CODE_OK;
+    }
 
-    public abstract String getErrorMessage();
+    public String getErrorMessage() {
+        ErrorObject eo = getErrorObject();
+        if (null != eo) {
+            return eo.message;
+        }
+        return ERROR_MESSAGE_NONE;
+    }
 
+    public boolean isResultOK() {
+        if (responseResult.responseCode == RESPONSE_OK) return true;
+        return false;
+    }
+
     public int getRateLimitQuota() {
         if (null != responseResult) {
             return responseResult.rateLimitQuota;
@@ -40,4 +64,10 @@ public int getRateLimitReset() {
         return 0;
     }
 
+    @Override
+    public String toString() {
+        return _gson.toJson(this);
+    }
+
+    
 }

src/cn/jpush/api/examples/JPushClientExample.java

@@ -32,6 +32,7 @@ private static void testSendNotification() {
         LOG.info("Paylaod JSON - " + payload.toString());
 
         PushResult result = jpushClient.sendPush(payload);
+        LOG.debug(result.responseResult.responseContent);
         LOG.debug(result.toString());
 	}
 

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

@@ -5,39 +5,11 @@
 import com.google.gson.annotations.Expose;
 
 public class PushResult extends BaseResult {
-    @Expose public Long msg_id;
-    @Expose public int sendno;
-    @Expose public int errcode = ERROR_CODE_NONE;
-    @Expose public String errmsg;
-
-    public PushResult() {
-    }
-    
-    public long getMessageId() {
-        return this.msg_id;
-    }
-    
-    public int getSendNo() {
-        return this.sendno;
-    }
-    
-    public int getErrorCode() {
-        return this.errcode;
-    }
-    
-    public String getErrorMessage() {
-        return this.errmsg;
-    }
-    
-    public boolean isResultOK() {
-        if (responseResult.responseCode == RESPONSE_OK && this.errcode == ERROR_CODE_OK) return true;
-        return false;
+        
+    public static class Push {
+        @Expose public long msg_id;
+        @Expose public int sendno;
     }
 
-	@Override
-	public String toString() {
-		return _gson.toJson(this);
-	}
-	
 }
 

src/cn/jpush/api/report/ReceivedsResult.java

@@ -4,7 +4,6 @@
 import java.util.List;
 
 import cn.jpush.api.common.BaseResult;
-import cn.jpush.api.common.ResponseResult.ErrorObject;
 
 import com.google.gson.annotations.Expose;
 
@@ -21,36 +20,5 @@ public List<Received> getReceivedList() {
 	    return this.receivedList;
 	}
 
-    protected ErrorObject getErrorObject() {
-        if (null != responseResult) {
-            return responseResult.error;
-        }
-        return null;
-    }
-    
-	public int getErrorCode() {
-	    ErrorObject eo = getErrorObject();
-	    if (null != eo) {
-	        return eo.code;
-	    }
-	    return ERROR_CODE_OK;
-	}
-	
-	public String getErrorMessage() {
-	    ErrorObject eo = getErrorObject();
-	    if (null != eo) {
-	        return eo.message;
-	    }
-	    return ERROR_MESSAGE_NONE;
-	}
 
-	public boolean isResultOK() {
-	    if (responseResult.responseCode == RESPONSE_OK) return true;
-	    return false;
-	}
-	
-	@Override
-	public String toString() {
-		return _gson.toJson(this);
-	}
 }

test/cn/jpush/api/PushSpecialCharacterTests.java

@@ -34,7 +34,7 @@ public int sendMessage(String content) {
 	            .setMessage(message)
 	            .build();
 	    PushResult result = jpush.sendPush(payload);
-	    return result.errcode;
+	    return result.getErrorCode();
 	}
 
 	@Test