Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-729 - Polishing.

Browse Source 
Tweak assertion messages and consistently use constants. Reformat code. Join assertions in tests.

Original pull request: #566.
This commit is contained in:
Mark Paluch
2020-10-13 12:13:34 +02:00
parent da81275c4d
commit df37dc812b
5 changed files with 36 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java
View File

@@ -1046,8 +1046,8 @@ public interface RedisZSetCommands {
}
/**
* Get all the elements in {@link Range} from the sorted set at {@literal key} in reversed lexicographical ordering. Result is
* limited via {@link Limit}.
* Get all the elements in {@link Range} from the sorted set at {@literal key} in reversed lexicographical ordering.
* Result is limited via {@link Limit}.
*
* @param key must not be {@literal null}.
* @param range must not be {@literal null}.

8
src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
View File

@@ -309,11 +309,11 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
public Set<byte[]> zRangeByLex(byte[] key, Range range, Limit limit) {
Assert.notNull(key, "Key must not be null!");
Assert.notNull(range, "Range cannot be null for ZRANGEBYLEX.");
Assert.notNull(range, "Range must not be null for ZRANGEBYLEX!");
Assert.notNull(limit, "Limit must not be null!");
byte[] min = JedisConverters.boundaryToBytesForZRangeByLex(range.getMin(), JedisConverters.toBytes("-"));
byte[] max = JedisConverters.boundaryToBytesForZRangeByLex(range.getMax(), JedisConverters.toBytes("+"));
byte[] min = JedisConverters.boundaryToBytesForZRangeByLex(range.getMin(), JedisConverters.MINUS_BYTES);
byte[] max = JedisConverters.boundaryToBytesForZRangeByLex(range.getMax(), JedisConverters.PLUS_BYTES);
try {
if (limit.isUnlimited()) {
@@ -333,7 +333,7 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
public Set<byte[]> zRevRangeByLex(byte[] key, Range range, Limit limit) {
Assert.notNull(key, "Key must not be null!");
Assert.notNull(range, "Range cannot be null for ZREVRANGEBYLEX.");
Assert.notNull(range, "Range must not be null for ZREVRANGEBYLEX!");
Assert.notNull(limit, "Limit must not be null!");
byte[] min = JedisConverters.boundaryToBytesForZRangeByLex(range.getMin(), JedisConverters.MINUS_BYTES);

3
src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
View File

@@ -933,7 +933,8 @@ class JedisZSetCommands implements RedisZSetCommands {
}
if (!limit.isUnlimited()) {
return new LinkedHashSet<>(connection.getJedis().zrevrangeByLex(key, max, min, limit.getOffset(), limit.getCount()));
return new LinkedHashSet<>(
connection.getJedis().zrevrangeByLex(key, max, min, limit.getOffset(), limit.getCount()));
}
return new LinkedHashSet<>(connection.getJedis().zrevrangeByLex(key, max, min));
} catch (Exception ex) {

28
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java
View File

@@ -892,25 +892,25 @@ class LettuceZSetCommands implements RedisZSetCommands {
try {
if (isPipelined()) {
if (limit.isUnlimited()) {
pipeline(
connection.newLettuceResult(getAsyncConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true)),
LettuceConverters.bytesListToBytesSet()));
pipeline(connection.newLettuceResult(
getAsyncConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true)),
LettuceConverters.bytesListToBytesSet()));
} else {
pipeline(
connection.newLettuceResult(getAsyncConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true),
LettuceConverters.toLimit(limit)), LettuceConverters.bytesListToBytesSet()));
pipeline(connection.newLettuceResult(getAsyncConnection().zrevrangebylex(key,
LettuceConverters.toRange(range, true), LettuceConverters.toLimit(limit)),
LettuceConverters.bytesListToBytesSet()));
}
return null;
}
if (isQueueing()) {
if (limit.isUnlimited()) {
transaction(
connection.newLettuceResult(getAsyncConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true)),
LettuceConverters.bytesListToBytesSet()));
transaction(connection.newLettuceResult(
getAsyncConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true)),
LettuceConverters.bytesListToBytesSet()));
} else {
transaction(
connection.newLettuceResult(getAsyncConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true),
LettuceConverters.toLimit(limit)), LettuceConverters.bytesListToBytesSet()));
transaction(connection.newLettuceResult(getAsyncConnection().zrevrangebylex(key,
LettuceConverters.toRange(range, true), LettuceConverters.toLimit(limit)),
LettuceConverters.bytesListToBytesSet()));
}
return null;
}
@@ -919,8 +919,8 @@ class LettuceZSetCommands implements RedisZSetCommands {
return LettuceConverters.bytesListToBytesSet()
.convert(getConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true)));
}
return LettuceConverters.bytesListToBytesSet().convert(
getConnection().zrevrangebylex(key, LettuceConverters.toRange(range, true), LettuceConverters.toLimit(limit)));
return LettuceConverters.bytesListToBytesSet().convert(getConnection().zrevrangebylex(key,
LettuceConverters.toRange(range, true), LettuceConverters.toLimit(limit)));
} catch (Exception ex) {
throw convertLettuceAccessException(ex);