Address constant FIELDS argument in Hash field expiration commands

redis · May 19, 2024 · 3c39aaa · 3c39aaa
1 parent a035eee
commit 3c39aaa
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -1157,133 +1157,133 @@ public final CommandObject<Long> hstrlen(byte[] key, byte[] field) {
   }
 
   public final CommandObject<List<Long>> hexpire(String key, long seconds, String... fields) {
-    return new CommandObject<>(commandArguments(HEXPIRE).key(key).add(seconds).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HEXPIRE).key(key).add(seconds)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpire(String key, long seconds, ExpiryOption condition, String... fields) {
-    return new CommandObject<>(commandArguments(HEXPIRE).key(key).add(seconds).add(condition).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HEXPIRE).key(key).add(seconds).add(condition)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpire(String key, long milliseconds, String... fields) {
-    return new CommandObject<>(commandArguments(HPEXPIRE).key(key).add(milliseconds).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPEXPIRE).key(key).add(milliseconds)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpire(String key, long milliseconds, ExpiryOption condition, String... fields) {
-    return new CommandObject<>(commandArguments(HPEXPIRE).key(key).add(milliseconds).add(condition).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPEXPIRE).key(key).add(milliseconds).add(condition)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpireAt(String key, long unixTimeSeconds, String... fields) {
     return new CommandObject<>(commandArguments(HEXPIREAT).key(key).add(unixTimeSeconds)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpireAt(String key, long unixTimeSeconds, ExpiryOption condition, String... fields) {
     return new CommandObject<>(commandArguments(HEXPIREAT).key(key).add(unixTimeSeconds).add(condition)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpireAt(String key, long unixTimeMillis, String... fields) {
     return new CommandObject<>(commandArguments(HPEXPIREAT).key(key).add(unixTimeMillis)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpireAt(String key, long unixTimeMillis, ExpiryOption condition, String... fields) {
     return new CommandObject<>(commandArguments(HPEXPIREAT).key(key).add(unixTimeMillis).add(condition)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpire(byte[] key, long seconds, byte[]... fields) {
     return new CommandObject<>(commandArguments(HEXPIRE).key(key).add(seconds).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpire(byte[] key, long seconds, ExpiryOption condition, byte[]... fields) {
     return new CommandObject<>(commandArguments(HEXPIRE).key(key).add(seconds).add(condition).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpire(byte[] key, long milliseconds, byte[]... fields) {
     return new CommandObject<>(commandArguments(HPEXPIRE).key(key).add(milliseconds).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpire(byte[] key, long milliseconds, ExpiryOption condition, byte[]... fields) {
     return new CommandObject<>(commandArguments(HPEXPIRE).key(key).add(milliseconds).add(condition).add(fields.length)
-        .addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpireAt(byte[] key, long unixTimeSeconds, byte[]... fields) {
     return new CommandObject<>(commandArguments(HEXPIREAT).key(key).add(unixTimeSeconds)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpireAt(byte[] key, long unixTimeSeconds, ExpiryOption condition, byte[]... fields) {
     return new CommandObject<>(commandArguments(HEXPIREAT).key(key).add(unixTimeSeconds).add(condition)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpireAt(byte[] key, long unixTimeMillis, byte[]... fields) {
     return new CommandObject<>(commandArguments(HPEXPIREAT).key(key).add(unixTimeMillis)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpireAt(byte[] key, long unixTimeMillis, ExpiryOption condition, byte[]... fields) {
     return new CommandObject<>(commandArguments(HPEXPIREAT).key(key).add(unixTimeMillis).add(condition)
-        .add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpireTime(String key, String... fields) {
-    return new CommandObject<>(commandArguments(HEXPIRETIME).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HEXPIRETIME).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpireTime(String key, String... fields) {
-    return new CommandObject<>(commandArguments(HPEXPIRETIME).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPEXPIRETIME).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> httl(String key, String... fields) {
-    return new CommandObject<>(commandArguments(HTTL).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HTTL).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpttl(String key, String... fields) {
-    return new CommandObject<>(commandArguments(HPTTL).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPTTL).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hexpireTime(byte[] key, byte[]... fields) {
-    return new CommandObject<>(commandArguments(HEXPIRETIME).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HEXPIRETIME).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpexpireTime(byte[] key, byte[]... fields) {
-    return new CommandObject<>(commandArguments(HPEXPIRETIME).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPEXPIRETIME).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> httl(byte[] key, byte[]... fields) {
-    return new CommandObject<>(commandArguments(HTTL).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HTTL).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpttl(byte[] key, byte[]... fields) {
-    return new CommandObject<>(commandArguments(HPTTL).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPTTL).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpersist(String key, String... fields) {
-    return new CommandObject<>(commandArguments(HPERSIST).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPERSIST).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
 
   public final CommandObject<List<Long>> hpersist(byte[] key, byte[]... fields) {
-    return new CommandObject<>(commandArguments(HPERSIST).key(key).add(fields.length).addObjects((Object[]) fields),
-        BuilderFactory.LONG_LIST);
+    return new CommandObject<>(commandArguments(HPERSIST).key(key)
+        .add(FIELDS).add(fields.length).addObjects((Object[]) fields), BuilderFactory.LONG_LIST);
   }
   // Hash commands
 

diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java
@@ -300,8 +300,8 @@ public static enum Keyword implements Rawable {
     REV, WITHCOORD, WITHDIST, WITHHASH, ANY, FROMMEMBER, FROMLONLAT, BYRADIUS, BYBOX, BYLEX, BYSCORE,
     STOREDIST, TO, FORCE, TIMEOUT, DB, UNLOAD, ABORT, IDX, MINMATCHLEN, WITHMATCHLEN, FULL,
     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,
+    MODULE, ACLCAT, PATTERN, DOCTOR, LATEST, HISTORY, USAGE, SAMPLES, PURGE, STATS, LOADEX, CONFIG,
+    ARGS, RANK, NOW, VERSION, ADDR, SKIPME, USER, LADDR, FIELDS,
     CHANNELS, NUMPAT, NUMSUB, SHARDCHANNELS, SHARDNUMSUB, NOVALUES, MAXAGE;
 
     private final byte[] raw;