diff --git a/redisson/src/main/java/org/redisson/RedissonStream.java b/redisson/src/main/java/org/redisson/RedissonStream.java index 7ba06e9af..0986bc074 100644 --- a/redisson/src/main/java/org/redisson/RedissonStream.java +++ b/redisson/src/main/java/org/redisson/RedissonStream.java @@ -82,26 +82,6 @@ public class RedissonStream extends RedissonExpirable implements RStream createGroupAsync(String groupName) { - return createGroupAsync(groupName, StreamMessageId.NEWEST); - } - - @Override - public void createGroup(String groupName, StreamMessageId id) { - get(createGroupAsync(groupName, id)); - } - - @Override - public RFuture createGroupAsync(String groupName, StreamMessageId id) { - return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.XGROUP, "CREATE", getRawName(), groupName, id, "MKSTREAM"); - } - @Override public RFuture ackAsync(String groupName, StreamMessageId... ids) { List params = new ArrayList(); @@ -343,290 +323,6 @@ public class RedissonStream extends RedissonExpirable implements RStream>> readGroupAsync(String groupName, String consumerName, StreamMessageId... ids) { - return readGroupAsync(groupName, consumerName, 0, ids); - } - - @Override - public RFuture>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId... ids) { - return readGroupAsync(groupName, consumerName, count, 0, null, ids); - } - - @Override - public RFuture>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, - StreamMessageId... ids) { - return readGroupAsync(groupName, consumerName, 0, timeout, unit, ids); - } - - @Override - public RFuture>> readGroupAsync(String groupName, String consumerName, int count, long timeout, TimeUnit unit, - StreamMessageId... ids) { - List params = new ArrayList(); - params.add("GROUP"); - params.add(groupName); - params.add(consumerName); - - if (count > 0) { - params.add("COUNT"); - params.add(count); - } - - if (timeout > 0) { - params.add("BLOCK"); - params.add(unit.toMillis(timeout)); - } - - params.add("STREAMS"); - params.add(getRawName()); - - if (ids.length == 0) { - params.add(">"); - } - - for (StreamMessageId id : ids) { - params.add(id.toString()); - } - - if (timeout > 0) { - return commandExecutor.writeAsync(getRawName(), codec, getServiceManager().getXReadGroupBlockingSingleCommand(), params.toArray()); - } - return commandExecutor.writeAsync(getRawName(), codec, getServiceManager().getXReadGroupSingleCommand(), params.toArray()); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, StreamMessageId id, Map keyToId) { - return readGroup(groupName, consumerName, 0, id, keyToId); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, StreamMessageId id, Map keyToId) { - return readGroupAsync(groupName, consumerName, 0, id, keyToId); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, Map keyToId) { - return get(readGroupAsync(groupName, consumerName, count, id, keyToId)); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId id, Map keyToId) { - return readGroupAsync(groupName, consumerName, count, -1, null, id, keyToId); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2) { - return readGroupAsync(groupName, consumerName, count, timeout, unit, id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readGroupAsync(groupName, consumerName, count, timeout, unit, id, params); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, Map keyToId) { - return readGroupAsync(groupName, consumerName, 0, timeout, unit, id, keyToId); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, Map keyToId) { - return get(readGroupAsync(groupName, consumerName, count, timeout, unit, id, keyToId)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, Map keyToId) { - return readGroup(groupName, consumerName, 0, timeout, unit, id, keyToId); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2) { - return readGroupAsync(groupName, consumerName, id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readGroupAsync(groupName, consumerName, id, params); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2) { - return readGroupAsync(groupName, consumerName, count, id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2, - String key3, StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readGroupAsync(groupName, consumerName, count, id, params); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2) { - return readGroupAsync(groupName, consumerName, timeout, unit, id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readGroupAsync(groupName, consumerName, timeout, unit, id, params); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2) { - return get(readGroupAsync(groupName, consumerName, id, key2, id2)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3) { - return get(readGroupAsync(groupName, consumerName, id, key2, id2, key3, id3)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2) { - return get(readGroupAsync(groupName, consumerName, count, id, key2, id2)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3) { - return get(readGroupAsync(groupName, consumerName, count, id, key2, id2, key3, id3)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2) { - return get(readGroupAsync(groupName, consumerName, timeout, unit, id, key2, id2)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2, String key3, StreamMessageId id3) { - return get(readGroupAsync(groupName, consumerName, timeout, unit, id, key2, id2, key3, id3)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2) { - return get(readGroupAsync(groupName, consumerName, count, timeout, unit, id, key2, id2)); - } - - @Override - public Map>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2, String key3, StreamMessageId id3) { - return get(readGroupAsync(groupName, consumerName, count, timeout, unit, id, key2, id2, key3, id3)); - } - - public RFuture>>> readGroupAsync(String groupName, String consumerName, int count, long timeout, TimeUnit unit, - StreamMessageId id, Map keyToId) { - List params = new ArrayList(); - params.add("GROUP"); - params.add(groupName); - params.add(consumerName); - - if (count > 0) { - params.add("COUNT"); - params.add(count); - } - - if (timeout > 0) { - params.add("BLOCK"); - params.add(unit.toMillis(timeout)); - } - - params.add("STREAMS"); - params.add(getRawName()); - params.addAll(keyToId.keySet()); - - if (id == null) { - params.add(">"); - } else { - params.add(id); - } - - for (StreamMessageId nextId : keyToId.values()) { - params.add(nextId.toString()); - } - - if (timeout > 0) { - return commandExecutor.writeAsync(getRawName(), codec, getServiceManager().getXReadGroupBlockingCommand(), params.toArray()); - } - return commandExecutor.writeAsync(getRawName(), codec, getServiceManager().getXReadGroupCommand(), params.toArray()); - } - - - @Override - public Map> readGroup(String groupName, String consumerName, StreamMessageId... ids) { - return get(readGroupAsync(groupName, consumerName, ids)); - } - - @Override - public Map> readGroup(String groupName, String consumerName, int count, StreamMessageId... ids) { - return get(readGroupAsync(groupName, consumerName, count, ids)); - } - - @Override - public Map> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId... ids) { - return get(readGroupAsync(groupName, consumerName, timeout, unit, ids)); - } - - @Override - public Map> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, - StreamMessageId... ids) { - return get(readGroupAsync(groupName, consumerName, count, timeout, unit, ids)); - } - - @Override - public StreamMessageId addAll(Map entries) { - return addAll(entries, 0, false); - } - - @Override - public RFuture addAllAsync(Map entries) { - return addAllAsync(entries, 0, false); - } - - @Override - public void addAll(StreamMessageId id, Map entries) { - addAll(id, entries, 0, false); - } - - @Override - public RFuture addAllAsync(StreamMessageId id, Map entries) { - return addAllAsync(id, entries, 0, false); - } - - @Override - public StreamMessageId addAll(Map entries, int trimLen, boolean trimStrict) { - return get(addAllAsync(entries, trimLen, trimStrict)); - } - - @Override - public RFuture addAllAsync(Map entries, int trimLen, boolean trimStrict) { - return addAllCustomAsync(null, entries, trimLen, trimStrict); - } - - @Override - public void addAll(StreamMessageId id, Map entries, int trimLen, boolean trimStrict) { - get(addAllAsync(id, entries, trimLen, trimStrict)); - } - private RFuture addAllCustomAsync(StreamMessageId id, Map entries, int trimLen, boolean trimStrict) { List params = new ArrayList(entries.size()*2 + 1); params.add(getRawName()); @@ -659,11 +355,6 @@ public class RedissonStream extends RedissonExpirable implements RStream addAllAsync(StreamMessageId id, Map entries, int trimLen, boolean trimStrict) { - return addAllCustomAsync(id, entries, trimLen, trimStrict); - } - @Override public long size() { return get(sizeAsync()); @@ -739,173 +430,6 @@ public class RedissonStream extends RedissonExpirable implements RStream>> read(StreamMessageId id, Map keyToId) { - return read(0, id, keyToId); - } - - @Override - public RFuture>>> readAsync(StreamMessageId id, Map keyToId) { - return readAsync(0, id, keyToId); - } - - @Override - public Map>> read(int count, StreamMessageId id, Map keyToId) { - return get(readAsync(count, id, keyToId)); - } - - @Override - public RFuture>>> readAsync(int count, StreamMessageId id, Map keyToId) { - return readAsync(count, -1, null, id, keyToId); - } - - @Override - public RFuture>>> readAsync(int count, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2) { - return readAsync(count, timeout, unit, id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readAsync(int count, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readAsync(count, timeout, unit, id, params); - } - - @Override - public RFuture>>> readAsync(long timeout, TimeUnit unit, StreamMessageId id, Map keyToId) { - return readAsync(0, timeout, unit, id, keyToId); - } - - @Override - public Map>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, Map keyToId) { - return get(readAsync(count, timeout, unit, id, keyToId)); - } - - @Override - public Map>> read(long timeout, TimeUnit unit, StreamMessageId id, Map keyToId) { - return read(0, timeout, unit, id, keyToId); - } - - @Override - public RFuture>>> readAsync(StreamMessageId id, String key2, StreamMessageId id2) { - return readAsync(id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readAsync(StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readAsync(id, params); - } - - @Override - public RFuture>>> readAsync(int count, StreamMessageId id, String key2, StreamMessageId id2) { - return readAsync(count, id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readAsync(int count, StreamMessageId id, String key2, StreamMessageId id2, - String key3, StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readAsync(count, id, params); - } - - @Override - public RFuture>>> readAsync(long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2) { - return readAsync(timeout, unit, id, Collections.singletonMap(key2, id2)); - } - - @Override - public RFuture>>> readAsync(long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3) { - Map params = new HashMap(2); - params.put(key2, id2); - params.put(key3, id3); - return readAsync(timeout, unit, id, params); - } - - @Override - public Map>> read(StreamMessageId id, String key2, StreamMessageId id2) { - return get(readAsync(id, key2, id2)); - } - - @Override - public Map>> read(StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3) { - return get(readAsync(id, key2, id2, key3, id3)); - } - - @Override - public Map>> read(int count, StreamMessageId id, String key2, StreamMessageId id2) { - return get(readAsync(count, id, key2, id2)); - } - - @Override - public Map>> read(int count, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3) { - return get(readAsync(count, id, key2, id2, key3, id3)); - } - - @Override - public Map>> read(long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2) { - return get(readAsync(timeout, unit, id, key2, id2)); - } - - @Override - public Map>> read(long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2, String key3, StreamMessageId id3) { - return get(readAsync(timeout, unit, id, key2, id2, key3, id3)); - } - - @Override - public Map>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2) { - return get(readAsync(count, timeout, unit, id, key2, id2)); - } - - @Override - public Map>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2, String key3, StreamMessageId id3) { - return get(readAsync(count, timeout, unit, id, key2, id2, key3, id3)); - } - - @Override - public RFuture>>> readAsync(int count, long timeout, TimeUnit unit, StreamMessageId id, Map keyToId) { - List params = new ArrayList(); - if (count > 0) { - params.add("COUNT"); - params.add(count); - } - - if (timeout > 0) { - params.add("BLOCK"); - params.add(unit.toMillis(timeout)); - } - - params.add("STREAMS"); - params.add(getRawName()); - params.addAll(keyToId.keySet()); - - params.add(id); - for (StreamMessageId nextId : keyToId.values()) { - params.add(nextId.toString()); - } - - if (timeout > 0) { - return commandExecutor.readAsync(getRawName(), codec, getServiceManager().getXReadBlockingCommand(), params.toArray()); - } - return commandExecutor.readAsync(getRawName(), codec, getServiceManager().getXReadCommand(), params.toArray()); - } - @Override public StreamMessageId add(StreamAddArgs args) { return get(addAsync(args)); @@ -976,21 +500,6 @@ public class RedissonStream extends RedissonExpirable implements RStream addAsync(K key, V value) { - return addAsync(key, value, 0, false); - } - - @Override - public RFuture addAsync(StreamMessageId id, K key, V value) { - return addAsync(id, key, value, 0, false); - } - - @Override - public RFuture addAsync(K key, V value, int trimLen, boolean trimStrict) { - return addCustomAsync(null, key, value, trimLen, trimStrict); - } - private RFuture addCustomAsync(StreamMessageId id, K key, V value, int trimLen, boolean trimStrict) { List params = new LinkedList(); params.add(getRawName()); @@ -1021,73 +530,6 @@ public class RedissonStream extends RedissonExpirable implements RStream addAsync(StreamMessageId id, K key, V value, int trimLen, boolean trimStrict) { - return addCustomAsync(id, key, value, trimLen, trimStrict); - } - - @Override - public StreamMessageId add(K key, V value) { - return get(addAsync(key, value)); - } - - @Override - public void add(StreamMessageId id, K key, V value) { - get(addAsync(id, key, value)); - } - - @Override - public StreamMessageId add(K key, V value, int trimLen, boolean trimStrict) { - return get(addAsync(key, value, trimLen, trimStrict)); - } - - @Override - public void add(StreamMessageId id, K key, V value, int trimLen, boolean trimStrict) { - get(addAsync(id, key, value, trimLen, trimStrict)); - } - - @Override - public RFuture>> readAsync(int count, StreamMessageId... ids) { - return readAsync(count, 0, null, ids); - } - - @Override - public Map> read(int count, long timeout, TimeUnit unit, StreamMessageId... ids) { - return get(readAsync(count, timeout, unit, ids)); - } - - @Override - public Map> read(int count, StreamMessageId... ids) { - return get(readAsync(count, ids)); - } - - @Override - public RFuture>> readAsync(int count, long timeout, TimeUnit unit, - StreamMessageId... ids) { - List params = new ArrayList(); - if (count > 0) { - params.add("COUNT"); - params.add(count); - } - - if (timeout > 0) { - params.add("BLOCK"); - params.add(unit.toMillis(timeout)); - } - - params.add("STREAMS"); - params.add(getRawName()); - - for (StreamMessageId id : ids) { - params.add(id.toString()); - } - - if (timeout > 0) { - return commandExecutor.readAsync(getRawName(), codec, getServiceManager().getXReadBlockingSingleCommand(), params.toArray()); - } - return commandExecutor.readAsync(getRawName(), codec, getServiceManager().getXReadSingleCommand(), params.toArray()); - } - @Override public RFuture>> rangeAsync(int count, StreamMessageId startId, StreamMessageId endId) { List params = new LinkedList(); @@ -1128,16 +570,6 @@ public class RedissonStream extends RedissonExpirable implements RStream>> readAsync(StreamMessageId... ids) { - return readAsync(0, ids); - } - - @Override - public RFuture>> readAsync(long timeout, TimeUnit unit, StreamMessageId... ids) { - return readAsync(0, timeout, unit, ids); - } - @Override public RFuture>> rangeAsync(StreamMessageId startId, StreamMessageId endId) { return rangeAsync(0, startId, endId); @@ -1148,16 +580,6 @@ public class RedissonStream extends RedissonExpirable implements RStream> read(StreamMessageId... ids) { - return read(0, ids); - } - - @Override - public Map> read(long timeout, TimeUnit unit, StreamMessageId... ids) { - return read(0, timeout, unit, ids); - } - @Override public Map> range(StreamMessageId startId, StreamMessageId endId) { return range(0, startId, endId); @@ -1182,59 +604,6 @@ public class RedissonStream extends RedissonExpirable implements RStream trimAsync(TrimStrategy strategy, int threshold) { - return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.XTRIM, - getRawName(), strategy.toString(), threshold); - } - - @Override - public RFuture trimNonStrictAsync(TrimStrategy strategy, int threshold, int limit) { - return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.XTRIM, - getRawName(), strategy.toString(), "~", threshold, "LIMIT", limit); - } - - @Override - public long trimNonStrict(TrimStrategy strategy, int threshold) { - return get(trimNonStrictAsync(strategy, threshold)); - } - - @Override - public RFuture trimNonStrictAsync(TrimStrategy strategy, int threshold) { - return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.XTRIM, - getRawName(), strategy.toString(), "~", threshold); - } - - @Override - public RFuture trimAsync(int count) { - return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.XTRIM, getRawName(), "MAXLEN", count); - } - - @Override - public RFuture trimNonStrictAsync(int count) { - return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.XTRIM, getRawName(), "MAXLEN", "~", count); - } - - @Override - public long trim(int count) { - return get(trimAsync(count)); - } - - @Override - public long trimNonStrict(int count) { - return get(trimNonStrictAsync(count)); - } - @Override public RFuture removeGroupAsync(String groupName) { return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.XGROUP, "DESTROY", getRawName(), groupName); diff --git a/redisson/src/main/java/org/redisson/api/RStream.java b/redisson/src/main/java/org/redisson/api/RStream.java index 2889cc4d2..d724a250b 100644 --- a/redisson/src/main/java/org/redisson/api/RStream.java +++ b/redisson/src/main/java/org/redisson/api/RStream.java @@ -45,18 +45,6 @@ public interface RStream extends RStreamAsync, RExpirable { */ void createGroup(StreamCreateGroupArgs args); - /** - * Use createGroup(StreamCreateGroupArgs) method instead - */ - @Deprecated - void createGroup(String groupName); - - /** - * Use createGroup(StreamCreateGroupArgs) method instead - */ - @Deprecated - void createGroup(String groupName, StreamMessageId id); - /** * Removes group by name. * @@ -352,124 +340,6 @@ public interface RStream extends RStreamAsync, RExpirable { */ Map> readGroup(String groupName, String consumerName, StreamReadGroupArgs args); - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Map> readGroup(String groupName, String consumerName, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Map> readGroup(String groupName, String consumerName, int count, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Map> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Map> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2, String key3, StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Map>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, - StreamMessageId id2, String key3, StreamMessageId id3); - /** * Returns number of entries in stream * @@ -511,62 +381,6 @@ public interface RStream extends RStreamAsync, RExpirable { */ void add(StreamMessageId id, StreamAddArgs args); - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - StreamMessageId add(K key, V value); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - void add(StreamMessageId id, K key, V value); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - StreamMessageId add(K key, V value, int trimLen, boolean trimStrict); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - void add(StreamMessageId id, K key, V value, int trimLen, boolean trimStrict); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - StreamMessageId addAll(Map entries); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - void addAll(StreamMessageId id, Map entries); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - StreamMessageId addAll(Map entries, int trimLen, boolean trimStrict); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - void addAll(StreamMessageId id, Map entries, int trimLen, boolean trimStrict); - /** * Read stream data from multiple streams including current. *

@@ -603,118 +417,6 @@ public interface RStream extends RStreamAsync, RExpirable { */ Map> read(StreamReadArgs args); - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Map> read(StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Map> read(int count, StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Map> read(long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Map> read(int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(int count, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(int count, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Map>> read(int count, StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Map>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - /** * Returns stream data in range by specified start Stream Message ID (included) and end Stream Message ID (included). * @@ -787,45 +489,6 @@ public interface RStream extends RStreamAsync, RExpirable { */ long trimNonStrict(StreamTrimArgs args); - /* - * Use trim(StreamTrimArgs) method instead - * - */ - @Deprecated - long trim(int size); - - /* - * Use trim(StreamTrimArgs) method instead - * - */ - @Deprecated - long trim(TrimStrategy strategy, int threshold); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - long trimNonStrict(int size); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - long trimNonStrict(TrimStrategy strategy, int threshold); - - /** - * Trims stream using almost exact trimming threshold up to limit. - * - * @param strategy - trim strategy - * @param threshold - trim threshold - * @param limit - trim limit - * @return number of deleted messages - */ - @Deprecated - long trimNonStrict(TrimStrategy strategy, int threshold, int limit); - /** * Returns information about this stream. * diff --git a/redisson/src/main/java/org/redisson/api/RStreamAsync.java b/redisson/src/main/java/org/redisson/api/RStreamAsync.java index c39899f77..c4b49e8f8 100644 --- a/redisson/src/main/java/org/redisson/api/RStreamAsync.java +++ b/redisson/src/main/java/org/redisson/api/RStreamAsync.java @@ -45,18 +45,6 @@ public interface RStreamAsync extends RExpirableAsync { */ RFuture createGroupAsync(StreamCreateGroupArgs args); - /** - * Use createGroupAsync(StreamCreateGroupArgs) method instead - */ - @Deprecated - RFuture createGroupAsync(String groupName); - - /** - * Use createGroupAsync(StreamCreateGroupArgs) method instead - */ - @Deprecated - RFuture createGroupAsync(String groupName, StreamMessageId id); - /** * Removes group by name. * @@ -334,224 +322,6 @@ public interface RStreamAsync extends RExpirableAsync { */ RFuture>> readGroupAsync(String groupName, String consumerName, StreamReadGroupArgs args); - /** - * * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param ids - collection of Stream IDs - * @return stream data mapped by Stream ID - */ - @Deprecated - RFuture>> readGroupAsync(String groupName, String consumerName, StreamMessageId... ids); - - /** - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param count - stream data size limit - * @param ids - collection of Stream IDs - * @return stream data mapped by Stream ID - */ - @Deprecated - RFuture>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId... ids); - - /** - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param timeout - time interval to wait for stream data availability - * @param unit - time interval unit - * @param ids - collection of Stream IDs - * @return stream data mapped by Stream ID - */ - @Deprecated - RFuture>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId... ids); - - /** - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param count - stream data size limit - * @param timeout - time interval to wait for stream data availability - * @param unit - time interval unit - * @param ids - collection of Stream IDs - * @return stream data mapped by Stream ID - */ - @Deprecated - RFuture>> readGroupAsync(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param id - starting message id for this stream - * @param nameToId - Stream Message ID mapped by stream name - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, StreamMessageId id, Map nameToId); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param count - stream data size limit - * @param id - starting message id for this stream - * @param nameToId - Stream Message ID mapped by stream name - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId id, Map nameToId); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param count - stream data size limit - * @param timeout - time interval to wait for stream data availability - * @param unit - time interval unit - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, StreamMessageId id2); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param count - stream data size limit - * @param timeout - time interval to wait for stream data availability - * @param unit - time interval unit - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @param key3 - name of third stream - * @param id3 - starting message id for third stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param timeout - time interval to wait for stream data availability - * @param unit - time interval unit - * @param id - starting message id for this stream - * @param nameToId - Stream Message ID mapped by stream name - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @param key3 - name of third stream - * @param id3 - starting message id for third stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param count - stream data size limit - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param count - stream data size limit - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @param key3 - name of third stream - * @param id3 - starting message id for third stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2, - String key3, StreamMessageId id3); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param timeout - time interval to wait for stream data availability - * @param unit - time interval unit - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2); - - /** - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - * @param groupName - name of group - * @param consumerName - name of consumer - * @param timeout - time interval to wait for stream data availability - * @param unit - time interval unit - * @param id - starting message id for this stream - * @param key2 - name of second stream - * @param id2 - starting message id for second stream - * @param key3 - name of third stream - * @param id3 - starting message id for third stream - * @return stream data mapped by key and Stream Message ID - */ - @Deprecated - RFuture>>> readGroupAsync(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3); - /** * Returns number of entries in stream * @@ -575,62 +345,6 @@ public interface RStreamAsync extends RExpirableAsync { */ RFuture addAsync(StreamMessageId id, StreamAddArgs args); - /* - * Use addAsync(StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAsync(K key, V value); - - /* - * Use addAsync(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAsync(StreamMessageId id, K key, V value); - - /* - * Use addAsync(StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAsync(K key, V value, int trimLen, boolean trimStrict); - - /* - * Use addAsync(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAsync(StreamMessageId id, K key, V value, int trimLen, boolean trimStrict); - - /* - * Use addAsync(StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAllAsync(Map entries); - - /* - * Use addAsync(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAllAsync(StreamMessageId id, Map entries); - - /* - * Use addAsync(StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAllAsync(Map entries, int trimLen, boolean trimStrict); - - /* - * Use addAsync(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - RFuture addAllAsync(StreamMessageId id, Map entries, int trimLen, boolean trimStrict); - /** * Read stream data from multiple streams including current. * @@ -647,118 +361,6 @@ public interface RStreamAsync extends RExpirableAsync { */ RFuture>> readAsync(StreamReadArgs args); - /* - * Use readAsync(StreamReadArgs) method instead - * - */ - @Deprecated - RFuture>> readAsync(StreamMessageId... ids); - - /* - * Use readAsync(StreamReadArgs) method instead - * - */ - @Deprecated - RFuture>> readAsync(int count, StreamMessageId... ids); - - /* - * Use readAsync(StreamReadArgs) method instead - * - */ - @Deprecated - RFuture>> readAsync(long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readAsync(StreamReadArgs) method instead - * - */ - @Deprecated - RFuture>> readAsync(int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(StreamMessageId id, Map nameToId); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(int count, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(int count, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(int count, StreamMessageId id, Map nameToId); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use readAsync(StreamMultiReadArgs) method instead - * - */ - @Deprecated - RFuture>>> readAsync(int count, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - /** * Returns stream data in range by specified start Stream ID (included) and end Stream ID (included). * @@ -809,55 +411,6 @@ public interface RStreamAsync extends RExpirableAsync { RFuture trimNonStrictAsync(StreamTrimArgs args); - /** - * Trims stream using MAXLEN strategy to specified size - * - * @param size - new size of stream - * @return number of deleted messages - */ - @Deprecated - RFuture trimAsync(int size); - - /** - * Trims stream to specified size - * - * @param strategy - trim strategy - * @param threshold - new size of stream - * @return number of deleted messages - */ - @Deprecated - RFuture trimAsync(TrimStrategy strategy, int threshold); - - /** - * Trims stream using MAXLEN strategy to almost exact trimming threshold. - * - * @param size - new size of stream - * @return number of deleted messages - */ - @Deprecated - RFuture trimNonStrictAsync(int size); - - /** - * Trims stream using almost exact trimming threshold. - * - * @param strategy - trim strategy - * @param threshold - trim threshold - * @return number of deleted messages - */ - @Deprecated - RFuture trimNonStrictAsync(TrimStrategy strategy, int threshold); - - /** - * Trims stream using almost exact trimming threshold up to limit. - * - * @param strategy - trim strategy - * @param threshold - trim threshold - * @param limit - trim limit - * @return number of deleted messages - */ - @Deprecated - RFuture trimNonStrictAsync(TrimStrategy strategy, int threshold, int limit); - /** * Returns information about this stream. * diff --git a/redisson/src/main/java/org/redisson/api/RStreamReactive.java b/redisson/src/main/java/org/redisson/api/RStreamReactive.java index 4f0fb74eb..c7028f1ad 100644 --- a/redisson/src/main/java/org/redisson/api/RStreamReactive.java +++ b/redisson/src/main/java/org/redisson/api/RStreamReactive.java @@ -46,18 +46,6 @@ public interface RStreamReactive extends RExpirableReactive { */ Mono createGroup(StreamCreateGroupArgs args); - /** - * Use createGroup(StreamCreateGroupArgs) method instead - */ - @Deprecated - Mono createGroup(String groupName); - - /** - * Use createGroup(StreamCreateGroupArgs) method instead - */ - @Deprecated - Mono createGroup(String groupName, StreamMessageId id); - /** * Removes group by name. * @@ -111,12 +99,6 @@ public interface RStreamReactive extends RExpirableReactive { */ Mono getPendingInfo(String groupName); - /* - * Use #getPendingInfo method - */ - @Deprecated - Mono listPending(String groupName); - /** * Returns list of pending messages by group name. * Limited by start stream id and end stream id and count. @@ -309,116 +291,6 @@ public interface RStreamReactive extends RExpirableReactive { */ Mono>> readGroup(String groupName, String consumerName, StreamReadGroupArgs args); - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Mono>> readGroup(String groupName, String consumerName, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Mono>> readGroup(String groupName, String consumerName, int count, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Mono>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Mono>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2, - String key3, StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Mono>>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3); - /** * Returns number of entries in stream * @@ -460,62 +332,6 @@ public interface RStreamReactive extends RExpirableReactive { */ Mono add(StreamMessageId id, StreamAddArgs args); - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Mono add(K key, V value); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Mono add(StreamMessageId id, K key, V value); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Mono add(K key, V value, int trimLen, boolean trimStrict); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Mono add(StreamMessageId id, K key, V value, int trimLen, boolean trimStrict); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Mono addAll(Map entries); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Mono addAll(StreamMessageId id, Map entries); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Mono addAll(Map entries, int trimLen, boolean trimStrict); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Mono addAll(StreamMessageId id, Map entries, int trimLen, boolean trimStrict); - /** * Read stream data from multiple streams including current. *

@@ -552,118 +368,6 @@ public interface RStreamReactive extends RExpirableReactive { */ Mono>> read(StreamReadArgs args); - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Mono>> read(StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Mono>> read(int count, StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Mono>> read(long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Mono>> read(int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(int count, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(int count, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(int count, StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Mono>>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - /** * Returns stream data in range by specified start Stream ID (included) and end Stream ID (included). * @@ -726,41 +430,6 @@ public interface RStreamReactive extends RExpirableReactive { */ Mono trimNonStrict(StreamTrimArgs args); - /* - * Use trim(StreamTrimArgs) method instead - * - */ - @Deprecated - Mono trim(int size); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - Mono trimNonStrict(int size); - - /* - * Use trim(StreamTrimArgs) method instead - * - */ - @Deprecated - Mono trim(TrimStrategy strategy, int threshold); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - Mono trimNonStrict(TrimStrategy strategy, int threshold); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - Mono trimNonStrict(TrimStrategy strategy, int threshold, int limit); - /** * Returns information about this stream. * diff --git a/redisson/src/main/java/org/redisson/api/RStreamRx.java b/redisson/src/main/java/org/redisson/api/RStreamRx.java index 20e253567..69cc1b6fc 100644 --- a/redisson/src/main/java/org/redisson/api/RStreamRx.java +++ b/redisson/src/main/java/org/redisson/api/RStreamRx.java @@ -47,18 +47,6 @@ public interface RStreamRx extends RExpirableRx { */ Completable createGroup(StreamCreateGroupArgs args); - /** - * Use createGroup(StreamCreateGroupArgs) method instead - */ - @Deprecated - Completable createGroup(String groupName); - - /** - * Use createGroup(StreamCreateGroupArgs) method instead - */ - @Deprecated - Completable createGroup(String groupName, StreamMessageId id); - /** * Removes group by name. * @@ -112,12 +100,6 @@ public interface RStreamRx extends RExpirableRx { */ Single getPendingInfo(String groupName); - /* - * Use #getPendingInfo method - */ - @Deprecated - Single listPending(String groupName); - /** * Returns list of pending messages by group name. * Limited by start stream id and end stream id and count. @@ -310,116 +292,6 @@ public interface RStreamRx extends RExpirableRx { */ Single>> readGroup(String groupName, String consumerName, StreamReadGroupArgs args); - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Single>> readGroup(String groupName, String consumerName, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Single>> readGroup(String groupName, String consumerName, int count, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Single>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamReadGroupArgs) method instead - * - */ - @Deprecated - Single>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, int count, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, StreamMessageId id, String key2, StreamMessageId id2, String key3, - StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, int count, StreamMessageId id, String key2, StreamMessageId id2, - String key3, StreamMessageId id3); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2); - - /* - * Use readGroup(String, String, StreamMultiReadGroupArgs) method instead - * - */ - @Deprecated - Single>>> readGroup(String groupName, String consumerName, long timeout, TimeUnit unit, StreamMessageId id, - String key2, StreamMessageId id2, String key3, StreamMessageId id3); - /** * Returns number of entries in stream * @@ -461,62 +333,6 @@ public interface RStreamRx extends RExpirableRx { */ Completable add(StreamMessageId id, StreamAddArgs args); - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Single add(K key, V value); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Completable add(StreamMessageId id, K key, V value); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Single add(K key, V value, int trimLen, boolean trimStrict); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Completable add(StreamMessageId id, K key, V value, int trimLen, boolean trimStrict); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Single addAll(Map entries); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Completable addAll(StreamMessageId id, Map entries); - - /* - * Use add(StreamAddArgs) method instead - * - */ - @Deprecated - Single addAll(Map entries, int trimLen, boolean trimStrict); - - /* - * Use add(StreamMessageId, StreamAddArgs) method instead - * - */ - @Deprecated - Completable addAll(StreamMessageId id, Map entries, int trimLen, boolean trimStrict); - /** * Read stream data from multiple streams including current. *

@@ -553,118 +369,6 @@ public interface RStreamRx extends RExpirableRx { */ Single>> read(StreamReadArgs args); - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Single>> read(StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Single>> read(int count, StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Single>> read(long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use read(StreamReadArgs) method instead - * - */ - @Deprecated - Single>> read(int count, long timeout, TimeUnit unit, StreamMessageId... ids); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(int count, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(int count, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(int count, StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, String name2, StreamMessageId id2, String name3, StreamMessageId id3); - - /* - * Use read(StreamMultiReadArgs) method instead - * - */ - @Deprecated - Single>>> read(int count, long timeout, TimeUnit unit, StreamMessageId id, Map nameToId); - /** * Returns stream data in range by specified start Stream ID (included) and end Stream ID (included). * @@ -727,41 +431,6 @@ public interface RStreamRx extends RExpirableRx { */ Single trimNonStrict(StreamTrimArgs args); - /* - * Use trim(StreamTrimArgs) method instead - * - */ - @Deprecated - Single trim(int size); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - Single trimNonStrict(int size); - - /* - * Use trim(StreamTrimArgs) method instead - * - */ - @Deprecated - Single trim(TrimStrategy strategy, int threshold); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - Single trimNonStrict(TrimStrategy strategy, int threshold); - - /* - * Use trimNonStrict(StreamTrimArgs) method instead - * - */ - @Deprecated - Single trimNonStrict(TrimStrategy strategy, int threshold, int limit); - /** * Returns information about this stream. * diff --git a/redisson/src/test/java/org/redisson/RedissonStreamTest.java b/redisson/src/test/java/org/redisson/RedissonStreamTest.java index 1852d271b..00c3055a4 100644 --- a/redisson/src/test/java/org/redisson/RedissonStreamTest.java +++ b/redisson/src/test/java/org/redisson/RedissonStreamTest.java @@ -42,7 +42,7 @@ public class RedissonStreamTest extends RedisDockerTest { @Test public void testEmptyMap() { RStream stream = redisson.getStream("stream"); - stream.createGroup("group"); + stream.createGroup(StreamCreateGroupArgs.name("group").makeStream()); stream.add(StreamAddArgs.entry("key", "value")); Map> result2 = stream.readGroup("group", "consumer", @@ -61,7 +61,7 @@ public class RedissonStreamTest extends RedisDockerTest { stream.add(StreamAddArgs.entry("0", "0")); - stream.createGroup("testGroup"); + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -91,7 +91,7 @@ public class RedissonStreamTest extends RedisDockerTest { stream.add(StreamAddArgs.entry("0", "0")); - stream.createGroup("testGroup"); + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -142,7 +142,7 @@ public class RedissonStreamTest extends RedisDockerTest { @Test public void testPendingEmpty() { RStream stream = redisson.getStream("test"); - stream.createGroup("testGroup"); + stream.createGroup(StreamCreateGroupArgs.name("testGroup").makeStream()); PendingResult result = stream.getPendingInfo("testGroup"); assertThat(result.getTotal()).isZero(); assertThat(result.getHighestId()).isNull(); @@ -155,8 +155,8 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); StreamMessageId id = stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup"); + + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); System.out.println("id1 " + id1); @@ -177,9 +177,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup"); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup").makeStream()); + StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -197,7 +197,7 @@ public class RedissonStreamTest extends RedisDockerTest { stream.add(StreamAddArgs.entry("0", "0")); - stream.createGroup("testGroup"); + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -226,7 +226,7 @@ public class RedissonStreamTest extends RedisDockerTest { stream.add(StreamAddArgs.entry("0", "0")); - stream.createGroup("testGroup"); + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -254,9 +254,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup"); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); + StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -286,7 +286,7 @@ public class RedissonStreamTest extends RedisDockerTest { stream.add(StreamAddArgs.entry("0", "0")); - stream.createGroup("testGroup3"); + stream.createGroup(StreamCreateGroupArgs.name("testGroup3")); StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -313,7 +313,7 @@ public class RedissonStreamTest extends RedisDockerTest { stream.add(StreamAddArgs.entry("0", "0")); - stream.createGroup("testGroup3"); + stream.createGroup(StreamCreateGroupArgs.name("testGroup3")); StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -339,9 +339,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup"); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); + StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -382,9 +382,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup"); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); + StreamMessageId id1 = stream.add(StreamAddArgs.entry("11", "12")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("21", "22")); @@ -410,9 +410,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup"); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup")); + StreamMessageId id1 = stream.add(StreamAddArgs.entry("1", "1")); StreamMessageId id2 = stream.add(StreamAddArgs.entry("2", "2")); @@ -429,10 +429,10 @@ public class RedissonStreamTest extends RedisDockerTest { StreamMessageId id01 = stream1.add(StreamAddArgs.entry("0", "0")); StreamMessageId id02 = stream2.add(StreamAddArgs.entry("0", "0")); - - stream1.createGroup("testGroup", id01); - stream2.createGroup("testGroup", id02); - + + stream1.createGroup(StreamCreateGroupArgs.name("testGroup").id(id01)); + stream2.createGroup(StreamCreateGroupArgs.name("testGroup").id(id02)); + StreamMessageId id11 = stream1.add(StreamAddArgs.entry("1", "1")); StreamMessageId id12 = stream1.add(StreamAddArgs.entry("2", "2")); StreamMessageId id13 = stream1.add(StreamAddArgs.entry("3", "3")); @@ -449,9 +449,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); StreamMessageId id0 = stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup", id0); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup").id(id0).makeStream()); + stream.add(StreamAddArgs.entry("1", "1")); stream.add(StreamAddArgs.entry("2", "2")); stream.add(StreamAddArgs.entry("3", "3")); @@ -461,9 +461,9 @@ public class RedissonStreamTest extends RedisDockerTest { assertThat(s.size()).isEqualTo(3); stream.removeGroup("testGroup"); - - stream.createGroup("testGroup", id0); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup").id(id0).makeStream()); + stream.add(StreamAddArgs.entry("1", "1")); stream.add(StreamAddArgs.entry("2", "2")); stream.add(StreamAddArgs.entry("3", "3")); @@ -471,9 +471,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream2 = redisson.getStream("test2"); StreamMessageId id1 = stream2.add(StreamAddArgs.entry("0", "0")); - - stream2.createGroup("testGroup", id1); - + + stream2.createGroup(StreamCreateGroupArgs.name("testGroup").id(id1).makeStream()); + // Map>> s2 = stream.readGroup("testGroup", "consumer1", 3, 5, TimeUnit.SECONDS, id0, Collections.singletonMap("test2", id1)); // assertThat(s2.values().iterator().next().values().iterator().next().keySet()).containsAnyOf("1", "2", "3"); // assertThat(s2.size()).isEqualTo(3); @@ -482,7 +482,7 @@ public class RedissonStreamTest extends RedisDockerTest { @Test public void testCreateEmpty() { RStream stream = redisson.getStream("test"); - stream.createGroup("testGroup", StreamMessageId.ALL); + stream.createGroup(StreamCreateGroupArgs.name("testGroup").id(StreamMessageId.ALL).makeStream()); stream.add(StreamAddArgs.entry("1", "2")); Map> s = stream.readGroup("testGroup", "consumer1", StreamReadGroupArgs.neverDelivered()); @@ -494,9 +494,9 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test"); StreamMessageId id0 = stream.add(StreamAddArgs.entry("0", "0")); - - stream.createGroup("testGroup", id0); - + + stream.createGroup(StreamCreateGroupArgs.name("testGroup").id(id0)); + stream.add(StreamAddArgs.entry("1", "1")); stream.add(StreamAddArgs.entry("2", "2")); stream.add(StreamAddArgs.entry("3", "3")); @@ -798,15 +798,15 @@ public class RedissonStreamTest extends RedisDockerTest { RStream stream = redisson.getStream("test1"); StreamMessageId id1 = new StreamMessageId(12, 44); - stream.createGroup("testGroup", id1); - + stream.createGroup(StreamCreateGroupArgs.name("testGroup").id(id1).makeStream()); + stream.add(StreamAddArgs.entry("1", "1")); stream.add(StreamAddArgs.entry("2", "2")); stream.add(StreamAddArgs.entry("3", "3")); StreamMessageId id2 = new StreamMessageId(12, 44); - stream.createGroup("testGroup2", id2); - + stream.createGroup(StreamCreateGroupArgs.name("testGroup2").id(id2).makeStream()); + stream.add(StreamAddArgs.entry("1", "1")); stream.add(StreamAddArgs.entry("2", "2")); stream.add(StreamAddArgs.entry("3", "3")); @@ -845,15 +845,15 @@ public class RedissonStreamTest extends RedisDockerTest { assertThat(s).isEmpty(); StreamMessageId id1 = new StreamMessageId(12, 44); - stream.createGroup("testGroup", id1); - + stream.createGroup(StreamCreateGroupArgs.name("testGroup").id(id1)); + stream.add(StreamAddArgs.entry("1", "1")); stream.add(StreamAddArgs.entry("2", "2")); stream.add(StreamAddArgs.entry("3", "3")); StreamMessageId id2 = new StreamMessageId(12, 44); - stream.createGroup("testGroup2", id2); - + stream.createGroup(StreamCreateGroupArgs.name("testGroup2").id(id2)); + stream.add(StreamAddArgs.entry("1", "1")); stream.add(StreamAddArgs.entry("2", "2")); stream.add(StreamAddArgs.entry("3", "3")); @@ -874,8 +874,8 @@ public class RedissonStreamTest extends RedisDockerTest { public void testStreamInfoEmpty() { RStream stream = redisson.getStream("test1"); StreamMessageId id1 = new StreamMessageId(12, 44); - stream.createGroup("testGroup", id1); - + stream.createGroup(StreamCreateGroupArgs.name("testGroup").id(id1).makeStream()); + StreamInfo s = stream.getInfo(); }