Merge branch 'master' into 5.2.0

src/main/java/redis/clients/jedis/AbstractTransaction.java

@@ -36,4 +36,12 @@ protected AbstractTransaction(CommandObjects commandObjects) {
   public Response<Long> waitReplicas(int replicas, long timeout) {
     return appendCommand(commandObjects.waitReplicas(replicas, timeout));
   }
+
+  public Response<Long> publish(String channel, String message) {
+    return appendCommand(commandObjects.publish(channel, message));
+  }
+
+  public Response<Long> publish(byte[] channel, byte[] message) {
+    return appendCommand(commandObjects.publish(channel, message));
+  }
 }

src/main/java/redis/clients/jedis/ClusterPipeline.java

@@ -46,6 +46,13 @@ private static ClusterCommandObjects createClusterCommandObjects(RedisProtocol p
     return cco;
   }
 
+  /**
+   * This method must be called after constructor, if graph commands are going to be used.
+   */
+  public void prepareGraphCommands() {
+    super.prepareGraphCommands(provider);
+  }
+
   @Override
   public void close() {
     try {
@@ -65,10 +72,11 @@ protected Connection getConnection(HostAndPort nodeKey) {
     return provider.getConnection(nodeKey);
   }
 
-  /**
-   * This method must be called after constructor, if graph commands are going to be used.
-   */
-  public void prepareGraphCommands() {
-    super.prepareGraphCommands(provider);
+  public Response<Long> spublish(String channel, String message) {
+    return appendCommand(commandObjects.spublish(channel, message));
+  }
+
+  public Response<Long> spublish(byte[] channel, byte[] message) {
+    return appendCommand(commandObjects.spublish(channel, message));
   }
 }

src/main/java/redis/clients/jedis/Connection.java

@@ -359,6 +359,9 @@ protected Object readProtocolWithCheckingBroken() {
 
     try {
       return Protocol.read(inputStream, clientSideCache);
+//      Object read = Protocol.read(inputStream);
+//      System.out.println(redis.clients.jedis.util.SafeEncoder.encodeObject(read));
+//      return read;
     } catch (JedisConnectionException exc) {
       broken = true;
       throw exc;

src/test/java/redis/clients/jedis/ClusterPipeliningTest.java

@@ -1024,6 +1024,18 @@ public void testEvalshaKeyAndArgWithBinary() {
     }
   }
 
+  @Test
+  public void spublishInPipeline() {
+    try (JedisCluster jedis = new JedisCluster(nodes, DEFAULT_CLIENT_CONFIG)) {
+      ClusterPipeline pipelined = jedis.pipelined();
+      Response<Long> p1 = pipelined.publish("foo", "bar");
+      Response<Long> p2 = pipelined.publish("foo".getBytes(), "bar".getBytes());
+      pipelined.sync();
+      assertEquals(0, p1.get().longValue());
+      assertEquals(0, p2.get().longValue());
+    }
+  }
+
   @Test
   public void simple() { // TODO: move into 'redis.clients.jedis.commands.unified.cluster' package
     try (JedisCluster jedis = new JedisCluster(nodes, DEFAULT_CLIENT_CONFIG)) {

src/test/java/redis/clients/jedis/PipeliningTest.java

@@ -257,7 +257,7 @@ public void pipelineResponseWithinPipeline() {
   }
 
   @Test
-  public void pipelineWithPubSub() {
+  public void publishInPipeline() {
     Pipeline pipelined = jedis.pipelined();
     Response<Long> p1 = pipelined.publish("foo", "bar");
     Response<Long> p2 = pipelined.publish("foo".getBytes(), "bar".getBytes());

src/test/java/redis/clients/jedis/commands/unified/pooled/PooledMiscellaneousTest.java

@@ -106,18 +106,29 @@ public void transaction() {
 
   @Test
   public void watch() {
-    List<Object> resp;
     try (AbstractTransaction tx = jedis.transaction(false)) {
       assertEquals("OK", tx.watch("mykey", "somekey"));
       tx.multi();
 
       jedis.set("mykey", "bar");
 
       tx.set("mykey", "foo");
-      resp = tx.exec();
+      assertNull(tx.exec());
+
+      assertEquals("bar", jedis.get("mykey"));
+    }
+  }
+
+  @Test
+  public void publishInTransaction() {
+    try (AbstractTransaction tx = jedis.multi()) {
+      Response<Long> p1 = tx.publish("foo", "bar");
+      Response<Long> p2 = tx.publish("foo".getBytes(), "bar".getBytes());
+      tx.exec();
+
+      assertEquals(0, p1.get().longValue());
+      assertEquals(0, p2.get().longValue());
     }
-    assertNull(resp);
-    assertEquals("bar", jedis.get("mykey"));
   }
 
   @Test