Merge branch 'master' into toString

pom.xml

@@ -49,7 +49,7 @@
 		<jedis.module.name>redis.clients.jedis</jedis.module.name>
 		<slf4j.version>1.7.36</slf4j.version>
 		<resilience4j.version>1.7.1</resilience4j.version>
-		<jackson.version>2.17.0</jackson.version>
+		<jackson.version>2.17.2</jackson.version>
 		<maven.surefire.version>3.2.5</maven.surefire.version>
 	</properties>
 
@@ -72,14 +72,14 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.10.1</version>
+			<version>2.11.0</version>
 		</dependency>
 
 		<!-- UNIX socket connection support -->
 		<dependency>
 			<groupId>com.kohlschutter.junixsocket</groupId>
 			<artifactId>junixsocket-core</artifactId>
-			<version>2.9.0</version>
+			<version>2.10.0</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
@@ -133,6 +133,12 @@
 			<version>2.38.0</version> <!-- 3.x requires Java 17 -->
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5-fluent</artifactId>
+			<version>5.3.1</version>
+			<scope>test</scope>
+		</dependency>
 
 		<!-- circuit breaker / failover -->
 		<dependency>
@@ -177,7 +183,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.11</version>
+				<version>0.8.12</version>
 				<executions>
 					<execution>
 						<goals>
@@ -216,7 +222,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 				<configuration>
 					<attach>true</attach>
 				</configuration>
@@ -231,7 +237,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.6.3</version>
+				<version>3.7.0</version>
 				<configuration>
 					<source>8</source><!-- Until JDK 11+ -->
 					<detectJavaApiLink>false</detectJavaApiLink><!-- Until JDK 11+ -->
@@ -254,7 +260,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.13</version>
+				<version>1.7.0</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>
@@ -272,7 +278,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.4.2</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -306,7 +312,7 @@
 					<!--Sign the components - this is required by maven central for releases -->
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.2</version>
+						<version>3.2.4</version>
 						<configuration>
 							<gpgArguments>
 								<arg>--pinentry-mode</arg>

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/BuilderFactory.java

@@ -661,6 +661,7 @@ public String toString() {
     }
   };
 
+  @Deprecated
   public static final Builder<Set<Tuple>> TUPLE_ZSET = new Builder<Set<Tuple>>() {
     @Override
     @SuppressWarnings("unchecked")
@@ -683,6 +684,7 @@ public String toString() {
     }
   };
 
+  @Deprecated
   public static final Builder<Set<Tuple>> TUPLE_ZSET_RESP3 = new Builder<Set<Tuple>>() {
     @Override
     @SuppressWarnings("unchecked")

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/CommandArguments.java

@@ -1,6 +1,7 @@
 package redis.clients.jedis;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -29,19 +30,50 @@ public ProtocolCommand getCommand() {
     return (ProtocolCommand) args.get(0);
   }
 
+  public CommandArguments add(Rawable arg) {
+    args.add(arg);
+    return this;
+  }
+
+  public CommandArguments add(byte[] arg) {
+    return add(RawableFactory.from(arg));
+  }
+
+  public CommandArguments add(boolean arg) {
+    return add(RawableFactory.from(arg));
+  }
+
+  public CommandArguments add(int arg) {
+    return add(RawableFactory.from(arg));
+  }
+
+  public CommandArguments add(long arg) {
+    return add(RawableFactory.from(arg));
+  }
+
+  public CommandArguments add(double arg) {
+    return add(RawableFactory.from(arg));
+  }
+
+  public CommandArguments add(String arg) {
+    return add(RawableFactory.from(arg));
+  }
+
   public CommandArguments add(Object arg) {
     if (arg == null) {
       throw new IllegalArgumentException("null is not a valid argument.");
     } else if (arg instanceof Rawable) {
       args.add((Rawable) arg);
     } else if (arg instanceof byte[]) {
       args.add(RawableFactory.from((byte[]) arg));
+    } else if (arg instanceof Boolean) {
+      args.add(RawableFactory.from((Boolean) arg));
     } else if (arg instanceof Integer) {
       args.add(RawableFactory.from((Integer) arg));
+    } else if (arg instanceof Long) {
+      args.add(RawableFactory.from((Long) arg));
     } else if (arg instanceof Double) {
       args.add(RawableFactory.from((Double) arg));
-    } else if (arg instanceof Boolean) {
-      args.add(RawableFactory.from((Boolean) arg ? 1 : 0));
     } else if (arg instanceof float[]) {
       args.add(RawableFactory.from(RediSearchUtil.toByteArray((float[]) arg)));
     } else if (arg instanceof String) {
@@ -87,14 +119,12 @@ public CommandArguments key(Object key) {
   }
 
   public final CommandArguments keys(Object... keys) {
-    for (Object key : keys) {
-      key(key);
-    }
+    Arrays.stream(keys).forEach(this::key);
     return this;
   }
 
   public final CommandArguments keys(Collection keys) {
-    keys.forEach(key -> key(key));
+    keys.forEach(this::key);
     return this;
   }