Fix binary variants of XRANGE and XREAD commands (#3571)

sazzad16 · web-flow · commit 2bb39897f6a2 · 2023-10-11T15:33:33.000+06:00
where each individual element in the list is actually a complex object rather than a simple byte array.
diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -2402,24 +2402,24 @@ public final CommandObject<List<StreamEntry>> xrevrange(String key, String end,
     return new CommandObject<>(commandArguments(XREVRANGE).key(key).add(end).add(start).add(COUNT).add(count), BuilderFactory.STREAM_ENTRY_LIST);
   }
 
-  public final CommandObject<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end) {
+  public final CommandObject<List<Object>> xrange(byte[] key, byte[] start, byte[] end) {
     return new CommandObject<>(commandArguments(XRANGE).key(key).add(start == null ? "-" : start).add(end == null ? "+" : end),
-        BuilderFactory.BINARY_LIST);
+        BuilderFactory.RAW_OBJECT_LIST);
   }
 
-  public final CommandObject<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count) {
+  public final CommandObject<List<Object>> xrange(byte[] key, byte[] start, byte[] end, int count) {
     return new CommandObject<>(commandArguments(XRANGE).key(key).add(start == null ? "-" : start).add(end == null ? "+" : end)
-        .add(COUNT).add(count), BuilderFactory.BINARY_LIST);
+        .add(COUNT).add(count), BuilderFactory.RAW_OBJECT_LIST);
   }
 
-  public final CommandObject<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start) {
+  public final CommandObject<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start) {
     return new CommandObject<>(commandArguments(XREVRANGE).key(key).add(end == null ? "+" : end).add(start == null ? "-" : start),
-        BuilderFactory.BINARY_LIST);
+        BuilderFactory.RAW_OBJECT_LIST);
   }
 
-  public final CommandObject<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
+  public final CommandObject<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
     return new CommandObject<>(commandArguments(XREVRANGE).key(key).add(end == null ? "+" : end).add(start == null ? "-" : start)
-        .add(COUNT).add(count), BuilderFactory.BINARY_LIST);
+        .add(COUNT).add(count), BuilderFactory.RAW_OBJECT_LIST);
   }
 
   public final CommandObject<Long> xack(String key, String group, StreamEntryID... ids) {
@@ -2660,18 +2660,18 @@ public final CommandObject<List<Map.Entry<String, List<StreamEntry>>>> xreadGrou
     return new CommandObject<>(args, BuilderFactory.STREAM_READ_RESPONSE);
   }
 
-  public final CommandObject<List<byte[]>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
+  public final CommandObject<List<Object>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
     CommandArguments args = commandArguments(XREAD).addParams(xReadParams).add(STREAMS);
     for (Map.Entry<byte[], byte[]> entry : streams) {
       args.key(entry.getKey());
     }
     for (Map.Entry<byte[], byte[]> entry : streams) {
       args.add(entry.getValue());
     }
-    return new CommandObject<>(args, BuilderFactory.BINARY_LIST);
+    return new CommandObject<>(args, BuilderFactory.RAW_OBJECT_LIST);
   }
 
