diff --git a/src/main/java/org/redisson/RedissonBatch.java b/src/main/java/org/redisson/RedissonBatch.java index ac1ce0fa3..e3c95a336 100644 --- a/src/main/java/org/redisson/RedissonBatch.java +++ b/src/main/java/org/redisson/RedissonBatch.java @@ -23,6 +23,7 @@ import org.redisson.connection.ConnectionManager; import org.redisson.core.RAtomicLongAsync; import org.redisson.core.RBatch; import org.redisson.core.RBitSetAsync; +import org.redisson.core.RBlockingDequeAsync; import org.redisson.core.RBlockingQueueAsync; import org.redisson.core.RBucketAsync; import org.redisson.core.RMapCacheAsync; @@ -138,17 +139,27 @@ public class RedissonBatch implements RBatch { } @Override - public RDequeAsync getDequeAsync(String name) { + public RBlockingDequeAsync getBlockingDeque(String name) { + return new RedissonBlockingDeque(executorService, name); + } + + @Override + public RBlockingDequeAsync getBlockingDeque(String name, Codec codec) { + return new RedissonBlockingDeque(codec, executorService, name); + } + + @Override + public RDequeAsync getDeque(String name) { return new RedissonDeque(executorService, name); } @Override - public RDequeAsync getDequeAsync(String name, Codec codec) { + public RDequeAsync getDeque(String name, Codec codec) { return new RedissonDeque(codec, executorService, name); } @Override - public RAtomicLongAsync getAtomicLongAsync(String name) { + public RAtomicLongAsync getAtomicLong(String name) { return new RedissonAtomicLong(executorService, name); } diff --git a/src/main/java/org/redisson/RedissonClient.java b/src/main/java/org/redisson/RedissonClient.java index dffdd8d29..f2f3d58aa 100755 --- a/src/main/java/org/redisson/RedissonClient.java +++ b/src/main/java/org/redisson/RedissonClient.java @@ -467,7 +467,7 @@ public interface RedissonClient { RBatch createBatch(); /** - * Returns keys operations. + * Returns interface with methods for Redis keys. * Each of Redis/Redisson object associated with own key * * @return diff --git a/src/main/java/org/redisson/core/RBatch.java b/src/main/java/org/redisson/core/RBatch.java index 5670d1e13..582b057cd 100644 --- a/src/main/java/org/redisson/core/RBatch.java +++ b/src/main/java/org/redisson/core/RBatch.java @@ -172,9 +172,19 @@ public interface RBatch { * @param name of deque * @return */ - RDequeAsync getDequeAsync(String name); + RDequeAsync getDeque(String name); - RDequeAsync getDequeAsync(String name, Codec codec); + RDequeAsync getDeque(String name, Codec codec); + + /** + * Returns blocking deque instance by name. + * + * @param name of queue + * @return + */ + RBlockingDequeAsync getBlockingDeque(String name); + + RBlockingDequeAsync getBlockingDeque(String name, Codec codec); /** * Returns "atomic long" instance by name. @@ -182,7 +192,7 @@ public interface RBatch { * @param name of the "atomic long" * @return */ - RAtomicLongAsync getAtomicLongAsync(String name); + RAtomicLongAsync getAtomicLong(String name); /** * Returns Redis Sorted Set instance by name diff --git a/src/test/java/org/redisson/RedissonBatchTest.java b/src/test/java/org/redisson/RedissonBatchTest.java index 413cf68b2..60d11f3ef 100644 --- a/src/test/java/org/redisson/RedissonBatchTest.java +++ b/src/test/java/org/redisson/RedissonBatchTest.java @@ -48,8 +48,8 @@ public class RedissonBatchTest extends BaseTest { batch.getMap("test").fastPutAsync("1", "2"); batch.getMap("test").fastPutAsync("2", "3"); batch.getMap("test").putAsync("2", "5"); - batch.getAtomicLongAsync("counter").incrementAndGetAsync(); - batch.getAtomicLongAsync("counter").incrementAndGetAsync(); + batch.getAtomicLong("counter").incrementAndGetAsync(); + batch.getAtomicLong("counter").incrementAndGetAsync(); } List res = batch.execute(); Assert.assertEquals(210*5, res.size()); @@ -84,8 +84,8 @@ public class RedissonBatchTest extends BaseTest { batch.getMap("test").fastPutAsync("1", "2"); batch.getMap("test").fastPutAsync("2", "3"); batch.getMap("test").putAsync("2", "5"); - batch.getAtomicLongAsync("counter").incrementAndGetAsync(); - batch.getAtomicLongAsync("counter").incrementAndGetAsync(); + batch.getAtomicLong("counter").incrementAndGetAsync(); + batch.getAtomicLong("counter").incrementAndGetAsync(); List res = batch.execute(); Assert.assertEquals(5, res.size());