Change mpns to winphone even for notification - should be easier to understand

Author: Javen

…model/notification/MpnsNotification.java …l/notification/WinphoneNotification.javasrc/cn/jpush/api/push/model/notification/MpnsNotification.java renamed to src/cn/jpush/api/push/model/notification/WinphoneNotification.java src/cn/jpush/api/push/model/notification/MpnsNotification.java renamed to src/cn/jpush/api/push/model/notification/WinphoneNotification.java

@@ -8,8 +8,8 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-public class MpnsNotification extends PlatformNotification {
-    public static final String NOTIFICATION_MPNS = "mpns";
+public class WinphoneNotification extends PlatformNotification {
+    public static final String NOTIFICATION_WINPHONE = "winphone";
 
     public static final String TITLE = "title";
     public static final String EXTRAS = "extras";
@@ -19,7 +19,7 @@ public class MpnsNotification extends PlatformNotification {
     private final String openPage;
     private final ImmutableMap<String, String> extras;
 
-    private MpnsNotification(String alert, String title, String openPage, 
+    private WinphoneNotification(String alert, String title, String openPage, 
             ImmutableMap<String, String> extras) {
         super(alert);
         this.title = title;
@@ -31,14 +31,14 @@ public static Builder newBuilder() {
         return new Builder();
     }
 
-    public static MpnsNotification alert(String alert) {
+    public static WinphoneNotification alert(String alert) {
         return newBuilder().setAlert(alert).build();
     }
 
 
     @Override
     public String getPlatform() {
-        return NOTIFICATION_MPNS;
+        return NOTIFICATION_WINPHONE;
     }
 
     @Override
@@ -106,8 +106,8 @@ public Builder addExtra(String key, String value) {
             return this;
         }
 
-        public MpnsNotification build() {
-            return new MpnsNotification(alert, title, openPage, 
+        public WinphoneNotification build() {
+            return new WinphoneNotification(alert, title, openPage, 
                     (null == extrasBuilder) ? null : extrasBuilder.build());
         }
     }

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

@@ -50,12 +50,12 @@ public void testAlertIos() {
     @Test
     public void testAlertMpns() {
         Notification notification = Notification.newBuilder()
-                .addPlatformNotification(MpnsNotification.alert("alert"))
+                .addPlatformNotification(WinphoneNotification.alert("alert"))
                 .build();
         JsonObject json = new JsonObject();
-        JsonObject mpns = new JsonObject();
-        mpns.add("alert", new JsonPrimitive("alert"));
-        json.add("mpns", mpns);
+        JsonObject winphone = new JsonObject();
+        winphone.add("alert", new JsonPrimitive("alert"));
+        json.add("winphone", winphone);
         Assert.assertEquals("", json, notification.toJSON());
     }
 

…/notification/MpnsNotificationTests.java …ification/WinphoneNotificationTests.javatest/cn/jpush/api/push/model/notification/MpnsNotificationTests.java renamed to test/cn/jpush/api/push/model/notification/WinphoneNotificationTests.java test/cn/jpush/api/push/model/notification/MpnsNotificationTests.java renamed to test/cn/jpush/api/push/model/notification/WinphoneNotificationTests.java

@@ -6,38 +6,38 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-public class MpnsNotificationTests {
+public class WinphoneNotificationTests {
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegal() {
-        MpnsNotification mpns = MpnsNotification.newBuilder().build();
-        Assert.assertEquals("", "", mpns.toJSON());
+        WinphoneNotification winphone = WinphoneNotification.newBuilder().build();
+        Assert.assertEquals("", "", winphone.toJSON());
     }
 
     @Test
     public void testQuickAlert() {
-        MpnsNotification mpns = MpnsNotification.alert("aaa");
+        WinphoneNotification winphone = WinphoneNotification.alert("aaa");
         JsonObject json = new JsonObject();
         json.add("alert", new JsonPrimitive("aaa"));
-        Assert.assertEquals("", json, mpns.toJSON());
+        Assert.assertEquals("", json, winphone.toJSON());
     }
 
     @Test
     public void testTitle() {
-        MpnsNotification mpns = MpnsNotification.newBuilder().setTitle("title").build();
+        WinphoneNotification winphone = WinphoneNotification.newBuilder().setTitle("title").build();
         JsonObject json = new JsonObject();
         json.add("title", new JsonPrimitive("title"));
-        Assert.assertEquals("", json, mpns.toJSON());
+        Assert.assertEquals("", json, winphone.toJSON());
     }
 
     @Test
     public void testExtra() {
-        MpnsNotification mpns = MpnsNotification.newBuilder().addExtra("key", "value").build();
+        WinphoneNotification winphone = WinphoneNotification.newBuilder().addExtra("key", "value").build();
         JsonObject json = new JsonObject();
         JsonObject extra = new JsonObject();
         extra.add("key", new JsonPrimitive("value"));
         json.add("extras", extra);
-        Assert.assertEquals("", json, mpns.toJSON());
+        Assert.assertEquals("", json, winphone.toJSON());
     }