Fix bug - cannot set time_to_live to 0

Author: Javen

src/cn/jpush/api/push/model/Options.java

@@ -13,6 +13,8 @@ public class Options implements PushModel {
     private static final String TIME_TO_LIVE = "time_to_live";
     private static final String APNS_PRODUCTION = "apns_production";
 
+    private static final long NONE_TIME_TO_LIVE = -1;
+    
     private final int sendno;
     private final long overrideMsgId;
     private long timeToLive;
@@ -58,7 +60,7 @@ public JsonElement toJSON() {
         if (overrideMsgId > 0) {
             json.add(OVERRIDE_MSG_ID, new JsonPrimitive(overrideMsgId));
         }
-        if (timeToLive > 0) {
+        if (timeToLive >= 0) {
             json.add(TIME_TO_LIVE, new JsonPrimitive(timeToLive));
         }
 
@@ -70,7 +72,7 @@ public JsonElement toJSON() {
     public static class Builder {
         private int sendno = 0;
         private long overrideMsgId = 0;
-        private long timeToLive = 0;
+        private long timeToLive = NONE_TIME_TO_LIVE;
         private boolean apnsProduction = false;
 
         public Builder setSendno(int sendno) {
@@ -96,7 +98,7 @@ public Builder setApnsProduction(boolean apnsProduction) {
         public Options build() {
             Preconditions.checkArgument(sendno >= 0, "sendno should be greater than 0.");
             Preconditions.checkArgument(overrideMsgId >= 0, "override_msg_id should be greater than 0.");
-            Preconditions.checkArgument(timeToLive >= 0, "time_to_live should be greater than 0.");
+            Preconditions.checkArgument(timeToLive >= NONE_TIME_TO_LIVE, "time_to_live should be greater than 0.");
             if (sendno <= 0) {
                 sendno = ServiceHelper.generateSendno();
             }

test/cn/jpush/api/push/model/OptionsTest.java

@@ -22,7 +22,7 @@ public void testIllegalOverrideMsgId() {
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegalTimeToLive() {
-        Options.newBuilder().setTimeToLive(-1).build();
+        Options.newBuilder().setTimeToLive(-2).build();
     }
 
     @Test
@@ -34,6 +34,44 @@ public void testSendno() {
         Assert.assertEquals("", json, options.toJSON());
     }
 
+    @Test
+    public void testTimeToLive_int() {
+        JsonObject json = new JsonObject();
+        json.add("sendno", new JsonPrimitive(111));
+        json.add("apns_production", new JsonPrimitive(false));
+        json.add("time_to_live", new JsonPrimitive(640));
+        
+        Options options = Options.newBuilder()
+                .setSendno(111)
+                .setTimeToLive(640).build();
+        Assert.assertEquals("", json, options.toJSON());
+    }
+
+    @Test
+    public void testTimeToLive_0() {
+        JsonObject json = new JsonObject();
+        json.add("sendno", new JsonPrimitive(111));
+        json.add("apns_production", new JsonPrimitive(false));
+        json.add("time_to_live", new JsonPrimitive(0));
+        
+        Options options = Options.newBuilder()
+                .setSendno(111)
+                .setTimeToLive(0).build();
+        Assert.assertEquals("", json, options.toJSON());
+    }
+    
+    @Test
+    public void testTimeToLive_default() {
+        JsonObject json = new JsonObject();
+        json.add("sendno", new JsonPrimitive(111));
+        json.add("apns_production", new JsonPrimitive(false));
+        
+        Options options = Options.newBuilder()
+                .setSendno(111)
+                .setTimeToLive(-1).build();
+        Assert.assertEquals("", json, options.toJSON());
+    }
+
     @Test
     public void testApnsProduction_defaultFalse() {
         int sendno = ServiceHelper.generateSendno();