From aa6d7e3972dd261148c9d00c77cdf85c42d005e4 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Tue, 8 Sep 2020 08:42:24 +0300 Subject: [PATCH] deprecated methods removed --- .../src/main/java/org/redisson/RedissonSemaphore.java | 10 ---------- .../src/main/java/org/redisson/api/RSemaphore.java | 6 ------ .../main/java/org/redisson/api/RSemaphoreAsync.java | 6 ------ .../test/java/org/redisson/RedissonSemaphoreTest.java | 2 +- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonSemaphore.java b/redisson/src/main/java/org/redisson/RedissonSemaphore.java index e76fe4c3c..db755dec2 100644 --- a/redisson/src/main/java/org/redisson/RedissonSemaphore.java +++ b/redisson/src/main/java/org/redisson/RedissonSemaphore.java @@ -487,16 +487,6 @@ public class RedissonSemaphore extends RedissonExpirable implements RSemaphore { Arrays.asList(getName(), getChannelName()), permits); } - @Override - public void reducePermits(int permits) { - get(reducePermitsAsync(permits)); - } - - @Override - public RFuture reducePermitsAsync(int permits) { - return addPermitsAsync(-permits); - } - @Override public void addPermits(int permits) { get(addPermitsAsync(permits)); diff --git a/redisson/src/main/java/org/redisson/api/RSemaphore.java b/redisson/src/main/java/org/redisson/api/RSemaphore.java index f2256b00b..320cfa8fc 100644 --- a/redisson/src/main/java/org/redisson/api/RSemaphore.java +++ b/redisson/src/main/java/org/redisson/api/RSemaphore.java @@ -124,12 +124,6 @@ public interface RSemaphore extends RExpirable, RSemaphoreAsync { */ boolean trySetPermits(int permits); - /* - * Use addPermits instead - */ - @Deprecated - void reducePermits(int permits); - /** * Increases or decreases the number of available permits by defined value. * diff --git a/redisson/src/main/java/org/redisson/api/RSemaphoreAsync.java b/redisson/src/main/java/org/redisson/api/RSemaphoreAsync.java index 53f123df9..77c68553d 100644 --- a/redisson/src/main/java/org/redisson/api/RSemaphoreAsync.java +++ b/redisson/src/main/java/org/redisson/api/RSemaphoreAsync.java @@ -110,12 +110,6 @@ public interface RSemaphoreAsync extends RExpirableAsync { */ RFuture tryAcquireAsync(int permits, long waitTime, TimeUnit unit); - /* - * Use addPermits instead - */ - @Deprecated - RFuture reducePermitsAsync(int permits); - /** * Increases or decreases the number of available permits by defined value. * diff --git a/redisson/src/test/java/org/redisson/RedissonSemaphoreTest.java b/redisson/src/test/java/org/redisson/RedissonSemaphoreTest.java index b9eeea844..019ae5452 100644 --- a/redisson/src/test/java/org/redisson/RedissonSemaphoreTest.java +++ b/redisson/src/test/java/org/redisson/RedissonSemaphoreTest.java @@ -56,7 +56,7 @@ public class RedissonSemaphoreTest extends BaseConcurrentTest { s.trySetPermits(10); s.acquire(10); - s.reducePermits(5); + s.addPermits(-5); assertThat(s.availablePermits()).isEqualTo(-5); s.release(10); assertThat(s.availablePermits()).isEqualTo(5);