adding queue notifications

MaxPresman · MaxPresman · commit eb7e469db1e4 · 2016-10-21T08:31:19.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -21,10 +21,7 @@ configurations.all {
 }
 
 repositories {
-
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-    maven { url "http://repo.maven.apache.org/maven2" }
-    maven { url "https://plugins.gradle.org/m2/" }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/src/main/java/com/pubnub/api/PNConfiguration.java b/src/main/java/com/pubnub/api/PNConfiguration.java
@@ -117,6 +117,11 @@ public class PNConfiguration {
     @Setter
     private Proxy proxy;
 
+    /**
+     * if set, the SDK will alert once the number of messages arrived in one call equal to the threshold
+     */
+    private Integer requestMessageCountThreshold;
+
     /**
      * Initialize the PNConfiguration with default values
      */
diff --git a/src/main/java/com/pubnub/api/enums/PNStatusCategory.java b/src/main/java/com/pubnub/api/enums/PNStatusCategory.java
@@ -19,4 +19,6 @@ public enum PNStatusCategory {
     PNTLSConnectionFailedCategory,
     PNTLSUntrustedCertificateCategory,
 
+    PNRequestMessageCountExceededCategory
+
 }
diff --git a/src/main/java/com/pubnub/api/managers/SubscriptionManager.java b/src/main/java/com/pubnub/api/managers/SubscriptionManager.java
@@ -220,21 +220,24 @@ public void onResponse(final SubscribeEnvelope result, final PNStatus status) {
                 }
 
                 if (!subscriptionStatusAnnounced) {
-                    PNStatus pnStatus = PNStatus.builder()
-                            .error(false)
+                    PNStatus pnStatus = createPublicStatus(status)
                             .category(PNStatusCategory.PNConnectedCategory)
-                            .statusCode(status.getStatusCode())
-                            .authKey(status.getAuthKey())
-                            .operation(status.getOperation())
-                            .clientRequest(status.getClientRequest())
-                            .origin(status.getOrigin())
-                            .tlsEnabled(status.isTlsEnabled())
+                            .error(false)
                             .build();
-
                     subscriptionStatusAnnounced = true;
                     listenerManager.announce(pnStatus);
                 }
 
+                Integer requestMessageCountThreshold = pubnub.getConfiguration().getRequestMessageCountThreshold();
+                if (requestMessageCountThreshold != null && requestMessageCountThreshold == result.getMessages().size()) {
+                    PNStatus pnStatus = createPublicStatus(status)
+                            .category(PNStatusCategory.PNRequestMessageCountExceededCategory)
+                            .error(false)
+                            .build();
+
+                    listenerManager.announce(pnStatus);
+                }
+
                 if (result.getMessages().size() != 0) {
                     messageQueue.addAll(result.getMessages());
                 }
@@ -308,4 +311,15 @@ public final synchronized void unsubscribeAll() {
                 .channels(subscriptionState.prepareChannelList(false))
                 .build());
     }
+
+    private PNStatus.PNStatusBuilder createPublicStatus(PNStatus privateStatus) {
+        return PNStatus.builder()
+                .statusCode(privateStatus.getStatusCode())
+                .authKey(privateStatus.getAuthKey())
+                .operation(privateStatus.getOperation())
+                .clientRequest(privateStatus.getClientRequest())
+                .origin(privateStatus.getOrigin())
+                .tlsEnabled(privateStatus.isTlsEnabled());
+    }
+
 }
diff --git a/src/test/java/com/pubnub/api/managers/SubscriptionManagerTest.java b/src/test/java/com/pubnub/api/managers/SubscriptionManagerTest.java
@@ -140,6 +140,36 @@ public void presence(PubNub pubnub, PNPresenceEventResult presence) {
 
     }
 
+    @Test
+    public void testQueueNotificationsBuilder() {
+        pubnub.getConfiguration().setRequestMessageCountThreshold(1);
+        final AtomicBoolean gotStatus = new AtomicBoolean();
+        stubFor(get(urlPathEqualTo("/v2/subscribe/mySubscribeKey/ch2,ch1/0"))
+                .willReturn(aResponse().withBody("{\"t\":{\"t\":\"14607577960932487\",\"r\":1},\"m\":[{\"a\":\"4\",\"f\":0,\"i\":\"Client-g5d4g\",\"p\":{\"t\":\"14607577960925503\",\"r\":1},\"o\":{\"t\":\"14737141991877032\",\"r\":2},\"k\":\"sub-c-4cec9f8e-01fa-11e6-8180-0619f8945a4f\",\"c\":\"coolChannel\",\"d\":{\"text\":\"Message\"},\"b\":\"coolChannel\"}]}")));
+
+        pubnub.addListener(new SubscribeCallback() {
+            @Override
+            public void status(PubNub pubnub, PNStatus status) {
+                if (status.getCategory() == PNStatusCategory.PNRequestMessageCountExceededCategory) {
+                    gotStatus.set(true);
+                }
+            }
+
+            @Override
+            public void message(PubNub pubnub, PNMessageResult message) {
+            }
+
+            @Override
+            public void presence(PubNub pubnub, PNPresenceEventResult presence) {
+            }
+        });
+
+
+        pubnub.subscribe().channels(Arrays.asList("ch1", "ch2")).execute();
+
+        Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAtomic(gotStatus, org.hamcrest.core.IsEqual.equalTo(true));
+    }
+
     @Test
     public void testSubscribeBuilderWithAccessManager403Error() {
         final AtomicInteger gotStatus = new AtomicInteger();

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,7 @@ configurations.all {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`repositories {`
`24`		`-`
`25`		`- maven { url "https://oss.sonatype.org/content/repositories/snapshots" }`
`26`		`- maven { url "http://repo.maven.apache.org/maven2" }`
`27`		`- maven { url "https://plugins.gradle.org/m2/" }`
	`24`	`+ mavenCentral()`
`28`	`25`	`}`
`29`	`26`
`30`	`27`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,6 @@ public enum PNStatusCategory {`
`19`	`19`	`PNTLSConnectionFailedCategory,`
`20`	`20`	`PNTLSUntrustedCertificateCategory,`
`21`	`21`
	`22`	`+ PNRequestMessageCountExceededCategory`
	`23`	`+`
`22`	`24`	`}`