Switch to TimeoutUtils for zsetcommands.

Remove precise timeout calculation in zsetcommands and switch to TimeoutUtils and update a bit of docs and add some new lines here and there.

Original Pull Request: spring-projects#2107

Author: christophstrobl

src/main/java/org/springframework/data/redis/connection/ReactiveListCommands.java

@@ -671,6 +671,7 @@ class LMoveCommand extends KeyCommand {
 
 		public LMoveCommand(@Nullable ByteBuffer sourceKey, @Nullable ByteBuffer destinationKey, @Nullable Direction from,
 				@Nullable Direction to) {
+
 			super(sourceKey);
 			this.destinationKey = destinationKey;
 			this.from = from;
@@ -697,15 +698,15 @@ public static LMoveCommand from(ByteBuffer sourceKey, Direction sourceDirection)
 		 * properties.
 		 *
 		 * @param destinationKey must not be {@literal null}.
-		 * @param to must not be {@literal null}.
+		 * @param direction must not be {@literal null}.
 		 * @return a new {@link LMoveCommand} with {@literal pivot} applied.
 		 */
-		public LMoveCommand to(ByteBuffer destinationKey, Direction destinationDirection) {
+		public LMoveCommand to(ByteBuffer destinationKey, Direction direction) {
 
 			Assert.notNull(destinationKey, "Destination key must not be null!");
-			Assert.notNull(destinationDirection, "Direction must not be null!");
+			Assert.notNull(direction, "Direction must not be null!");
 
-			return new LMoveCommand(getKey(), destinationKey, from, destinationDirection);
+			return new LMoveCommand(getKey(), destinationKey, from, direction);
 		}
 
 		/**

src/main/java/org/springframework/data/redis/connection/RedisListCommands.java

@@ -43,6 +43,7 @@ enum Position {
 	 * @since 2.6
 	 */
 	enum Direction {
+
 		LEFT, RIGHT;
 
 		/**

src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java

@@ -876,7 +876,7 @@ default Long lPos(String key, String element) {
 	 * @param timeout
 	 * @return {@literal null} when used in pipeline / transaction.
 	 * @since 2.6
-	 * @see <a href="https://redis.io/commands/lmove">Redis Documentation: BLMOVE</a>
+	 * @see <a href="https://redis.io/commands/blmove">Redis Documentation: BLMOVE</a>
 	 * @see #lMove(byte[], byte[], Direction, Direction)
 	 * @see #bLMove(byte[], byte[], Direction, Direction, double)
 	 */

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java

@@ -1028,23 +1028,17 @@ static long getUpperBoundIndex(org.springframework.data.domain.Range<Long> range
 
 	static LMoveArgs toLmoveArgs(Enum<?> from, Enum<?> to) {
 
-		if (from.name().equals(Direction.LEFT.name()) && to.name().equals(Direction.LEFT.name())) {
-			return LMoveArgs.Builder.leftLeft();
-		}
-
-		if (from.name().equals(Direction.LEFT.name()) && to.name().equals(Direction.RIGHT.name())) {
+		if (from.name().equals(Direction.LEFT.name())) {
+			if (to.name().equals(Direction.LEFT.name())) {
+				return LMoveArgs.Builder.leftLeft();
+			}
 			return LMoveArgs.Builder.leftRight();
 		}
 
-		if (from.name().equals(Direction.RIGHT.name()) && to.name().equals(Direction.LEFT.name())) {
+		if (to.name().equals(Direction.LEFT.name())) {
 			return LMoveArgs.Builder.rightLeft();
 		}
-
-		if (from.name().equals(Direction.RIGHT.name()) && to.name().equals(Direction.RIGHT.name())) {
-			return LMoveArgs.Builder.rightRight();
-		}
-
-		throw new IllegalArgumentException(String.format("Unsupported combination of arguments: %s/%s", from, to));
+		return LMoveArgs.Builder.rightRight();
 	}
 
 	/**

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommands.java

@@ -21,6 +21,7 @@
 import io.lettuce.core.Value;
 import io.lettuce.core.ZAddArgs;
 import io.lettuce.core.ZStoreArgs;
+import org.springframework.data.redis.core.TimeoutUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -415,7 +416,7 @@ public Flux<CommandResponse<BZPopCommand, Flux<Tuple>>> bZPop(Publisher<BZPopCom
 
 			if(command.getTimeUnit() == TimeUnit.MILLISECONDS) {
 
-				double timeout = preciseTimeout(command.getTimeout(), command.getTimeUnit());
+				double timeout = TimeoutUtils.toDoubleSeconds(command.getTimeout(), command.getTimeUnit());
 
 				Mono<ScoredValue<ByteBuffer>> result = (command.getDirection() == PopDirection.MIN
 						? cmd.bzpopmin(timeout, command.getKey())
@@ -807,10 +808,6 @@ private Tuple toTuple(ByteBuffer value, double score) {
 		return new DefaultTuple(ByteUtils.getBytes(value), score);
 	}
 
-	static double preciseTimeout(long val, TimeUnit unit) {
-		return (double) unit.toMillis(val) / 1000.0D;
-	}
-
 	protected LettuceReactiveRedisConnection getConnection() {
 		return connection;
 	}

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

@@ -34,6 +34,7 @@
 import org.springframework.data.redis.core.KeyBoundCursor;
 import org.springframework.data.redis.core.ScanIteration;
 import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.data.redis.core.TimeoutUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -370,7 +371,7 @@ public Tuple bZPopMin(byte[] key, long timeout, TimeUnit unit) {
 		if(TimeUnit.MILLISECONDS == unit) {
 
 			return connection.invoke(connection.getAsyncDedicatedConnection())
-					.from(RedisSortedSetAsyncCommands::bzpopmin, preciseTimeout(timeout, unit), key)
+					.from(RedisSortedSetAsyncCommands::bzpopmin, TimeoutUtils.toDoubleSeconds(timeout, unit), key)
 					.get(it -> it.map(LettuceConverters::toTuple).getValueOrElse(null));
 		}
 
@@ -420,7 +421,7 @@ public Tuple bZPopMax(byte[] key, long timeout, TimeUnit unit) {
 		if(TimeUnit.MILLISECONDS == unit) {
 
 			return connection.invoke(connection.getAsyncDedicatedConnection())
-					.from(RedisSortedSetAsyncCommands::bzpopmax, preciseTimeout(timeout, unit), key)
+					.from(RedisSortedSetAsyncCommands::bzpopmax, TimeoutUtils.toDoubleSeconds(timeout, unit), key)
 					.get(it -> it.map(LettuceConverters::toTuple).getValueOrElse(null));
 		}
 
@@ -914,8 +915,4 @@ private static io.lettuce.core.ZAddArgs toZAddArgs(ZAddArgs source) {
 		}
 		return target;
 	}
-
-	static double preciseTimeout(long val, TimeUnit unit) {
-		return (double) unit.toMillis(val) / 1000.0D;
-	}
 }

src/main/java/org/springframework/data/redis/core/BoundListOperations.java

@@ -256,7 +256,6 @@ public interface BoundListOperations<K, V> extends BoundKeyOperations<K> {
 	/**
 	 * Removes and returns first {@code} elements in list stored at {@code key}.
 	 *
-	 * @param key must not be {@literal null}.
 	 * @param count
 	 * @return can be {@literal null}.
 	 * @see <a href="https://redis.io/commands/lpop">Redis Documentation: LPOP</a>
@@ -308,7 +307,6 @@ default V leftPop(Duration timeout) {
 	/**
 	 * Removes and returns last {@code} elements in list stored at {@code key}.
 	 *
-	 * @param key must not be {@literal null}.
 	 * @param count
 	 * @return can be {@literal null}.
 	 * @see <a href="https://redis.io/commands/rpop">Redis Documentation: RPOP</a>

src/main/java/org/springframework/data/redis/core/ListOperations.java

@@ -196,6 +196,7 @@ class MoveFrom<K> {
 		final Direction direction;
 
 		MoveFrom(K key, Direction direction) {
+
 			this.key = key;
 			this.direction = direction;
 		}
@@ -207,7 +208,6 @@ public static <K> MoveFrom<K> fromHead(K key) {
 		public static <K> MoveFrom<K> fromTail(K key) {
 			return new MoveFrom<>(key, Direction.last());
 		}
-
 	}
 
 	/**
@@ -223,6 +223,7 @@ class MoveTo<K> {
 		final Direction direction;
 
 		MoveTo(K key, Direction direction) {
+
 			this.key = key;
 			this.direction = direction;
 		}
@@ -234,7 +235,6 @@ public static <K> MoveTo<K> toHead(K key) {
 		public static <K> MoveTo<K> toTail(K key) {
 			return new MoveTo<>(key, Direction.last());
 		}
-
 	}
 
 	/**