Add shortcuts for Notification

Author: Javen

src/cn/jpush/api/JPushClient.java

@@ -11,8 +11,6 @@
 import cn.jpush.api.push.model.Platform;
 import cn.jpush.api.push.model.PushPayload;
 import cn.jpush.api.push.model.audience.Audience;
-import cn.jpush.api.push.model.notification.AndroidNotification;
-import cn.jpush.api.push.model.notification.IosNotification;
 import cn.jpush.api.push.model.notification.Notification;
 import cn.jpush.api.report.MessagesResult;
 import cn.jpush.api.report.ReceivedsResult;
@@ -125,13 +123,7 @@ public PushResult sendAndroidNotificationWithAlias(String title, String alert,
         PushPayload payload = PushPayload.newBuilder()
                 .setPlatform(Platform.android())
                 .setAudience(Audience.alias(alias))
-                .setNotification(Notification.newBuilder()
-                        .addPlatformNotification(AndroidNotification.newBuilder()
-                                .setTitle(title)
-                                .setAlert(alert)
-                                .addExtras(extras)
-                                .build())
-                        .build())
+                .setNotification(Notification.android(alert, title, extras))
                 .build();
         return _pushClient.sendPush(payload);
     }
@@ -145,13 +137,7 @@ public PushResult sendAndroidNotificationWithRegistrationID(String title, String
         PushPayload payload = PushPayload.newBuilder()
                 .setPlatform(Platform.android())
                 .setAudience(Audience.registrationId(registrationID))
-                .setNotification(Notification.newBuilder()
-                        .addPlatformNotification(AndroidNotification.newBuilder()
-                                .setTitle(title)
-                                .setAlert(alert)
-                                .addExtras(extras)
-                                .build())
-                        .build())
+                .setNotification(Notification.android(alert, title, extras))
                 .build();
         return _pushClient.sendPush(payload);
     }
@@ -165,16 +151,11 @@ public PushResult sendIosNotificationWithAlias(String alert,
         PushPayload payload = PushPayload.newBuilder()
                 .setPlatform(Platform.ios())
                 .setAudience(Audience.alias(alias))
-                .setNotification(Notification.newBuilder()
-                        .addPlatformNotification(IosNotification.newBuilder()
-                                .setAlert(alert)
-                                .addExtras(extras)
-                                .build())
-                        .build())
+                .setNotification(Notification.ios(alert, extras))
                 .build();
         return _pushClient.sendPush(payload);
     }
-
+    
     /**
      * Shortcut
      */
@@ -184,12 +165,7 @@ public PushResult sendIosNotificationWithRegistrationID(String alert,
         PushPayload payload = PushPayload.newBuilder()
                 .setPlatform(Platform.ios())
                 .setAudience(Audience.registrationId(registrationID))
-                .setNotification(Notification.newBuilder()
-                        .addPlatformNotification(IosNotification.newBuilder()
-                                .setAlert(alert)
-                                .addExtras(extras)
-                                .build())
-                        .build())
+                .setNotification(Notification.ios(alert, extras))
                 .build();
         return _pushClient.sendPush(payload);
     }

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

@@ -1,5 +1,7 @@
 package cn.jpush.api.push.model.notification;
 
+import java.util.Map;
+
 import cn.jpush.api.push.model.PushModel;
 
 import com.google.common.base.Preconditions;
@@ -32,6 +34,43 @@ public static Notification alert(String alert) {
         return newBuilder().setAlert(alert).build();
     }
 
+    /**
+     * shortcut
+     */
+    public static Notification android(String alert, String title, Map<String, String> extras) {
+        return newBuilder()
+                .addPlatformNotification(AndroidNotification.newBuilder()
+                    .setAlert(alert)
+                    .setTitle(title)
+                    .addExtras(extras)
+                    .build())
+                .build();
+    }
+    
+    /**
+     * shortcut
+     */
+    public static Notification ios(String alert, Map<String, String> extras) {
+        return newBuilder()
+                .addPlatformNotification(IosNotification.newBuilder()
+                    .setAlert(alert)
+                    .addExtras(extras)
+                    .build())
+                .build();
+    }
+    
+    /**
+     * shortcut
+     */
+    public static Notification winphone(String alert, Map<String, String> extras) {
+        return newBuilder()
+                .addPlatformNotification(WinphoneNotification.newBuilder()
+                    .setAlert(alert)
+                    .addExtras(extras)
+                    .build())
+                .build();
+    }
+    
     public JsonElement toJSON() {
         JsonObject json = new JsonObject();
         if (null != alert) {