Merge branch 'master' into 5.2.0

pom.xml

@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20240205</version>
+			<version>20240303</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>

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

@@ -312,7 +312,7 @@ public static enum Keyword implements Rawable {
     DELETE, LIBRARYNAME, WITHCODE, DESCRIPTION, GETKEYS, GETKEYSANDFLAGS, DOCS, FILTERBY, DUMP,
     MODULE, ACLCAT, PATTERN, DOCTOR, LATEST, HISTORY, USAGE, SAMPLES, PURGE, STATS, LOADEX, CONFIG, ARGS, RANK,
     NOW, VERSION, ADDR, SKIPME, USER, LADDR,
-    CHANNELS, NUMPAT, NUMSUB, SHARDCHANNELS, SHARDNUMSUB, NOVALUES;
+    CHANNELS, NUMPAT, NUMSUB, SHARDCHANNELS, SHARDNUMSUB, NOVALUES, MAXAGE;
 
     private final byte[] raw;
 

src/main/java/redis/clients/jedis/commands/ClientCommands.java

@@ -30,10 +30,10 @@ public interface ClientCommands {
   String clientKill(String ip, int port);
 
   /**
-   * Close a given client connection.
+   * Close client connections based on certain selection parameters.
    *
-   * @param params Connection info will be closed
-   * @return Close success return OK
+   * @param params Parameters defining what client connections to close.
+   * @return The number of client connections that were closed.
    */
   long clientKill(ClientKillParams params);
 

src/main/java/redis/clients/jedis/params/ClientKillParams.java

@@ -67,6 +67,16 @@ public ClientKillParams laddr(String ip, int port) {
     return addParam(Keyword.LADDR, ip + ':' + port);
   }
 
+  /**
+   * Kill clients older than {@code maxAge} seconds.
+   *
+   * @param maxAge Clients older than this number of seconds will be killed.
+   * @return The {@code ClientKillParams} instance, for call chaining.
+   */
+  public ClientKillParams maxAge(long maxAge) {
+    return addParam(Keyword.MAXAGE, maxAge);
+  }
+
   @Override
   public void addParams(CommandArguments args) {
     params.forEach(kv -> args.add(kv.getKey()).add(kv.getValue()));