Refactor badge +1 API - add incrBadge(int).

Author: Javen

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

@@ -17,26 +17,10 @@ public class ServiceHelper {
 
     private static final int MAX_BADGE_NUMBER = 99999;
 
-    public static boolean isValidBadgeValue(String badge) {
-        if (badge.startsWith("+")) {
-            badge = badge.substring(1);
-            return isValidIntBadge(badge);
-        } else if (badge.startsWith("-")) {
-            badge = badge.substring(1);
-            return isValidIntBadge(badge);
-        } else {
-            return isValidIntBadge(badge);
-        }
-    }
 
-    private static boolean isValidIntBadge(String badge) {
-        int intBadge = 0;
-        try {
-            intBadge = Integer.parseInt(badge);
-            if (intBadge >= 0 && intBadge <= MAX_BADGE_NUMBER) {
-                return true;
-            }
-        } catch (NumberFormatException e) {
+    public static boolean isValidIntBadge(int intBadge) {
+        if (intBadge >= 0 && intBadge <= MAX_BADGE_NUMBER) {
+            return true;
         }
         return false;
     }

src/cn/jpush/api/push/model/notification/IosNotification.java

@@ -101,23 +101,38 @@ public Builder disableSound() {
             return this;
         }
 
-        public Builder setBadge(String badge) {
-            // check available badge value
-            if (!ServiceHelper.isValidBadgeValue(badge)) {
+        public Builder incrBadge(int badge) {
+            if (!ServiceHelper.isValidIntBadge(Math.abs(badge))) {
                 LOG.warn(ALERT_VALID_BADGE);
                 return this;
             }
 
-            this.badge = badge;
+            if (badge == 0) {
+                LOG.warn("No action for incrBadge(0)");
+                return this;
+                
+            } else if (badge > 0) {
+                this.badge = "+" + badge;
+            } else {
+                this.badge = "" + badge;
+            }
             return this;
         }
 
         public Builder setBadge(int badge) {
-            return setBadge(badge + "");
+            if (!ServiceHelper.isValidIntBadge(badge)) {
+                LOG.warn(ALERT_VALID_BADGE);
+                return this;
+            }
+            this.badge = "" + badge;
+            return this;
         }
 
-        public Builder setBadgeAuto() {
-            return setBadge(DEFAULT_BADGE);
+        /**
+         * equals to: +1
+         */
+        public Builder autoBadge() {
+            return incrBadge(1);
         }
 
         public Builder disableBadge() {

src/cn/jpush/api/push/model/notification/Notification.java

@@ -62,19 +62,19 @@ public static Notification ios(String alert, Map<String, String> extras) {
     /**
      * shortcut
      */
-    public static Notification ios_badgeAuto() {
+    public static Notification ios_auto_badge() {
         return newBuilder()
                 .addPlatformNotification(IosNotification.newBuilder()
                     .setAlert("")
-                    .setBadgeAuto()
+                    .autoBadge()
                     .build())
                 .build();
     }
 
     /**
      * shortcut
      */
-    public static Notification ios_badge(String badge) {
+    public static Notification ios_set_badge(int badge) {
         return newBuilder()
                 .addPlatformNotification(IosNotification.newBuilder()
                     .setAlert("")
@@ -83,6 +83,18 @@ public static Notification ios_badge(String badge) {
                 .build();
     }
 
+    /**
+     * shortcut
+     */
+    public static Notification ios_incr_badge(int badge) {
+        return newBuilder()
+                .addPlatformNotification(IosNotification.newBuilder()
+                    .setAlert("")
+                    .incrBadge(badge)
+                    .build())
+                .build();
+    }
+    
     /**
      * shortcut
      */

test/cn/jpush/api/common/ServiceHelperTest.java

@@ -45,15 +45,33 @@ public void testBadge_2() {
         Assert.assertEquals("", json, ios.toJSON());
     }
 
+    @Test
+    public void testBadge_auto() {
+        IosNotification ios = IosNotification.newBuilder().autoBadge().build();
+        JsonObject json = new JsonObject();
+        json.add("badge", new JsonPrimitive("+1"));
+        json.add("sound", new JsonPrimitive(""));
+        Assert.assertEquals("", json, ios.toJSON());
+    }
+    
     @Test
     public void testBadge_plus_2() {
-        IosNotification ios = IosNotification.newBuilder().setBadge("+2").build();
+        IosNotification ios = IosNotification.newBuilder().incrBadge(2).build();
         JsonObject json = new JsonObject();
         json.add("badge", new JsonPrimitive("+2"));
         json.add("sound", new JsonPrimitive(""));
         Assert.assertEquals("", json, ios.toJSON());
     }
 
+    @Test
+    public void testBadge_minus_2() {
+        IosNotification ios = IosNotification.newBuilder().incrBadge(-2).build();
+        JsonObject json = new JsonObject();
+        json.add("badge", new JsonPrimitive("-2"));
+        json.add("sound", new JsonPrimitive(""));
+        Assert.assertEquals("", json, ios.toJSON());
+    }
+    
     @Test
     public void testSound() {
         IosNotification ios = IosNotification.newBuilder().setSound("sound").build();

test/cn/jpush/api/push/model/notification/IosNotificationTest.java

@@ -68,7 +68,7 @@ public void sendNotification_ios_badge() throws Exception {
         PushPayload payload = PushPayload.newBuilder()
                 .setAudience(Audience.all())
                 .setPlatform(Platform.ios())
-                .setNotification(Notification.ios_badgeAuto())
+                .setNotification(Notification.ios_auto_badge())
                 .build();
         PushResult result = _client.sendPush(payload);
         assertTrue(result.isResultOK());