-  public final CommandObject<List<byte[]>> xreadGroup(byte[] groupName, byte[] consumer,
+  public final CommandObject<List<Object>> xreadGroup(byte[] groupName, byte[] consumer,
       XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {
     CommandArguments args = commandArguments(XREADGROUP)
         .add(GROUP).add(groupName).add(consumer)
@@ -2682,7 +2682,7 @@ public final CommandObject<List<byte[]>> xreadGroup(byte[] groupName, byte[] con
     for (Map.Entry<byte[], byte[]> entry : streams) {
       args.add(entry.getValue());
     }
-    return new CommandObject<>(args, BuilderFactory.BINARY_LIST);
+    return new CommandObject<>(args, BuilderFactory.RAW_OBJECT_LIST);
   }
   // Stream commands
 
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -4646,13 +4646,13 @@ public long hstrlen(final byte[] key, final byte[] field) {
   }
 
   @Override
-  public List<byte[]> xread(XReadParams xReadParams, Entry<byte[], byte[]>... streams) {
+  public List<Object> xread(XReadParams xReadParams, Entry<byte[], byte[]>... streams) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xread(xReadParams, streams));
   }
 
   @Override
-  public List<byte[]> xreadGroup(byte[] groupName, byte[] consumer,
+  public List<Object> xreadGroup(byte[] groupName, byte[] consumer,
       XReadGroupParams xReadGroupParams, Entry<byte[], byte[]>... streams) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));
@@ -4671,25 +4671,25 @@ public long xlen(byte[] key) {
   }
 
   @Override
-  public List<byte[]> xrange(byte[] key, byte[] start, byte[] end) {
+  public List<Object> xrange(byte[] key, byte[] start, byte[] end) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xrange(key, start, end));
   }
 
   @Override
-  public List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count) {
+  public List<Object> xrange(byte[] key, byte[] start, byte[] end, int count) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xrange(key, start, end, count));
   }
 
   @Override
-  public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start) {
+  public List<Object> xrevrange(byte[] key, byte[] end, byte[] start) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xrevrange(key, end, start));
   }
 
   @Override
-  public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
+  public List<Object> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xrevrange(key, end, start, count));
   }
diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java
@@ -2968,22 +2968,22 @@ public Response<Long> xlen(byte[] key) {
   }
 
   @Override
-  public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end) {
+  public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end) {
     return appendCommand(commandObjects.xrange(key, start, end));
   }
 
   @Override
-  public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count) {
+  public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end, int count) {
     return appendCommand(commandObjects.xrange(key, start, end, count));
   }
 
   @Override
-  public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start) {
+  public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start) {
     return appendCommand(commandObjects.xrevrange(key, end, start));
   }
 
   @Override
-  public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
+  public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
     return appendCommand(commandObjects.xrevrange(key, end, start, count));
   }
 
@@ -3088,12 +3088,13 @@ public Response<List<Object>> xinfoConsumers(byte[] key, byte[] group) {
   }
 
   @Override
-  public Response<List<byte[]>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
+  public Response<List<Object>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
     return appendCommand(commandObjects.xread(xReadParams, streams));
   }
 
   @Override
-  public Response<List<byte[]>> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {
+  public Response<List<Object>> xreadGroup(byte[] groupName, byte[] consumer,
+      XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {
     return appendCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));
   }
 
diff --git a/src/main/java/redis/clients/jedis/TransactionBase.java b/src/main/java/redis/clients/jedis/TransactionBase.java
@@ -3135,22 +3135,22 @@ public Response<Long> xlen(byte[] key) {
   }
 
   @Override
-  public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end) {
+  public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end) {
     return appendCommand(commandObjects.xrange(key, start, end));
   }
 
   @Override
-  public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count) {
+  public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end, int count) {
     return appendCommand(commandObjects.xrange(key, start, end, count));
   }
 
   @Override
-  public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start) {
+  public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start) {
     return appendCommand(commandObjects.xrevrange(key, end, start));
   }
 
   @Override
-  public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
+  public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
     return appendCommand(commandObjects.xrevrange(key, end, start, count));
   }
 
@@ -3255,12 +3255,12 @@ public Response<List<Object>> xinfoConsumers(byte[] key, byte[] group) {
   }
 
   @Override
-  public Response<List<byte[]>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
+  public Response<List<Object>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
     return appendCommand(commandObjects.xread(xReadParams, streams));
   }
 
   @Override
-  public Response<List<byte[]>> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {
+  public Response<List<Object>> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {
     return appendCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));
   }
 
diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -3058,22 +3058,22 @@ public long xlen(byte[] key) {
   }
 
   @Override
