Merge branch 'v30' into dev

Javen · Javen · commit 7afc8546809b · 2014-04-25T16:43:40.000+08:00
diff --git a/src/cn/jpush/api/common/DeviceType.java b/src/cn/jpush/api/common/DeviceType.java
@@ -4,7 +4,7 @@ public enum DeviceType {
     
 	Android("android"),
 	IOS("ios"),
-	MPNs("mpns");
+	WinPhone("winphone");
 	
 	private final String value;
 	
diff --git a/src/cn/jpush/api/push/PushClient.java b/src/cn/jpush/api/push/PushClient.java
@@ -55,8 +55,8 @@ public PushClient(String masterSecret, String appKey, boolean apnsProduction, lo
     
     public PushResult sendPush(PushPayload pushPayload) {
         if (_overallSettingEnabled) {
-            pushPayload.resetOptionalTimeToLive(_timeToLive);
-            pushPayload.resetOptionalApnsProduction(_apnsProduction);
+            pushPayload.resetOptionsTimeToLive(_timeToLive);
+            pushPayload.resetOptionsApnsProduction(_apnsProduction);
         }
         
         ResponseResult response = sendPost(PUSH_URL, pushPayload.toJSON().getAsString(), _authCode);
diff --git a/src/cn/jpush/api/push/model/Options.java b/src/cn/jpush/api/push/model/Options.java
@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-public class Optional implements PushModel {
+public class Options implements PushModel {
     public static final String OPTIONAL = "optional";
     
     public static final String SENDNO = "sendno";
@@ -18,7 +18,7 @@ public class Optional implements PushModel {
     private long timeToLive;
     private boolean apnsProduction;
     
-    private Optional(int sendno, int overrideMsgId, long timeToLive, boolean apnsProduction) {
+    private Options(int sendno, int overrideMsgId, long timeToLive, boolean apnsProduction) {
         this.sendno = sendno;
         this.overrideMsgId = overrideMsgId;
         this.timeToLive = timeToLive;
@@ -81,11 +81,11 @@ public Builder setApnsProduction(boolean apnsProduction) {
             return this;
         }
         
-        public Optional build() {
+        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.");
-            return new Optional(sendno, overrideMsgId, timeToLive, apnsProduction);
+            return new Options(sendno, overrideMsgId, timeToLive, apnsProduction);
         }
     }
 
diff --git a/src/cn/jpush/api/push/model/Platform.java b/src/cn/jpush/api/push/model/Platform.java
@@ -29,6 +29,18 @@ public static Platform all() {
         return newBuilder().setAll(true).build();
     }
     
+    public static Platform android() {
+        return newBuilder().addDeviceType(DeviceType.Android).build();
+    }
+    
+    public static Platform ios() {
+        return newBuilder().addDeviceType(DeviceType.IOS).build();
+    }
+    
+    public static Platform winphone() {
+        return newBuilder().addDeviceType(DeviceType.WinPhone).build();
+    }
+    
     public boolean isAll() {
         return all;
     }
diff --git a/src/cn/jpush/api/push/model/PushPayload.java b/src/cn/jpush/api/push/model/PushPayload.java
@@ -12,15 +12,15 @@ public class PushPayload implements PushModel {
     private final Audience audience;
     private final Notification notification;
     private final Message message;
-    private Optional optional;
+    private Options options;
     
     private PushPayload(Platform platform, Audience audience, 
-            Notification notification, Message message, Optional optional) {
+            Notification notification, Message message, Options options) {
         this.platform = platform;
         this.audience = audience;
         this.notification = notification;
         this.message = message;
-        this.optional = optional;
+        this.options = options;
     }
     
     public static Builder newBuilder() {
@@ -39,19 +39,19 @@ public static PushPayload simpleMessageAll(String content) {
             .setMessage(Message.content(content)).build();
     }
     
-    public void resetOptionalApnsProduction(boolean apnsProduction) {
-        if (null == optional) {
-            optional = Optional.newBuilder().setApnsProduction(apnsProduction).build();
+    public void resetOptionsApnsProduction(boolean apnsProduction) {
+        if (null == options) {
+            options = Options.newBuilder().setApnsProduction(apnsProduction).build();
         } else {
-            optional.setApnsProduction(apnsProduction);
+            options.setApnsProduction(apnsProduction);
         }
     }
     
-    public void resetOptionalTimeToLive(long timeToLive) {
-        if (null == optional) {
-            optional = Optional.newBuilder().setTimeToLive(timeToLive).build();
+    public void resetOptionsTimeToLive(long timeToLive) {
+        if (null == options) {
+            options = Options.newBuilder().setTimeToLive(timeToLive).build();
         } else {
-            optional.setTimeToLive(timeToLive);
+            options.setTimeToLive(timeToLive);
         }
     }
     
@@ -67,17 +67,17 @@ public JsonElement toJSON() {
             json.add(Message.MESSAGE, message.toJSON());
         }
         if (null != message) {
-            json.add(Optional.OPTIONAL, optional.toJSON());
+            json.add(Options.OPTIONAL, options.toJSON());
         }
         return json;
     }
     
     public static class Builder {
-        private Platform platform = Platform.all();
+        private Platform platform = null;
         private Audience audience = null;
         private Notification notification = null;
         private Message message = null;
-        private Optional optional = null;
+        private Options options = null;
         
         public Builder setPlatform(Platform platform) {
             this.platform = platform;
@@ -99,15 +99,15 @@ public Builder setMessage(Message message) {
             return this;
         }
         
-        public Builder setOptional(Optional optional) {
-            this.optional = optional;
+        public Builder setOptions(Options options) {
+            this.options = options;
             return this;
         }
         
         public PushPayload build() {
-            Preconditions.checkArgument(null != audience, "Audience should be set.");
+            Preconditions.checkArgument(! (null == audience || null == platform), "Audience should be set.");
             Preconditions.checkArgument(! (null == notification && null == message), "notification or message should be set at least one.");
-            return new PushPayload(platform, audience, notification, message, optional);
+            return new PushPayload(platform, audience, notification, message, options);
         }
     }
 }
diff --git a/src/cn/jpush/api/push/model/audience/Audience.java b/src/cn/jpush/api/push/model/audience/Audience.java
@@ -50,6 +50,20 @@ public static Audience tag(Collection<String> tagValues) {
         return newBuilder().addAudienceTarget(target).build();
     }
     
+    public static Audience tagAnd(String... tagValue) {
+        AudienceTarget target = AudienceTarget.newBuilder()
+                .setAudienceType(AudienceType.TAG_AND)
+                .addAudienceTargetValues(tagValue).build();
+        return newBuilder().addAudienceTarget(target).build();
+    }
+    
+    public static Audience tagAnd(Collection<String> tagValues) {
+        AudienceTarget target = AudienceTarget.newBuilder()
+                .setAudienceType(AudienceType.TAG_AND)
+                .addAudienceTargetValues(tagValues).build();
+        return newBuilder().addAudienceTarget(target).build();
+    }
+    
     public static Audience alias(String... alias) {
         AudienceTarget target = AudienceTarget.newBuilder()
                 .setAudienceType(AudienceType.ALIAS)
diff --git a/src/cn/jpush/api/push/model/audience/AudienceType.java b/src/cn/jpush/api/push/model/audience/AudienceType.java
@@ -2,7 +2,7 @@
 
 public enum AudienceType {
 	TAG("tag"),
-	TAGAND("tag_and"),
+	TAG_AND("tag_and"),
 	ALIAS("alias"),
 	SEGMENT("segment"),
 	REGISTRATION_ID("registration_id");
diff --git a/src/cn/jpush/api/push/model/notification/WinPhoneNotification.java b/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());
         }
     }
diff --git a/test/cn/jpush/api/push/model/OptionsTests.java b/test/cn/jpush/api/push/model/OptionsTests.java
@@ -4,41 +4,41 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import cn.jpush.api.push.model.Optional;
+import cn.jpush.api.push.model.Options;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-public class OptionalTests {
+public class OptionsTests {
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegalSendno() {
-        Optional.newBuilder().setSendno(-1).build();
+        Options.newBuilder().setSendno(-1).build();
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegalOverrideMsgId() {
-        Optional.newBuilder().setOverrideMsgId(-1).build();
+        Options.newBuilder().setOverrideMsgId(-1).build();
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegalTimeToLive() {
-        Optional.newBuilder().setTimeToLive(-1).build();
+        Options.newBuilder().setTimeToLive(-1).build();
     }
 
     @Test
     public void testSendno() {
         JsonObject json = new JsonObject();
         json.add("sendno", new JsonPrimitive(111));
-        Optional optional = Optional.newBuilder().setSendno(111).build();
+        Options optional = Options.newBuilder().setSendno(111).build();
         Assert.assertEquals("", json, optional.toJSON());
     }
 
     @Test
     public void testApnsProduction() {
         JsonObject json = new JsonObject();
         json.add("apns_production", new JsonPrimitive(false));
-        Optional optional = Optional.newBuilder().setApnsProduction(false).build();
+        Options optional = Options.newBuilder().setApnsProduction(false).build();
         Assert.assertEquals("", json, optional.toJSON());
     }
 
diff --git a/test/cn/jpush/api/push/model/PushPayloadTests.java b/test/cn/jpush/api/push/model/PushPayloadTests.java
@@ -3,8 +3,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-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.Notification;
 
@@ -39,17 +37,20 @@ public void testIllegal_NoAudience() {
         PushPayload.newBuilder().setPlatform(platform).setNotification(notifcation).build();
     }
     
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testIllegal_NoPlatform() {
         Audience audience = Audience.all();
         Notification notifcation = Notification.alert("alert");
-        PushPayload push = PushPayload.newBuilder().setAudience(audience).setNotification(notifcation).build();
+        PushPayload.newBuilder().setAudience(audience).setNotification(notifcation).build();
+    }
+    
+    public void testNormal() {
+        Platform platform = Platform.all();
+        Audience audience = Audience.all();
+        Notification notifcation = Notification.alert("alert");
+        PushPayload payload = PushPayload.newBuilder().setAudience(audience).setNotification(notifcation).build();
         
-        JsonObject json = new JsonObject();
-        json.add("audience", new JsonPrimitive("all"));
-        json.add("platform", new JsonPrimitive("all"));
-        json.add("notification", getNotificationAlert("alert"));
-        Assert.assertEquals("", json, push.toJSON());
+        Assert.assertEquals("", getNotificationAlert("alert"), payload.toJSON());
     }
 
     public JsonObject getNotificationAlert(String alert) {
diff --git a/test/cn/jpush/api/push/model/notification/MpnsNotificationTests.java b/test/cn/jpush/api/push/model/notification/MpnsNotificationTests.java
@@ -10,29 +10,29 @@ public class MpnsNotificationTests {
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegal() {
-        MpnsNotification mpns = MpnsNotification.newBuilder().build();
+        WinPhoneNotification mpns = WinPhoneNotification.newBuilder().build();
         Assert.assertEquals("", "", mpns.toJSON());
     }
     
     @Test
     public void testQuickAlert() {
-        MpnsNotification mpns = MpnsNotification.alert("aaa");
+        WinPhoneNotification mpns = WinPhoneNotification.alert("aaa");
         JsonObject json = new JsonObject();
         json.add("alert", new JsonPrimitive("aaa"));
         Assert.assertEquals("", json, mpns.toJSON());
     }
 
     @Test
     public void testTitle() {
-        MpnsNotification mpns = MpnsNotification.newBuilder().setTitle("title").build();
+        WinPhoneNotification mpns = WinPhoneNotification.newBuilder().setTitle("title").build();
         JsonObject json = new JsonObject();
         json.add("title", new JsonPrimitive("title"));
         Assert.assertEquals("", json, mpns.toJSON());
     }
     
     @Test
     public void testExtra() {
-        MpnsNotification mpns = MpnsNotification.newBuilder().addExtra("key", "value").build();
+        WinPhoneNotification mpns = WinPhoneNotification.newBuilder().addExtra("key", "value").build();
         JsonObject json = new JsonObject();
         JsonObject extra = new JsonObject();
         extra.add("key", new JsonPrimitive("value"));

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ public PushClient(String masterSecret, String appKey, boolean apnsProduction, lo`
`55`	`55`
`56`	`56`	`public PushResult sendPush(PushPayload pushPayload) {`
`57`	`57`	`if (_overallSettingEnabled) {`
`58`		`- pushPayload.resetOptionalTimeToLive(_timeToLive);`
`59`		`- pushPayload.resetOptionalApnsProduction(_apnsProduction);`
	`58`	`+ pushPayload.resetOptionsTimeToLive(_timeToLive);`
	`59`	`+ pushPayload.resetOptionsApnsProduction(_apnsProduction);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`ResponseResult response = sendPost(PUSH_URL, pushPayload.toJSON().getAsString(), _authCode);`