Merge pull request #82 from jpush/dev

Dev

Author: KenChoi1992

example/main/java/cn/jpush/api/examples/PushExample.java

@@ -82,7 +82,7 @@ public static void testSendPush() {
 		ClientConfig clientConfig = ClientConfig.getInstance();
         final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
         String authCode = ServiceHelper.getBasicAuthorization(APP_KEY, MASTER_SECRET);
-        // Here you can use NativeHttpClient or NettyHttpClient.
+        // Here you can use NativeHttpClient or NettyHttpClient or ApacheHttpClient.
         NativeHttpClient httpClient = new NativeHttpClient(authCode, null, clientConfig);
         // Call setHttpClient to set httpClient,
         // If you don't invoke this method, default httpClient will use NativeHttpClient.
@@ -95,7 +95,6 @@ public void run() {
                     for (int j = 0; j < 200; j++) {
                         long start = System.currentTimeMillis();
                         try {
-                            jpushClient.sendPush(payload);
                             PushResult result = jpushClient.sendPush(payload);
                             LOG.info("Got result - " + result);
 
@@ -299,6 +298,14 @@ public static PushPayload buildPushObject_ios_audienceMore_messageWithExtras() {
                 .build();
     }
 
+    public static PushPayload buildPushObject_all_tag_not() {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.all())
+                .setAudience(Audience.tag_not("abc", "123"))
+                .setNotification(Notification.alert(ALERT))
+                .build();
+    }
+
     public static void testSendPushWithCustomConfig() {
         ClientConfig config = ClientConfig.getInstance();
         // Setup the custom hostname

pom.xml

@@ -35,14 +35,14 @@
 		<url>https://github.com/jpush/jpush-api-java-client</url>
 		<connection>scm:git:[email protected]:jpush/jpush-api-java-client.git</connection>
 		<developerConnection>scm:git:[email protected]:jpush/jpush-api-java-client.git</developerConnection>
-		<tag>v3.2.18</tag>
+		<tag>v3.2.19</tag>
 	</scm>
 
 	<dependencies>
         <dependency>
             <groupId>cn.jpush.api</groupId>
             <artifactId>jiguang-common</artifactId>
-            <version>1.0.5</version>
+            <version>1.0.6</version>
         </dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>

src/main/java/cn/jpush/api/push/model/audience/Audience.java

@@ -58,6 +58,20 @@ public static Audience tag_and(Collection<String> tagValues) {
                 .addAudienceTargetValues(tagValues).build();
         return newBuilder().addAudienceTarget(target).build();
     }
+
+    public static Audience tag_not(String...tagValue) {
+        AudienceTarget target = AudienceTarget.newBuilder()
+                .setAudienceType(AudienceType.TAG_NOT)
+                .addAudienceTargetValues(tagValue).build();
+        return newBuilder().addAudienceTarget(target).build();
+    }
+
+    public static Audience tag_not(Collection<String> tagValues) {
+        AudienceTarget target = AudienceTarget.newBuilder()
+                .setAudienceType(AudienceType.TAG_NOT)
+                .addAudienceTargetValues(tagValues).build();
+        return newBuilder().addAudienceTarget(target).build();
+    }
 
     public static Audience alias(String... alias) {
         AudienceTarget target = AudienceTarget.newBuilder()

src/main/java/cn/jpush/api/push/model/audience/AudienceTarget.java

@@ -40,6 +40,14 @@ public static AudienceTarget tag_and(Collection<String> tags) {
         return newBuilder().setAudienceType(AudienceType.TAG_AND).addAudienceTargetValues(tags).build();
     }
 
+    public static AudienceTarget tag_not(String...tag) {
+        return newBuilder().setAudienceType(AudienceType.TAG_NOT).addAudienceTargetValues(tag).build();
+    }
+
+    public static AudienceTarget tag_not(Collection<String> tags) {
+        return newBuilder().setAudienceType(AudienceType.TAG_NOT).addAudienceTargetValues(tags).build();
+    }
+
     public static AudienceTarget alias(String... alias) {
         return newBuilder().setAudienceType(AudienceType.ALIAS).addAudienceTargetValues(alias).build();
     }

src/main/java/cn/jpush/api/push/model/audience/AudienceType.java

@@ -3,6 +3,7 @@
 public enum AudienceType {
 	TAG("tag"),
 	TAG_AND("tag_and"),
+	TAG_NOT("tag_not"),
 	ALIAS("alias"),
 	SEGMENT("segment"),
 	REGISTRATION_ID("registration_id");

src/test/java/cn/jpush/api/BaseTest.java

@@ -5,7 +5,7 @@
 public abstract class BaseTest {
 
 	protected static final String APP_KEY = "d4ee2375846bc30fa51334f5";
-    protected static final String MASTER_SECRET = "2bf52ee46fdeaadb8718fc15";
+    protected static final String MASTER_SECRET = "29e01630956b6c42cdf44562";
 
     public static final String ALERT = "JPush Test - alert";
     public static final String MSG_CONTENT = "JPush Test - msgContent";

src/test/java/cn/jpush/api/report/ReportFunctionTests.java

@@ -11,7 +11,7 @@
 
 @Category(SlowTests.class)
 public class ReportFunctionTests extends BaseTest {
-    
+
 	@Test
 	public void getReceivedsFixed() throws Exception {
 	    ReceivedsResult result = jpushClient.getReportReceiveds("1613113584,1229760629,1174658841,1174658641");