-  public List<byte[]> xrange(byte[] key, byte[] start, byte[] end) {
+  public List<Object> xrange(byte[] key, byte[] start, byte[] end) {
     return executeCommand(commandObjects.xrange(key, start, end));
   }
 
   @Override
-  public List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count) {
+  public List<Object> xrange(byte[] key, byte[] start, byte[] end, int count) {
     return executeCommand(commandObjects.xrange(key, start, end, count));
   }
 
   @Override
-  public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start) {
+  public List<Object> xrevrange(byte[] key, byte[] end, byte[] start) {
     return executeCommand(commandObjects.xrevrange(key, end, start));
   }
 
   @Override
-  public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
+  public List<Object> xrevrange(byte[] key, byte[] end, byte[] start, int count) {
     return executeCommand(commandObjects.xrevrange(key, end, start, count));
   }
 
@@ -3178,12 +3178,12 @@ public List<Object> xinfoConsumers(byte[] key, byte[] group) {
   }
 
   @Override
-  public List<byte[]> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
+  public List<Object> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {
     return executeCommand(commandObjects.xread(xReadParams, streams));
   }
 
   @Override
-  public List<byte[]> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {
+  public List<Object> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {
     return executeCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));
   }
   // Stream commands
diff --git a/src/main/java/redis/clients/jedis/commands/StreamBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/StreamBinaryCommands.java
@@ -15,13 +15,13 @@ default byte[] xadd(byte[] key, Map<byte[], byte[]> hash, XAddParams params) {
 
   long xlen(byte[] key);
 
-  List<byte[]> xrange(byte[] key, byte[] start, byte[] end);
+  List<Object> xrange(byte[] key, byte[] start, byte[] end);
 
-  List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count);
+  List<Object> xrange(byte[] key, byte[] start, byte[] end, int count);
 
-  List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start);
+  List<Object> xrevrange(byte[] key, byte[] end, byte[] start);
 
-  List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count);
+  List<Object> xrevrange(byte[] key, byte[] end, byte[] start, int count);
 
   long xack(byte[] key, byte[] group, byte[]... ids);
 
@@ -74,9 +74,9 @@ List<Object> xautoclaimJustId(byte[] key, byte[] groupName, byte[] consumerName,
 
   List<Object> xinfoConsumers(byte[] key, byte[] group);
 
-  List<byte[]> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams);
+  List<Object> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams);
 
-  List<byte[]> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams,
+  List<Object> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams,
       Map.Entry<byte[], byte[]>... streams);
 
 }
