Polish XINFO STREAM FULL implementation

redis · Jan 6, 2022 · 9405c00 · 9405c00
1 parent c698ba7
commit 9405c00
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 71 deletions.
diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -2280,38 +2280,39 @@ public final CommandObject<StreamInfo> xinfoStream(String key) {
     return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key), BuilderFactory.STREAM_INFO);
   }
 
-  public final CommandObject<List<StreamGroupInfo>> xinfoGroup(String key) {
-    return new CommandObject<>(commandArguments(XINFO).add(GROUPS).key(key), BuilderFactory.STREAM_GROUP_INFO_LIST);
-  }
-
-  public final CommandObject<List<StreamConsumersInfo>> xinfoConsumers(String key, String group) {
-    return new CommandObject<>(commandArguments(XINFO).add(CONSUMERS).key(key).add(group), BuilderFactory.STREAM_CONSUMERS_INFO_LIST);
-  }
-
   public final CommandObject<Object> xinfoStream(byte[] key) {
     return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key), BuilderFactory.RAW_OBJECT);
   }
 
-  public final CommandObject<StreamFullInfo> xinfoStreamFull(byte[] key, int count) {
-    return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key).add(FULL).add(COUNT).add(count), BuilderFactory.STREAM_INFO_FULL);
-  }
-
-  public final CommandObject<StreamFullInfo> xinfoStreamFull(byte[] key) {
+  public final CommandObject<StreamFullInfo> xinfoStreamFull(String key) {
     return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key).add(FULL), BuilderFactory.STREAM_INFO_FULL);
   }
 
   public final CommandObject<StreamFullInfo> xinfoStreamFull(String key, int count) {
     return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key).add(FULL).add(COUNT).add(count), BuilderFactory.STREAM_INFO_FULL);
   }
 
-  public final CommandObject<StreamFullInfo> xinfoStreamFull(String key) {
-    return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key).add(FULL), BuilderFactory.STREAM_INFO_FULL);
+  public final CommandObject<Object> xinfoStreamFull(byte[] key, int count) {
+    return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key).add(FULL).add(COUNT).add(count), BuilderFactory.RAW_OBJECT);
+  }
+
+  public final CommandObject<Object> xinfoStreamFull(byte[] key) {
+    return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key).add(FULL), BuilderFactory.RAW_OBJECT);
+  }
+
+
+  public final CommandObject<List<StreamGroupInfo>> xinfoGroup(String key) {
+    return new CommandObject<>(commandArguments(XINFO).add(GROUPS).key(key), BuilderFactory.STREAM_GROUP_INFO_LIST);
   }
 
   public final CommandObject<List<Object>> xinfoGroup(byte[] key) {
     return new CommandObject<>(commandArguments(XINFO).add(GROUPS).key(key), BuilderFactory.RAW_OBJECT_LIST);
   }
 
+  public final CommandObject<List<StreamConsumersInfo>> xinfoConsumers(String key, String group) {
+    return new CommandObject<>(commandArguments(XINFO).add(CONSUMERS).key(key).add(group), BuilderFactory.STREAM_CONSUMERS_INFO_LIST);
+  }
+
   public final CommandObject<List<Object>> xinfoConsumers(byte[] key, byte[] group) {
     return new CommandObject<>(commandArguments(XINFO).add(CONSUMERS).key(key).add(group), BuilderFactory.RAW_OBJECT_LIST);
   }

diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -4533,25 +4533,13 @@ public Object xinfoStream(byte[] key) {
   }
 
   @Override
-  public StreamFullInfo xinfoStreamFull(byte[] key) {
+  public Object xinfoStreamFull(byte[] key) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xinfoStreamFull(key));
   }
 
   @Override
