From 8bc4dc996f25b084a2588c5f4208e1add0076c7c Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Mon, 15 Mar 2021 12:21:53 +0300
Subject: [PATCH] refactoring

---
 .../src/main/java/org/redisson/RedissonStream.java   | 12 +-----------
 redisson/src/main/java/org/redisson/api/RStream.java |  6 ------
 .../src/main/java/org/redisson/api/RStreamAsync.java |  6 ------
 .../test/java/org/redisson/RedissonStreamTest.java   |  4 ++--
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonStream.java b/redisson/src/main/java/org/redisson/RedissonStream.java
index af18a584d..b8ec0733c 100644
--- a/redisson/src/main/java/org/redisson/RedissonStream.java
+++ b/redisson/src/main/java/org/redisson/RedissonStream.java
@@ -91,16 +91,6 @@ public class RedissonStream<K, V> extends RedissonExpirable implements RStream<K
         return get(ackAsync(groupName, id));
     }
 
-    @Override
-    public RFuture<PendingResult> listPendingAsync(String groupName) {
-        return getPendingInfoAsync(groupName);
-    }
-
-    @Override
-    public PendingResult listPending(String groupName) {
-        return getPendingInfo(groupName);
-    }
-
     @Override
     public RFuture<PendingResult> getPendingInfoAsync(String groupName) {
         return commandExecutor.readAsync(getName(), StringCodec.INSTANCE, RedisCommands.XPENDING, getName(), groupName);
@@ -108,7 +98,7 @@ public class RedissonStream<K, V> extends RedissonExpirable implements RStream<K
 
     @Override
     public PendingResult getPendingInfo(String groupName) {
-        return get(listPendingAsync(groupName));
+        return get(getPendingInfoAsync(groupName));
     }
     
     @Override
diff --git a/redisson/src/main/java/org/redisson/api/RStream.java b/redisson/src/main/java/org/redisson/api/RStream.java
index fdc7fb9a3..de723f624 100644
--- a/redisson/src/main/java/org/redisson/api/RStream.java
+++ b/redisson/src/main/java/org/redisson/api/RStream.java
@@ -104,12 +104,6 @@ public interface RStream<K, V> extends RStreamAsync<K, V>, RExpirable {
      */
     PendingResult getPendingInfo(String groupName);
     
-    /*
-     * Use #getPendingInfo method
-     */
-    @Deprecated
-    PendingResult listPending(String groupName);
-    
     /**
      * Returns list of common info about pending messages by group name.
      * Limited by start Stream Message ID and end Stream Message ID and count.
diff --git a/redisson/src/main/java/org/redisson/api/RStreamAsync.java b/redisson/src/main/java/org/redisson/api/RStreamAsync.java
index 67a214b82..6d069ca5c 100644
--- a/redisson/src/main/java/org/redisson/api/RStreamAsync.java
+++ b/redisson/src/main/java/org/redisson/api/RStreamAsync.java
@@ -106,12 +106,6 @@ public interface RStreamAsync<K, V> extends RExpirableAsync {
      */
     RFuture<PendingResult> getPendingInfoAsync(String groupName);
 
-    /*
-     * Use #getPendingInfoAsync method
-     */
-    @Deprecated
-    RFuture<PendingResult> listPendingAsync(String groupName);
-
     /**
      * Returns list of common info about pending messages by group name.
      * Limited by minimum idle time, messages count, start and end Stream Message IDs.
diff --git a/redisson/src/test/java/org/redisson/RedissonStreamTest.java b/redisson/src/test/java/org/redisson/RedissonStreamTest.java
index 8a79f726f..648cc1c61 100644
--- a/redisson/src/test/java/org/redisson/RedissonStreamTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonStreamTest.java
@@ -97,7 +97,7 @@ public class RedissonStreamTest extends BaseTest {
     public void testPendingEmpty() {
         RStream<Object, Object> stream = redisson.getStream("test");
         stream.createGroup("testGroup");
-        PendingResult result = stream.listPending("testGroup");
+        PendingResult result = stream.getPendingInfo("testGroup");
         assertThat(result.getTotal()).isZero();
         assertThat(result.getHighestId()).isNull();
         assertThat(result.getLowestId()).isNull();
@@ -298,7 +298,7 @@ public class RedissonStreamTest extends BaseTest {
         Map<StreamMessageId, Map<String, String>> s2 = stream.readGroup("testGroup", "consumer2", StreamReadGroupArgs.neverDelivered());
         assertThat(s2.size()).isEqualTo(2);
         
-        PendingResult pi = stream.listPending("testGroup");
+        PendingResult pi = stream.getPendingInfo("testGroup");
         assertThat(pi.getLowestId()).isEqualTo(id1);
         assertThat(pi.getHighestId()).isEqualTo(id4);
         assertThat(pi.getTotal()).isEqualTo(4);