diff --git a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java index cdd8bd337..30a738ef6 100644 --- a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java +++ b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java @@ -202,8 +202,8 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement byte[] keyBuf = toByteArray(command.getKey()); - String start = toLowerBound(command.getRange(), "-inf"); - String end = toUpperBound(command.getRange(), "+inf"); + String start = toLowerBound(command.getRange()); + String end = toUpperBound(command.getRange()); List args = new ArrayList(); args.add(keyBuf); @@ -251,26 +251,26 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement private static final RedisStrictCommand ZCOUNT = new RedisStrictCommand("ZCOUNT"); - String toLowerBound(Range range, Object defaultValue) { + String toLowerBound(Range range) { StringBuilder s = new StringBuilder(); if (!range.getLowerBound().isInclusive()) { s.append("("); } if (!range.getLowerBound().getValue().isPresent() || range.getLowerBound().getValue().get().toString().isEmpty()) { - s.append(defaultValue); + s.append("-inf"); } else { s.append(range.getLowerBound().getValue().get()); } return s.toString(); } - String toUpperBound(Range range, Object defaultValue) { + String toUpperBound(Range range) { StringBuilder s = new StringBuilder(); if (!range.getUpperBound().isInclusive()) { s.append("("); } if (!range.getUpperBound().getValue().isPresent() || range.getUpperBound().getValue().get().toString().isEmpty()) { - s.append(defaultValue); + s.append("+inf"); } else { s.append(range.getUpperBound().getValue().get()); } @@ -307,7 +307,6 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement return s.toString(); } - @Override public Flux> zCount(Publisher commands) { return execute(commands, command -> { @@ -317,8 +316,8 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement byte[] keyBuf = toByteArray(command.getKey()); Mono m = read(keyBuf, StringCodec.INSTANCE, ZCOUNT, - keyBuf, toLowerBound(command.getRange(), 0), - toUpperBound(command.getRange(), -1)); + keyBuf, toLowerBound(command.getRange()), + toUpperBound(command.getRange())); return m.map(v -> new NumericResponse<>(command, v)); }); } @@ -376,11 +375,11 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement Assert.notNull(command.getKey(), "Key must not be null!"); Assert.notNull(command.getRange(), "Range must not be null!"); - + byte[] keyBuf = toByteArray(command.getKey()); Mono m = write(keyBuf, StringCodec.INSTANCE, ZREMRANGEBYSCORE, - keyBuf, toLowerBound(command.getRange(), 0), - toUpperBound(command.getRange(), -1)); + keyBuf, toLowerBound(command.getRange()), + toUpperBound(command.getRange())); return m.map(v -> new NumericResponse<>(command, v)); }); } diff --git a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java index 970efff1c..fe795e5da 100644 --- a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java +++ b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java @@ -207,8 +207,8 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement byte[] keyBuf = toByteArray(command.getKey()); - String start = toLowerBound(command.getRange(), "-inf"); - String end = toUpperBound(command.getRange(), "+inf"); + String start = toLowerBound(command.getRange()); + String end = toUpperBound(command.getRange()); List args = new ArrayList(); args.add(keyBuf); @@ -283,26 +283,26 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement private static final RedisStrictCommand ZCOUNT = new RedisStrictCommand("ZCOUNT"); - String toLowerBound(Range range, Object defaultValue) { + String toLowerBound(Range range) { StringBuilder s = new StringBuilder(); if (!range.getLowerBound().isInclusive()) { s.append("("); } if (!range.getLowerBound().getValue().isPresent() || range.getLowerBound().getValue().get().toString().isEmpty()) { - s.append(defaultValue); + s.append("-inf"); } else { s.append(range.getLowerBound().getValue().get()); } return s.toString(); } - String toUpperBound(Range range, Object defaultValue) { + String toUpperBound(Range range) { StringBuilder s = new StringBuilder(); if (!range.getUpperBound().isInclusive()) { s.append("("); } if (!range.getUpperBound().getValue().isPresent() || range.getUpperBound().getValue().get().toString().isEmpty()) { - s.append(defaultValue); + s.append("+inf"); } else { s.append(range.getUpperBound().getValue().get()); } @@ -339,7 +339,6 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement return s.toString(); } - @Override public Flux> zCount(Publisher commands) { return execute(commands, command -> { @@ -349,8 +348,8 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement byte[] keyBuf = toByteArray(command.getKey()); Mono m = read(keyBuf, StringCodec.INSTANCE, ZCOUNT, - keyBuf, toLowerBound(command.getRange(), 0), - toUpperBound(command.getRange(), -1)); + keyBuf, toLowerBound(command.getRange()), + toUpperBound(command.getRange())); return m.map(v -> new NumericResponse<>(command, v)); }); } @@ -408,11 +407,11 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement Assert.notNull(command.getKey(), "Key must not be null!"); Assert.notNull(command.getRange(), "Range must not be null!"); - + byte[] keyBuf = toByteArray(command.getKey()); Mono m = write(keyBuf, StringCodec.INSTANCE, ZREMRANGEBYSCORE, - keyBuf, toLowerBound(command.getRange(), 0), - toUpperBound(command.getRange(), -1)); + keyBuf, toLowerBound(command.getRange()), + toUpperBound(command.getRange())); return m.map(v -> new NumericResponse<>(command, v)); }); } diff --git a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java index 970efff1c..fe795e5da 100644 --- a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java +++ b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonReactiveZSetCommands.java @@ -207,8 +207,8 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement byte[] keyBuf = toByteArray(command.getKey()); - String start = toLowerBound(command.getRange(), "-inf"); - String end = toUpperBound(command.getRange(), "+inf"); + String start = toLowerBound(command.getRange()); + String end = toUpperBound(command.getRange()); List args = new ArrayList(); args.add(keyBuf); @@ -283,26 +283,26 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement private static final RedisStrictCommand ZCOUNT = new RedisStrictCommand("ZCOUNT"); - String toLowerBound(Range range, Object defaultValue) { + String toLowerBound(Range range) { StringBuilder s = new StringBuilder(); if (!range.getLowerBound().isInclusive()) { s.append("("); } if (!range.getLowerBound().getValue().isPresent() || range.getLowerBound().getValue().get().toString().isEmpty()) { - s.append(defaultValue); + s.append("-inf"); } else { s.append(range.getLowerBound().getValue().get()); } return s.toString(); } - String toUpperBound(Range range, Object defaultValue) { + String toUpperBound(Range range) { StringBuilder s = new StringBuilder(); if (!range.getUpperBound().isInclusive()) { s.append("("); } if (!range.getUpperBound().getValue().isPresent() || range.getUpperBound().getValue().get().toString().isEmpty()) { - s.append(defaultValue); + s.append("+inf"); } else { s.append(range.getUpperBound().getValue().get()); } @@ -339,7 +339,6 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement return s.toString(); } - @Override public Flux> zCount(Publisher commands) { return execute(commands, command -> { @@ -349,8 +348,8 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement byte[] keyBuf = toByteArray(command.getKey()); Mono m = read(keyBuf, StringCodec.INSTANCE, ZCOUNT, - keyBuf, toLowerBound(command.getRange(), 0), - toUpperBound(command.getRange(), -1)); + keyBuf, toLowerBound(command.getRange()), + toUpperBound(command.getRange())); return m.map(v -> new NumericResponse<>(command, v)); }); } @@ -408,11 +407,11 @@ public class RedissonReactiveZSetCommands extends RedissonBaseReactive implement Assert.notNull(command.getKey(), "Key must not be null!"); Assert.notNull(command.getRange(), "Range must not be null!"); - + byte[] keyBuf = toByteArray(command.getKey()); Mono m = write(keyBuf, StringCodec.INSTANCE, ZREMRANGEBYSCORE, - keyBuf, toLowerBound(command.getRange(), 0), - toUpperBound(command.getRange(), -1)); + keyBuf, toLowerBound(command.getRange()), + toUpperBound(command.getRange())); return m.map(v -> new NumericResponse<>(command, v)); }); }