-  public StreamFullInfo xinfoStreamFull(byte[] key, int count) {
-    checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.xinfoStreamFull(key, count));
-  }
-
-  @Override
-  public StreamFullInfo xinfoStreamFull(String key) {
-    checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.xinfoStreamFull(key));
-  }
-
-  @Override
-  public StreamFullInfo xinfoStreamFull(String key, int count) {
+  public Object xinfoStreamFull(byte[] key, int count) {
     checkIsInMultiOrPipeline();
     return connection.executeCommand(commandObjects.xinfoStreamFull(key, count));
   }
@@ -8682,6 +8670,18 @@ public StreamInfo xinfoStream(String key) {
     return connection.executeCommand(commandObjects.xinfoStream(key));
   }
 
+  @Override
+  public StreamFullInfo xinfoStreamFull(String key) {
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.xinfoStreamFull(key));
+  }
+
+  @Override
+  public StreamFullInfo xinfoStreamFull(String key, int count) {
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.xinfoStreamFull(key, count));
+  }
+
   @Override
   public List<StreamGroupInfo> xinfoGroup(String key) {
     return connection.executeCommand(commandObjects.xinfoGroup(key));

diff --git a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
@@ -1403,17 +1403,6 @@ public Response<StreamInfo> xinfoStream(String key) {
     return appendCommand(commandObjects.xinfoStream(key));
   }
 
-  @Override
-  public Response<StreamFullInfo> xinfoStreamFull(byte[] key) {
-    return appendCommand(commandObjects.xinfoStreamFull(key));
-
-  }
-
-  @Override
-  public Response<StreamFullInfo> xinfoStreamFull(byte[] key, int count) {
-    return appendCommand(commandObjects.xinfoStreamFull(key, count));
-  }
-
   @Override
   public Response<StreamFullInfo> xinfoStreamFull(String key) {
     return appendCommand(commandObjects.xinfoStreamFull(key));
@@ -2705,6 +2694,17 @@ public Response<Object> xinfoStream(byte[] key) {
     return appendCommand(commandObjects.xinfoStream(key));
   }
 
+  @Override
+  public Response<Object> xinfoStreamFull(byte[] key) {
+    return appendCommand(commandObjects.xinfoStreamFull(key));
+
+  }
+
+  @Override
+  public Response<Object> xinfoStreamFull(byte[] key, int count) {
+    return appendCommand(commandObjects.xinfoStreamFull(key, count));
+  }
+
   @Override
   public Response<List<Object>> xinfoGroup(byte[] key) {
     return appendCommand(commandObjects.xinfoGroup(key));

diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -2695,13 +2695,13 @@ public Response<Object> xinfoStream(byte[] key) {
   }
 
   @Override
-  public Response<StreamFullInfo> xinfoStreamFull(byte[] key) {
+  public Response<Object> xinfoStreamFull(byte[] key) {
     return appendCommand(commandObjects.xinfoStreamFull(key));
 
   }
 
   @Override
-  public Response<StreamFullInfo> xinfoStreamFull(byte[] key, int count) {
+  public Response<Object> xinfoStreamFull(byte[] key, int count) {
     return appendCommand(commandObjects.xinfoStreamFull(key, count));
   }
 

diff --git a/src/main/java/redis/clients/jedis/TransactionBase.java b/src/main/java/redis/clients/jedis/TransactionBase.java
@@ -1457,17 +1457,6 @@ public Response<StreamInfo> xinfoStream(String key) {
     return appendCommand(commandObjects.xinfoStream(key));
   }
 
-  @Override
-  public Response<StreamFullInfo> xinfoStreamFull(byte[] key) {
-    return appendCommand(commandObjects.xinfoStreamFull(key));
-
-  }
-
-  @Override
-  public Response<StreamFullInfo> xinfoStreamFull(byte[] key, int count) {
-    return appendCommand(commandObjects.xinfoStreamFull(key, count));
-  }
-
   @Override
   public Response<StreamFullInfo> xinfoStreamFull(String key) {
     return appendCommand(commandObjects.xinfoStreamFull(key));
@@ -2759,6 +2748,17 @@ public Response<Object> xinfoStream(byte[] key) {
     return appendCommand(commandObjects.xinfoStream(key));
   }
 
+  @Override
+  public Response<Object> xinfoStreamFull(byte[] key) {
+    return appendCommand(commandObjects.xinfoStreamFull(key));
+
+  }
+
+  @Override
+  public Response<Object> xinfoStreamFull(byte[] key, int count) {
+    return appendCommand(commandObjects.xinfoStreamFull(key, count));
+  }
+
   @Override
   public Response<List<Object>> xinfoGroup(byte[] key) {
     return appendCommand(commandObjects.xinfoGroup(key));

diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -2575,16 +2575,6 @@ public StreamInfo xinfoStream(String key) {
     return executeCommand(commandObjects.xinfoStream(key));
   }
 
-  @Override
-  public StreamFullInfo xinfoStreamFull(byte[] key) {
-    return executeCommand(commandObjects.xinfoStreamFull(key));
-  }
-
-  @Override
-  public StreamFullInfo xinfoStreamFull(byte[] key, int count) {
-    return executeCommand(commandObjects.xinfoStreamFull(key, count));
-  }
-
   @Override
   public StreamFullInfo xinfoStreamFull(String key) {
     return executeCommand(commandObjects.xinfoStreamFull(key));
@@ -2726,6 +2716,16 @@ public Object xinfoStream(byte[] key) {
     return executeCommand(commandObjects.xinfoStream(key));
   }
 
+  @Override
+  public Object xinfoStreamFull(byte[] key) {
+    return executeCommand(commandObjects.xinfoStreamFull(key));
+  }
+
+  @Override
+  public Object xinfoStreamFull(byte[] key, int count) {
+    return executeCommand(commandObjects.xinfoStreamFull(key, count));
+  }
+
   @Override
   public List<Object> xinfoGroup(byte[] key) {
     return executeCommand(commandObjects.xinfoGroup(key));

diff --git a/src/main/java/redis/clients/jedis/commands/StreamBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/StreamBinaryCommands.java
@@ -61,17 +61,15 @@ List<Object> xautoclaimJustId(byte[] key, byte[] groupName, byte[] consumerName,
   /**
    * Introspection command used in order to retrieve all information about the stream
    * @param key Stream name
-   * @return {@link StreamFullInfo} that contains information about the stream
    */
-  StreamFullInfo xinfoStreamFull(byte[] key);
+  Object xinfoStreamFull(byte[] key);
 
   /**
    * Introspection command used in order to retrieve all information about the stream
    * @param key Stream name
    * @param count stream info count
-   * @return {@link StreamFullInfo} that contains information about the stream
    */
-  StreamFullInfo xinfoStreamFull(byte[] key, int count);
+  Object xinfoStreamFull(byte[] key, int count);
 
   List<Object> xinfoGroup(byte[] key);
 

diff --git a/src/main/java/redis/clients/jedis/commands/StreamPipelineBinaryCommands.java b/src/main/java/redis/clients/jedis/commands/StreamPipelineBinaryCommands.java
@@ -64,17 +64,15 @@ Response<List<Object>> xautoclaimJustId(byte[] key, byte[] groupName, byte[] con
   /**
    * Introspection command used in order to retrieve all information about the stream
    * @param key Stream name
-   * @return {@link StreamFullInfo} that contains information about the stream
    */
-  Response<StreamFullInfo> xinfoStreamFull(byte[] key);
+  Response<Object> xinfoStreamFull(byte[] key);
 
   /**
    * Introspection command used in order to retrieve all information about the stream
    * @param key Stream name
    * @param count stream info count
-   * @return {@link StreamFullInfo} that contains information about the stream
    */
-  Response<StreamFullInfo> xinfoStreamFull(byte[] key, int count);
+  Response<Object> xinfoStreamFull(byte[] key, int count);
 
   Response<List<Object>> xinfoGroup(byte[] key);