diff --git a/redisson/src/main/java/org/redisson/RedissonStream.java b/redisson/src/main/java/org/redisson/RedissonStream.java index 805d56137..7481198ad 100644 --- a/redisson/src/main/java/org/redisson/RedissonStream.java +++ b/redisson/src/main/java/org/redisson/RedissonStream.java @@ -115,14 +115,24 @@ public class RedissonStream extends RedissonExpirable implements RStream listPendingAsync(String groupName) { - return commandExecutor.readAsync(getName(), StringCodec.INSTANCE, RedisCommands.XPENDING, getName(), groupName); + return getPendingInfoAsync(groupName); } @Override public PendingResult listPending(String groupName) { - return get(listPendingAsync(groupName)); + return getPendingInfo(groupName); + } + + @Override + public RFuture getPendingInfoAsync(String groupName) { + return commandExecutor.readAsync(getName(), StringCodec.INSTANCE, RedisCommands.XPENDING, getName(), groupName); } + @Override + public PendingResult getPendingInfo(String groupName) { + return get(listPendingAsync(groupName)); + } + @Override public RFuture> listPendingAsync(String groupName, String consumerName, StreamMessageId startId, StreamMessageId endId, int count) { return commandExecutor.readAsync(getName(), StringCodec.INSTANCE, RedisCommands.XPENDING_ENTRIES, getName(), groupName, startId, endId, count, consumerName); diff --git a/redisson/src/main/java/org/redisson/api/RStream.java b/redisson/src/main/java/org/redisson/api/RStream.java index f4b3722bd..0efd62366 100644 --- a/redisson/src/main/java/org/redisson/api/RStream.java +++ b/redisson/src/main/java/org/redisson/api/RStream.java @@ -83,17 +83,23 @@ public interface RStream extends RStreamAsync, RExpirable { * @return marked messages amount */ long ack(String groupName, StreamMessageId... ids); - + /** - * Returns pending messages by group name + * Returns common info about pending messages by group name. * * @param groupName - name of group * @return result object */ + PendingResult getPendingInfo(String groupName); + + /* + * Use #getPendingInfo method + */ + @Deprecated PendingResult listPending(String groupName); /** - * Returns list of pending messages by group name. + * Returns list of common info about pending messages by group name. * Limited by start Stream Message ID and end Stream Message ID and count. *

* {@link StreamMessageId#MAX} is used as max Stream Message ID @@ -108,7 +114,7 @@ public interface RStream extends RStreamAsync, RExpirable { List listPending(String groupName, StreamMessageId startId, StreamMessageId endId, int count); /** - * Returns list of pending messages by group name and consumer name. + * Returns list of common info about pending messages by group and consumer name. * Limited by start Stream Message ID and end Stream Message ID and count. *

* {@link StreamMessageId#MAX} is used as max Stream Message ID @@ -724,14 +730,14 @@ public interface RStream extends RStreamAsync, RExpirable { StreamInfo getInfo(); /** - * Returns list of objects with information about groups belonging to this stream. + * Returns list of common info about groups belonging to this stream. * * @return list of info objects */ List listGroups(); /** - * Returns list of objects with information about group customers for specified groupName. + * Returns list of common info about group customers for specified groupName. * * @param groupName - name of group * @return list of info objects diff --git a/redisson/src/main/java/org/redisson/api/RStreamAsync.java b/redisson/src/main/java/org/redisson/api/RStreamAsync.java index 188003b26..4dfc5b6b7 100644 --- a/redisson/src/main/java/org/redisson/api/RStreamAsync.java +++ b/redisson/src/main/java/org/redisson/api/RStreamAsync.java @@ -85,13 +85,19 @@ public interface RStreamAsync extends RExpirableAsync { * @return marked messages amount */ RFuture ackAsync(String groupName, StreamMessageId... ids); - + /** - * Returns pending messages by group name + * Returns common info about pending messages by group name. * * @param groupName - name of group * @return result object */ + RFuture getPendingInfoAsync(String groupName); + + /* + * Use #getPendingInfoAsync method + */ + @Deprecated RFuture listPendingAsync(String groupName); /** diff --git a/redisson/src/main/java/org/redisson/api/RStreamReactive.java b/redisson/src/main/java/org/redisson/api/RStreamReactive.java index 4f7cfd9a9..59a91455d 100644 --- a/redisson/src/main/java/org/redisson/api/RStreamReactive.java +++ b/redisson/src/main/java/org/redisson/api/RStreamReactive.java @@ -89,11 +89,17 @@ public interface RStreamReactive extends RExpirableReactive { Mono ack(String groupName, StreamMessageId... ids); /** - * Returns pending messages by group name + * Returns common info about pending messages by group name. * * @param groupName - name of group * @return result object */ + Mono getPendingInfo(String groupName); + + /* + * Use #getPendingInfo method + */ + @Deprecated Mono listPending(String groupName); /** diff --git a/redisson/src/main/java/org/redisson/api/RStreamRx.java b/redisson/src/main/java/org/redisson/api/RStreamRx.java index 9b70b9fc7..aaa7fc5b6 100644 --- a/redisson/src/main/java/org/redisson/api/RStreamRx.java +++ b/redisson/src/main/java/org/redisson/api/RStreamRx.java @@ -90,11 +90,17 @@ public interface RStreamRx extends RExpirableRx { Single ack(String groupName, StreamMessageId... ids); /** - * Returns pending messages by group name + * Returns common info about pending messages by group name. * * @param groupName - name of group * @return result object */ + Single getPendingInfo(String groupName); + + /* + * Use #getPendingInfo method + */ + @Deprecated Single listPending(String groupName); /**