diff --git a/src/main/java/org/redisson/RedissonBatch.java b/src/main/java/org/redisson/RedissonBatch.java index bd6910939..11a956eb8 100644 --- a/src/main/java/org/redisson/RedissonBatch.java +++ b/src/main/java/org/redisson/RedissonBatch.java @@ -27,20 +27,20 @@ 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; import org.redisson.core.RDequeAsync; +import org.redisson.core.RGeoAsync; import org.redisson.core.RHyperLogLogAsync; import org.redisson.core.RKeysAsync; import org.redisson.core.RLexSortedSetAsync; import org.redisson.core.RListAsync; -import org.redisson.core.RListMultimap; import org.redisson.core.RMapAsync; +import org.redisson.core.RMapCacheAsync; +import org.redisson.core.RMultimapAsync; import org.redisson.core.RQueueAsync; import org.redisson.core.RScoredSortedSetAsync; import org.redisson.core.RScriptAsync; import org.redisson.core.RSetAsync; import org.redisson.core.RSetCacheAsync; -import org.redisson.core.RSetMultimap; import org.redisson.core.RTopicAsync; import io.netty.util.concurrent.Future; @@ -232,24 +232,33 @@ public class RedissonBatch implements RBatch { } @Override - public RSetMultimap getSetMultimap(String name) { + public RMultimapAsync getSetMultimap(String name) { return new RedissonSetMultimap(executorService, name); } @Override - public RSetMultimap getSetMultimap(String name, Codec codec) { + public RMultimapAsync getSetMultimap(String name, Codec codec) { return new RedissonSetMultimap(codec, executorService, name); } @Override - public RListMultimap getListMultimap(String name) { + public RMultimapAsync getListMultimap(String name) { return new RedissonListMultimap(executorService, name); } @Override - public RListMultimap getListMultimap(String name, Codec codec) { + public RMultimapAsync getListMultimap(String name, Codec codec) { return new RedissonListMultimap(codec, executorService, name); } + @Override + public RGeoAsync getGeo(String name) { + return new RedissonGeo(executorService, name); + } + + @Override + public RGeoAsync getGeo(String name, Codec codec) { + return new RedissonGeo(codec, executorService, name); + } } diff --git a/src/main/java/org/redisson/core/RBatch.java b/src/main/java/org/redisson/core/RBatch.java index cdcae7a6f..b573811cf 100644 --- a/src/main/java/org/redisson/core/RBatch.java +++ b/src/main/java/org/redisson/core/RBatch.java @@ -37,13 +37,31 @@ import io.netty.util.concurrent.Future; */ public interface RBatch { + /** + * Returns geospatial items holder instance by name. + * + * @param name + * @return + */ + RGeoAsync getGeo(String name); + + /** + * Returns geospatial items holder instance by name + * using provided codec for geospatial members. + * + * @param name + * @param geospatial member codec + * @return + */ + RGeoAsync getGeo(String name, Codec codec); + /** * Returns Set based MultiMap instance by name. * * @param name * @return */ - RSetMultimap getSetMultimap(String name); + RMultimapAsync getSetMultimap(String name); /** * Returns Set based MultiMap instance by name @@ -53,7 +71,7 @@ public interface RBatch { * @param codec * @return */ - RSetMultimap getSetMultimap(String name, Codec codec); + RMultimapAsync getSetMultimap(String name, Codec codec); /** * Returns set-based cache instance by name. @@ -142,7 +160,7 @@ public interface RBatch { * @param name * @return */ - RListMultimap getListMultimap(String name); + RMultimapAsync getListMultimap(String name); /** * Returns List based MultiMap instance by name @@ -152,7 +170,7 @@ public interface RBatch { * @param codec * @return */ - RListMultimap getListMultimap(String name, Codec codec); + RMultimapAsync getListMultimap(String name, Codec codec); /** * Returns map instance by name.