diff --git a/src/main/java/redis/clients/jedis/commands/StreamCommands.java b/src/main/java/redis/clients/jedis/commands/StreamCommands.java
@@ -123,16 +123,6 @@ default StreamEntryID xadd(String key, Map<String, String> hash, XAddParams para
    */
   long xgroupDelConsumer(String key, String groupName, String consumerName);
 
-  /**
-   * XPENDING key group
-   */
-  StreamPendingSummary xpending(String key, String groupName);
-
-  /**
-   * XPENDING key group [[IDLE min-idle-time] start end count [consumer]]
-   */
-  List<StreamPendingEntry> xpending(String key, String groupName, XPendingParams params);
-
   /**
    * XDEL key ID [ID ...]
    */
@@ -148,6 +138,16 @@ default StreamEntryID xadd(String key, Map<String, String> hash, XAddParams para
    */
   long xtrim(String key, XTrimParams params);
 
+  /**
+   * XPENDING key group
+   */
+  StreamPendingSummary xpending(String key, String groupName);
+
+  /**
+   * XPENDING key group [[IDLE min-idle-time] start end count [consumer]]
+   */
+  List<StreamPendingEntry> xpending(String key, String groupName, XPendingParams params);
+
   /**
    * {@code XCLAIM key group consumer min-idle-time <ID-1> ... <ID-N>
    *        [IDLE <milliseconds>] [TIME <mstime>] [RETRYCOUNT <count>]
diff --git a/src/main/java/redis/clients/jedis/commands/StreamPipelineBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/StreamPipelineBinaryCommands.java
@@ -16,13 +16,13 @@ default Response<byte[]> xadd(byte[] key, Map<byte[], byte[]> hash, XAddParams p
 
   Response<Long> xlen(byte[] key);
 
-  Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end);
+  Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end);
 
-  Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count);
+  Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end, int count);
 
-  Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start);
+  Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start);
 
-  Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count);
+  Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start, int count);
 
   Response<Long> xack(byte[] key, byte[] group, byte[]... ids);
 
@@ -75,9 +75,9 @@ Response<List<Object>> xautoclaimJustId(byte[] key, byte[] groupName, byte[] con
 
   Response<List<Object>> xinfoConsumers(byte[] key, byte[] group);
 
-  Response<List<byte[]>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams);
+  Response<List<Object>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams);
 
-  Response<List<byte[]>> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams,
-      Map.Entry<byte[], byte[]>... streams);
+  Response<List<Object>> xreadGroup(byte[] groupName, byte[] consumer,
+      XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -2402,24 +2402,24 @@ public final CommandObject<List<StreamEntry>> xrevrange(String key, String end,`
`2402`	`2402`	`return new CommandObject<>(commandArguments(XREVRANGE).key(key).add(end).add(start).add(COUNT).add(count), BuilderFactory.STREAM_ENTRY_LIST);`
`2403`	`2403`	`}`
`2404`	`2404`
`2405`		`- public final CommandObject<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end) {`
	`2405`	`+ public final CommandObject<List<Object>> xrange(byte[] key, byte[] start, byte[] end) {`
`2406`	`2406`	`return new CommandObject<>(commandArguments(XRANGE).key(key).add(start == null ? "-" : start).add(end == null ? "+" : end),`
`2407`		`- BuilderFactory.BINARY_LIST);`
	`2407`	`+ BuilderFactory.RAW_OBJECT_LIST);`
`2408`	`2408`	`}`
`2409`	`2409`
`2410`		`- public final CommandObject<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count) {`
	`2410`	`+ public final CommandObject<List<Object>> xrange(byte[] key, byte[] start, byte[] end, int count) {`
`2411`	`2411`	`return new CommandObject<>(commandArguments(XRANGE).key(key).add(start == null ? "-" : start).add(end == null ? "+" : end)`
`2412`		`- .add(COUNT).add(count), BuilderFactory.BINARY_LIST);`
	`2412`	`+ .add(COUNT).add(count), BuilderFactory.RAW_OBJECT_LIST);`
`2413`	`2413`	`}`
`2414`	`2414`
`2415`		`- public final CommandObject<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start) {`
	`2415`	`+ public final CommandObject<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start) {`
`2416`	`2416`	`return new CommandObject<>(commandArguments(XREVRANGE).key(key).add(end == null ? "+" : end).add(start == null ? "-" : start),`
`2417`		`- BuilderFactory.BINARY_LIST);`
	`2417`	`+ BuilderFactory.RAW_OBJECT_LIST);`
`2418`	`2418`	`}`
`2419`	`2419`
`2420`		`- public final CommandObject<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
	`2420`	`+ public final CommandObject<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
`2421`	`2421`	`return new CommandObject<>(commandArguments(XREVRANGE).key(key).add(end == null ? "+" : end).add(start == null ? "-" : start)`
`2422`		`- .add(COUNT).add(count), BuilderFactory.BINARY_LIST);`
	`2422`	`+ .add(COUNT).add(count), BuilderFactory.RAW_OBJECT_LIST);`
`2423`	`2423`	`}`
`2424`	`2424`
`2425`	`2425`	`public final CommandObject<Long> xack(String key, String group, StreamEntryID... ids) {`
`@@ -2660,18 +2660,18 @@ public final CommandObject<List<Map.Entry<String, List<StreamEntry>>>> xreadGrou`
`2660`	`2660`	`return new CommandObject<>(args, BuilderFactory.STREAM_READ_RESPONSE);`
`2661`	`2661`	`}`
`2662`	`2662`
`2663`		`- public final CommandObject<List<byte[]>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
	`2663`	`+ public final CommandObject<List<Object>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
`2664`	`2664`	`CommandArguments args = commandArguments(XREAD).addParams(xReadParams).add(STREAMS);`
`2665`	`2665`	`for (Map.Entry<byte[], byte[]> entry : streams) {`
`2666`	`2666`	`args.key(entry.getKey());`
`2667`	`2667`	`}`
`2668`	`2668`	`for (Map.Entry<byte[], byte[]> entry : streams) {`
`2669`	`2669`	`args.add(entry.getValue());`
`2670`	`2670`	`}`
`2671`		`- return new CommandObject<>(args, BuilderFactory.BINARY_LIST);`
	`2671`	`+ return new CommandObject<>(args, BuilderFactory.RAW_OBJECT_LIST);`
`2672`	`2672`	`}`
`2673`	`2673`
`2674`		`- public final CommandObject<List<byte[]>> xreadGroup(byte[] groupName, byte[] consumer,`
	`2674`	`+ public final CommandObject<List<Object>> xreadGroup(byte[] groupName, byte[] consumer,`
`2675`	`2675`	`XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {`
`2676`	`2676`	`CommandArguments args = commandArguments(XREADGROUP)`
`2677`	`2677`	`.add(GROUP).add(groupName).add(consumer)`
`@@ -2682,7 +2682,7 @@ public final CommandObject<List<byte[]>> xreadGroup(byte[] groupName, byte[] con`
`2682`	`2682`	`for (Map.Entry<byte[], byte[]> entry : streams) {`
`2683`	`2683`	`args.add(entry.getValue());`
`2684`	`2684`	`}`
`2685`		`- return new CommandObject<>(args, BuilderFactory.BINARY_LIST);`
	`2685`	`+ return new CommandObject<>(args, BuilderFactory.RAW_OBJECT_LIST);`
`2686`	`2686`	`}`
`2687`	`2687`	`// Stream commands`
`2688`	`2688`
Original file line number	Diff line number	Diff line change
`@@ -4646,13 +4646,13 @@ public long hstrlen(final byte[] key, final byte[] field) {`
`4646`	`4646`	`}`
`4647`	`4647`
`4648`	`4648`	`@Override`
`4649`		`- public List<byte[]> xread(XReadParams xReadParams, Entry<byte[], byte[]>... streams) {`
	`4649`	`+ public List<Object> xread(XReadParams xReadParams, Entry<byte[], byte[]>... streams) {`
`4650`	`4650`	`checkIsInMultiOrPipeline();`
`4651`	`4651`	`return connection.executeCommand(commandObjects.xread(xReadParams, streams));`
`4652`	`4652`	`}`
`4653`	`4653`
`4654`	`4654`	`@Override`
`4655`		`- public List<byte[]> xreadGroup(byte[] groupName, byte[] consumer,`
	`4655`	`+ public List<Object> xreadGroup(byte[] groupName, byte[] consumer,`
`4656`	`4656`	`XReadGroupParams xReadGroupParams, Entry<byte[], byte[]>... streams) {`
`4657`	`4657`	`checkIsInMultiOrPipeline();`
`4658`	`4658`	`return connection.executeCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));`
`@@ -4671,25 +4671,25 @@ public long xlen(byte[] key) {`
`4671`	`4671`	`}`
`4672`	`4672`
`4673`	`4673`	`@Override`
`4674`		`- public List<byte[]> xrange(byte[] key, byte[] start, byte[] end) {`
	`4674`	`+ public List<Object> xrange(byte[] key, byte[] start, byte[] end) {`
`4675`	`4675`	`checkIsInMultiOrPipeline();`
`4676`	`4676`	`return connection.executeCommand(commandObjects.xrange(key, start, end));`
`4677`	`4677`	`}`
`4678`	`4678`
`4679`	`4679`	`@Override`
`4680`		`- public List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count) {`
	`4680`	`+ public List<Object> xrange(byte[] key, byte[] start, byte[] end, int count) {`
`4681`	`4681`	`checkIsInMultiOrPipeline();`
`4682`	`4682`	`return connection.executeCommand(commandObjects.xrange(key, start, end, count));`
`4683`	`4683`	`}`
`4684`	`4684`
`4685`	`4685`	`@Override`
`4686`		`- public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start) {`
	`4686`	`+ public List<Object> xrevrange(byte[] key, byte[] end, byte[] start) {`
`4687`	`4687`	`checkIsInMultiOrPipeline();`
`4688`	`4688`	`return connection.executeCommand(commandObjects.xrevrange(key, end, start));`
`4689`	`4689`	`}`
`4690`	`4690`
`4691`	`4691`	`@Override`
`4692`		`- public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
	`4692`	`+ public List<Object> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
`4693`	`4693`	`checkIsInMultiOrPipeline();`
`4694`	`4694`	`return connection.executeCommand(commandObjects.xrevrange(key, end, start, count));`
`4695`	`4695`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2968,22 +2968,22 @@ public Response<Long> xlen(byte[] key) {`
`2968`	`2968`	`}`
`2969`	`2969`
`2970`	`2970`	`@Override`
`2971`		`- public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end) {`
	`2971`	`+ public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end) {`
`2972`	`2972`	`return appendCommand(commandObjects.xrange(key, start, end));`
`2973`	`2973`	`}`
`2974`	`2974`
`2975`	`2975`	`@Override`
`2976`		`- public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count) {`
	`2976`	`+ public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end, int count) {`
`2977`	`2977`	`return appendCommand(commandObjects.xrange(key, start, end, count));`
`2978`	`2978`	`}`
`2979`	`2979`
`2980`	`2980`	`@Override`
`2981`		`- public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start) {`
	`2981`	`+ public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start) {`
`2982`	`2982`	`return appendCommand(commandObjects.xrevrange(key, end, start));`
`2983`	`2983`	`}`
`2984`	`2984`
`2985`	`2985`	`@Override`
`2986`		`- public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
	`2986`	`+ public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
`2987`	`2987`	`return appendCommand(commandObjects.xrevrange(key, end, start, count));`
`2988`	`2988`	`}`
`2989`	`2989`
`@@ -3088,12 +3088,13 @@ public Response<List<Object>> xinfoConsumers(byte[] key, byte[] group) {`
`3088`	`3088`	`}`
`3089`	`3089`
`3090`	`3090`	`@Override`
`3091`		`- public Response<List<byte[]>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
	`3091`	`+ public Response<List<Object>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
`3092`	`3092`	`return appendCommand(commandObjects.xread(xReadParams, streams));`
`3093`	`3093`	`}`
`3094`	`3094`
`3095`	`3095`	`@Override`
`3096`		`- public Response<List<byte[]>> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {`
	`3096`	`+ public Response<List<Object>> xreadGroup(byte[] groupName, byte[] consumer,`
	`3097`	`+ XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {`
`3097`	`3098`	`return appendCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));`
`3098`	`3099`	`}`
`3099`	`3100`
Original file line number	Diff line number	Diff line change
`@@ -3135,22 +3135,22 @@ public Response<Long> xlen(byte[] key) {`
`3135`	`3135`	`}`
`3136`	`3136`
`3137`	`3137`	`@Override`
`3138`		`- public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end) {`
	`3138`	`+ public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end) {`
`3139`	`3139`	`return appendCommand(commandObjects.xrange(key, start, end));`
`3140`	`3140`	`}`
`3141`	`3141`
`3142`	`3142`	`@Override`
`3143`		`- public Response<List<byte[]>> xrange(byte[] key, byte[] start, byte[] end, int count) {`
	`3143`	`+ public Response<List<Object>> xrange(byte[] key, byte[] start, byte[] end, int count) {`
`3144`	`3144`	`return appendCommand(commandObjects.xrange(key, start, end, count));`
`3145`	`3145`	`}`
`3146`	`3146`
`3147`	`3147`	`@Override`
`3148`		`- public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start) {`
	`3148`	`+ public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start) {`
`3149`	`3149`	`return appendCommand(commandObjects.xrevrange(key, end, start));`
`3150`	`3150`	`}`
`3151`	`3151`
`3152`	`3152`	`@Override`
`3153`		`- public Response<List<byte[]>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
	`3153`	`+ public Response<List<Object>> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
`3154`	`3154`	`return appendCommand(commandObjects.xrevrange(key, end, start, count));`
`3155`	`3155`	`}`
`3156`	`3156`
`@@ -3255,12 +3255,12 @@ public Response<List<Object>> xinfoConsumers(byte[] key, byte[] group) {`
`3255`	`3255`	`}`
`3256`	`3256`
`3257`	`3257`	`@Override`
`3258`		`- public Response<List<byte[]>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
	`3258`	`+ public Response<List<Object>> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
`3259`	`3259`	`return appendCommand(commandObjects.xread(xReadParams, streams));`
`3260`	`3260`	`}`
`3261`	`3261`
`3262`	`3262`	`@Override`
`3263`		`- public Response<List<byte[]>> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {`
	`3263`	`+ public Response<List<Object>> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {`
`3264`	`3264`	`return appendCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));`
`3265`	`3265`	`}`
`3266`	`3266`
Original file line number	Diff line number	Diff line change
`@@ -3058,22 +3058,22 @@ public long xlen(byte[] key) {`
`3058`	`3058`	`}`
`3059`	`3059`
`3060`	`3060`	`@Override`
`3061`		`- public List<byte[]> xrange(byte[] key, byte[] start, byte[] end) {`
	`3061`	`+ public List<Object> xrange(byte[] key, byte[] start, byte[] end) {`
`3062`	`3062`	`return executeCommand(commandObjects.xrange(key, start, end));`
`3063`	`3063`	`}`
`3064`	`3064`
`3065`	`3065`	`@Override`
`3066`		`- public List<byte[]> xrange(byte[] key, byte[] start, byte[] end, int count) {`
	`3066`	`+ public List<Object> xrange(byte[] key, byte[] start, byte[] end, int count) {`
`3067`	`3067`	`return executeCommand(commandObjects.xrange(key, start, end, count));`
`3068`	`3068`	`}`
`3069`	`3069`
`3070`	`3070`	`@Override`
`3071`		`- public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start) {`
	`3071`	`+ public List<Object> xrevrange(byte[] key, byte[] end, byte[] start) {`
`3072`	`3072`	`return executeCommand(commandObjects.xrevrange(key, end, start));`
`3073`	`3073`	`}`
`3074`	`3074`
`3075`	`3075`	`@Override`
`3076`		`- public List<byte[]> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
	`3076`	`+ public List<Object> xrevrange(byte[] key, byte[] end, byte[] start, int count) {`
`3077`	`3077`	`return executeCommand(commandObjects.xrevrange(key, end, start, count));`
`3078`	`3078`	`}`
`3079`	`3079`
`@@ -3178,12 +3178,12 @@ public List<Object> xinfoConsumers(byte[] key, byte[] group) {`
`3178`	`3178`	`}`
`3179`	`3179`
`3180`	`3180`	`@Override`
`3181`		`- public List<byte[]> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
	`3181`	`+ public List<Object> xread(XReadParams xReadParams, Map.Entry<byte[], byte[]>... streams) {`
`3182`	`3182`	`return executeCommand(commandObjects.xread(xReadParams, streams));`
`3183`	`3183`	`}`
`3184`	`3184`
`3185`	`3185`	`@Override`
`3186`		`- public List<byte[]> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {`
	`3186`	`+ public List<Object> xreadGroup(byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, Map.Entry<byte[], byte[]>... streams) {`
`3187`	`3187`	`return executeCommand(commandObjects.xreadGroup(groupName, consumer, xReadGroupParams, streams));`
`3188`	`3188`	`}`
`3189`	`3189`	`// Stream commands`