Message_TTL and Publisher

Author: marceloinacio

.pubnub.yml

@@ -149,6 +149,7 @@ features:
     - PUBLISH-ASYNC
     - PUBLISH-FIRE 
     - PUBLISH-REPLICATION-FLAG
+    - PUBLISH-MESSAGE-TTL
   storage:
     - STORAGE-REVERSE
     - STORAGE-INCLUDE-TIMETOKEN
@@ -164,3 +165,4 @@ features:
     - SUBSCRIBE-WITH-TIMETOKEN
     - SUBSCRIBE-WILDCARD
     - SUBSCRIBE-FILTER-EXPRESSION
+    - SUBSCRIBE-PUBLISHER-UUID

src/main/java/com/pubnub/api/endpoints/pubsub/Publish.java

@@ -35,6 +35,10 @@ public class Publish extends Endpoint<List<Object>, PNPublishResult> {
     private Object meta;
     @Setter
     private Boolean replicate;
+    @Setter
+    private Boolean storeInHistory;
+    @Setter
+    private Integer ttl;
 
     private PublishSequenceManager publishSequenceManager;
 
@@ -43,6 +47,7 @@ public Publish(PubNub pubnub, PublishSequenceManager providedPublishSequenceMana
 
         this.publishSequenceManager = providedPublishSequenceManager;
         this.replicate = true;
+        this.storeInHistory = true;
     }
 
     @Override
@@ -59,6 +64,9 @@ protected final void validateParams() throws PubNubException {
         if (this.getPubnub().getConfiguration().getPublishKey() == null || this.getPubnub().getConfiguration().getPublishKey().isEmpty()) {
             throw PubNubException.builder().pubnubError(PubNubErrorBuilder.PNERROBJ_PUBLISH_KEY_MISSING).build();
         }
+//        if (storeInHistory && ttl == null) {
+//
+//        }
     }
 
     @Override
@@ -97,6 +105,10 @@ protected final Call<List<Object>> doWork(Map<String, String> params) throws Pub
             params.put("norep", "true");
         }
 
+        if (storeInHistory && ttl != null) {
+            params.put("ttl", String.valueOf(ttl));
+        }
+
         if (this.getPubnub().getConfiguration().getCipherKey() != null) {
             Crypto crypto = new Crypto(this.getPubnub().getConfiguration().getCipherKey());
             stringifiedMessage = crypto.encrypt(stringifiedMessage).replace("\n", "");

src/main/java/com/pubnub/api/models/consumer/pubsub/PNMessageResult.java

@@ -21,5 +21,6 @@ public class PNMessageResult {
     private Long timetoken;
     private Object userMetadata;
 
+    private String publisher;
 }
 

src/main/java/com/pubnub/api/workers/SubscribeMessageWorker.java

@@ -166,6 +166,7 @@ private void processIncomingPayload(final SubscribeMessage message) {
                     .channel(channel)
                     .subscription(subscriptionMatch)
                     .timetoken(publishMetaData.getPublishTimetoken())
+                    .publisher(message.getIssuingClientId())
                     .build();
 
 

src/test/java/com/pubnub/api/endpoints/pubsub/PublishTest.java

@@ -390,4 +390,31 @@ public void testInvalidMeta() throws PubNubException, InterruptedException {
         assertEquals("myUUID", requests.get(0).queryParameter("uuid").firstValue());
         assertNull(requests.get(0).queryParameter("norep"));
     }
+
+    @Test
+    public void testTTLStoreInHistoryDefaultSuccessSync() throws PubNubException, InterruptedException {
+
+        stubFor(get(urlPathEqualTo("/publish/myPublishKey/mySubscribeKey/0/coolChannel/0/%22hi%22"))
+                .willReturn(aResponse().withBody("[1,\"Sent\",\"14598111595318003\"]")));
+
+        instance.channel("coolChannel").message("hi").ttl(10).sync();
+
+        List<LoggedRequest> requests = findAll(getRequestedFor(urlMatching("/.*")));
+        assertEquals(1, requests.size());
+        assertEquals("10", requests.get(0).queryParameter("ttl").firstValue());
+    }
+
+    @Test
+    public void testTTLStoreInHistoryFalseSuccessSync() throws PubNubException, InterruptedException {
+
+        stubFor(get(urlPathEqualTo("/publish/myPublishKey/mySubscribeKey/0/coolChannel/0/%22hi%22"))
+                .willReturn(aResponse().withBody("[1,\"Sent\",\"14598111595318003\"]")));
+
+        instance.channel("coolChannel").message("hi").storeInHistory(false).sync();
+
+        List<LoggedRequest> requests = findAll(getRequestedFor(urlMatching("/.*")));
+        assertEquals(1, requests.size());
+        assertEquals(null, requests.get(0).queryParameter("ttl"));
+    }
+
 }

src/test/java/com/pubnub/api/endpoints/pubsub/SubscribeEndpointTest.java

@@ -214,6 +214,4 @@ public void stopAndReconnect() throws PubNubException {
         assertEquals(2, requests.size());
     }
 
-
-
 }

src/test/java/com/pubnub/api/managers/SubscriptionManagerTest.java

@@ -105,7 +105,7 @@ public void testSubscribeBuilder() {
         final AtomicInteger gotStatus = new AtomicInteger();
         final AtomicBoolean gotMessage = 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\"}]}")));
+                .willReturn(aResponse().withBody("{\"t\":{\"t\":\"14607577960932487\",\"r\":1},\"m\":[{\"a\":\"4\",\"f\":0,\"i\":\"Publisher-A\",\"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
@@ -124,6 +124,7 @@ public void message(PubNub pubnub, PNMessageResult message) {
                 assertEquals("Message", message.getMessage().get("text").asText());
                 assertEquals("coolChannel", message.getChannel());
                 assertEquals(null, message.getSubscription());
+                assertEquals("Publisher-A", message.getPublisher());
                 gotMessage.set(true);
             }