Switch timeouts from int/long to double.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-redis</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.x-GH-2102-SNAPSHOT</version>
 
 	<name>Spring Data Redis</name>
 	<description>Spring Data module for Redis</description>

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

@@ -261,17 +261,17 @@ public void bgReWriteAof() {
 	}
 
 	@Override
-	public List<byte[]> bLPop(int timeout, byte[]... keys) {
+	public List<byte[]> bLPop(double timeout, byte[]... keys) {
 		return convertAndReturn(delegate.bLPop(timeout, keys), Converters.identityConverter());
 	}
 
 	@Override
-	public List<byte[]> bRPop(int timeout, byte[]... keys) {
+	public List<byte[]> bRPop(double timeout, byte[]... keys) {
 		return convertAndReturn(delegate.bRPop(timeout, keys), Converters.identityConverter());
 	}
 
 	@Override
-	public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) {
+	public byte[] bRPopLPush(double timeout, byte[] srcKey, byte[] dstKey) {
 		return convertAndReturn(delegate.bRPopLPush(timeout, srcKey, dstKey), Converters.identityConverter());
 	}
 
@@ -1421,17 +1421,17 @@ public Long append(String key, String value) {
 	}
 
 	@Override
-	public List<String> bLPop(int timeout, String... keys) {
+	public List<String> bLPop(double timeout, String... keys) {
 		return convertAndReturn(delegate.bLPop(timeout, serializeMulti(keys)), byteListToStringList);
 	}
 
 	@Override
-	public List<String> bRPop(int timeout, String... keys) {
+	public List<String> bRPop(double timeout, String... keys) {
 		return convertAndReturn(delegate.bRPop(timeout, serializeMulti(keys)), byteListToStringList);
 	}
 
 	@Override
-	public String bRPopLPush(int timeout, String srcKey, String dstKey) {
+	public String bRPopLPush(double timeout, String srcKey, String dstKey) {
 		return convertAndReturn(delegate.bRPopLPush(timeout, serialize(srcKey), serialize(dstKey)), bytesToString);
 	}
 
@@ -2009,12 +2009,12 @@ public Long zLexCount(byte[] key, org.springframework.data.domain.Range<byte[]>
 	}
 
 	@Override
-	public @Nullable Tuple bZPopMin(byte[] key, long timeout, TimeUnit unit) {
+	public @Nullable Tuple bZPopMin(byte[] key, double timeout, TimeUnit unit) {
 		return delegate.bZPopMin(key, timeout, unit);
 	}
 
 	@Override
-	public @Nullable StringTuple bZPopMin(String key, long timeout, TimeUnit unit) {
+	public @Nullable StringTuple bZPopMin(String key, double timeout, TimeUnit unit) {
 		return convertAndReturn(delegate.bZPopMin(serialize(key), timeout, unit), tupleConverter);
 	}
 
@@ -2039,12 +2039,12 @@ public Long zLexCount(byte[] key, org.springframework.data.domain.Range<byte[]>
 	}
 
 	@Override
-	public @Nullable Tuple bZPopMax(byte[] key, long timeout, TimeUnit unit) {
+	public @Nullable Tuple bZPopMax(byte[] key, double timeout, TimeUnit unit) {
 		return delegate.bZPopMax(key, timeout, unit);
 	}
 
 	@Override
-	public @Nullable StringTuple bZPopMax(String key, long timeout, TimeUnit unit) {
+	public @Nullable StringTuple bZPopMax(String key, double timeout, TimeUnit unit) {
 		return convertAndReturn(delegate.bZPopMax(serialize(key), timeout, unit), tupleConverter);
 	}
 

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

@@ -821,14 +821,14 @@ default List<byte[]> rPop(byte[] key, long count) {
 	/** @deprecated in favor of {@link RedisConnection#listCommands()}}. */
 	@Override
 	@Deprecated
-	default List<byte[]> bLPop(int timeout, byte[]... keys) {
+	default List<byte[]> bLPop(double timeout, byte[]... keys) {
 		return listCommands().bLPop(timeout, keys);
 	}
 
 	/** @deprecated in favor of {@link RedisConnection#listCommands()}}. */
 	@Override
 	@Deprecated
-	default List<byte[]> bRPop(int timeout, byte[]... keys) {
+	default List<byte[]> bRPop(double timeout, byte[]... keys) {
 		return listCommands().bRPop(timeout, keys);
 	}
 
@@ -842,7 +842,7 @@ default byte[] rPopLPush(byte[] srcKey, byte[] dstKey) {
 	/** @deprecated in favor of {@link RedisConnection#listCommands()}}. */
 	@Override
 	@Deprecated
-	default byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) {
+	default byte[] bRPopLPush(double timeout, byte[] srcKey, byte[] dstKey) {
 		return listCommands().bRPopLPush(timeout, srcKey, dstKey);
 	}
 
@@ -1028,7 +1028,7 @@ default Set<Tuple> zPopMin(byte[] key, long count) {
 	/** @deprecated in favor of {@link RedisConnection#zSetCommands()}}. */
 	@Override
 	@Deprecated
-	default Tuple bZPopMin(byte[] key, long timeout, TimeUnit unit) {
+	default Tuple bZPopMin(byte[] key, double timeout, TimeUnit unit) {
 		return zSetCommands().bZPopMin(key, timeout, unit);
 	}
 
@@ -1049,7 +1049,7 @@ default Set<Tuple> zPopMax(byte[] key, long count) {
 	/** @deprecated in favor of {@link RedisConnection#zSetCommands()}}. */
 	@Override
 	@Deprecated
-	default Tuple bZPopMax(byte[] key, long timeout, TimeUnit unit) {
+	default Tuple bZPopMax(byte[] key, double timeout, TimeUnit unit) {
 		return zSetCommands().bZPopMax(key, timeout, unit);
 	}
 

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

@@ -872,7 +872,7 @@ private HashExpireCommand(@Nullable ByteBuffer key, List<ByteBuffer> fields, Exp
 		 * @param unit the unit of measure for the {@code timeout}.
 		 * @return new instance of {@link HashExpireCommand}.
 		 */
-		public static HashExpireCommand expire(List<ByteBuffer> fields, long timeout, TimeUnit unit) {
+		public static HashExpireCommand expire(List<ByteBuffer> fields, double timeout, TimeUnit unit) {
 
 			Assert.notNull(fields, "Field must not be null");
 			return expire(fields, Expiration.from(timeout, unit));

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

@@ -1744,11 +1744,11 @@ class BZPopCommand extends KeyCommand {
 		private final PopDirection direction;
 
 		private final @Nullable TimeUnit timeUnit;
-		private final @Nullable Long timeout;
+		private final @Nullable Double timeout;
 
 		private final long count;
 
-		private BZPopCommand(@Nullable ByteBuffer key, @Nullable Long timeout, @Nullable TimeUnit timeUnit, long count,
+		private BZPopCommand(@Nullable ByteBuffer key, @Nullable Double timeout, @Nullable TimeUnit timeUnit, long count,
 				PopDirection direction) {
 
 			super(key);
@@ -1809,7 +1809,7 @@ public BZPopCommand blockingFor(Duration timeout) {
 
 			Assert.notNull(timeout, "Timeout must not be null");
 
-			return blockingFor(timeout.toMillis(), TimeUnit.MILLISECONDS);
+			return blockingFor((double)timeout.toMillis(), TimeUnit.MILLISECONDS);
 		}
 
 		/**
@@ -1819,7 +1819,7 @@ public BZPopCommand blockingFor(Duration timeout) {
 		 * @param timeUnit must not be {@literal null}.
 		 * @return a new {@link BZPopCommand} with {@link Duration timeout} applied.
 		 */
-		public BZPopCommand blockingFor(long timeout, TimeUnit timeUnit) {
+		public BZPopCommand blockingFor(Double timeout, TimeUnit timeUnit) {
 
 			Assert.notNull(timeUnit, "TimeUnit must not be null");
 
@@ -1833,7 +1833,7 @@ public PopDirection getDirection() {
 			return direction;
 		}
 
-		public @Nullable Long getTimeout() {
+		public @Nullable Double getTimeout() {
 			return timeout;
 		}
 

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

@@ -301,7 +301,7 @@ byte[] bLMove(byte @NonNull [] sourceKey, byte @NonNull [] destinationKey, @NonN
 	 * @see #lPop(byte[])
 	 */
 	@Nullable
-	List<byte @NonNull []> bLPop(int timeout, byte @NonNull [] @NonNull... keys);
+	List<byte @NonNull []> bLPop(double timeout, byte @NonNull [] @NonNull... keys);
 
 	/**
 	 * Removes and returns last element from lists stored at {@code keys}. <br>
@@ -314,7 +314,7 @@ byte[] bLMove(byte @NonNull [] sourceKey, byte @NonNull [] destinationKey, @NonN
 	 * @see <a href="https://redis.io/commands/brpop">Redis Documentation: BRPOP</a>
 	 * @see #rPop(byte[])
 	 */
-	List<byte @NonNull []> bRPop(int timeout, byte @NonNull [] @NonNull... keys);
+	List<byte @NonNull []> bRPop(double timeout, byte @NonNull [] @NonNull... keys);
 
 	/**
 	 * Remove the last element from list at {@code srcKey}, append it to {@code dstKey} and return its value.
@@ -337,5 +337,5 @@ byte[] bLMove(byte @NonNull [] sourceKey, byte @NonNull [] destinationKey, @NonN
 	 * @see <a href="https://redis.io/commands/brpoplpush">Redis Documentation: BRPOPLPUSH</a>
 	 * @see #rPopLPush(byte[], byte[])
 	 */
-	byte[] bRPopLPush(int timeout, byte @NonNull [] srcKey, byte @NonNull [] dstKey);
+	byte[] bRPopLPush(double timeout, byte @NonNull [] srcKey, byte @NonNull [] dstKey);
 }

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

@@ -298,6 +298,6 @@ default Long time() {
 	 * @see <a href="https://redis.io/commands/migrate">Redis Documentation: MIGRATE</a>
 	 */
 	void migrate(byte @NonNull [] key, @NonNull RedisNode target, int dbIndex, @Nullable MigrateOption option,
-			long timeout);
+		long timeout);
 
 }

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

@@ -854,7 +854,7 @@ default Long zCount(byte @NonNull [] key, double min, double max) {
 	 * @see <a href="https://redis.io/commands/bzpopmin">Redis Documentation: BZPOPMIN</a>
 	 * @since 2.6
 	 */
-	Tuple bZPopMin(byte @NonNull [] key, long timeout, @NonNull TimeUnit unit);
+	Tuple bZPopMin(byte @NonNull [] key, double timeout, @NonNull TimeUnit unit);
 
 	/**
 	 * Remove and return the value with its score having the highest score from sorted set at {@code key}.
@@ -888,7 +888,7 @@ default Long zCount(byte @NonNull [] key, double min, double max) {
 	 * @see <a href="https://redis.io/commands/bzpopmax">Redis Documentation: BZPOPMAX</a>
 	 * @since 2.6
 	 */
-	Tuple bZPopMax(byte @NonNull [] key, long timeout, @NonNull TimeUnit unit);
+	Tuple bZPopMax(byte @NonNull [] key, double timeout, @NonNull TimeUnit unit);
 
 	/**
 	 * Get the size of sorted set with {@code key}.

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

@@ -1013,9 +1013,9 @@ String bLMove(@NonNull String sourceKey, @NonNull String destinationKey, @NonNul
 	 * @param keys must not be {@literal null}.
 	 * @return
 	 * @see <a href="https://redis.io/commands/blpop">Redis Documentation: BLPOP</a>
-	 * @see RedisListCommands#bLPop(int, byte[]...)
+	 * @see RedisListCommands#bLPop(double, byte[]...)
 	 */
-	List<String> bLPop(int timeout, @NonNull String @NonNull... keys);
+	List<String> bLPop(double timeout, @NonNull String @NonNull... keys);
 
 	/**
 	 * Removes and returns last element from lists stored at {@code keys} (see: {@link #rPop(byte[])}). <br>
@@ -1025,9 +1025,9 @@ String bLMove(@NonNull String sourceKey, @NonNull String destinationKey, @NonNul
 	 * @param keys must not be {@literal null}.
 	 * @return
 	 * @see <a href="https://redis.io/commands/brpop">Redis Documentation: BRPOP</a>
-	 * @see RedisListCommands#bRPop(int, byte[]...)
+	 * @see RedisListCommands#bRPop(double, byte[]...)
 	 */
-	List<String> bRPop(int timeout, @NonNull String @NonNull... keys);
+	List<String> bRPop(double timeout, @NonNull String @NonNull... keys);
 
 	/**
 	 * Remove the last element from list at {@code srcKey}, append it to {@code dstKey} and return its value.
@@ -1050,9 +1050,9 @@ String bLMove(@NonNull String sourceKey, @NonNull String destinationKey, @NonNul
 	 * @param dstKey must not be {@literal null}.
 	 * @return
 	 * @see <a href="https://redis.io/commands/brpoplpush">Redis Documentation: BRPOPLPUSH</a>
-	 * @see RedisListCommands#bRPopLPush(int, byte[], byte[])
+	 * @see RedisListCommands#bRPopLPush(double, byte[], byte[])
 	 */
-	String bRPopLPush(int timeout, @NonNull String srcKey, @NonNull String dstKey);
+	String bRPopLPush(double timeout, @NonNull String srcKey, @NonNull String dstKey);
 
 	// -------------------------------------------------------------------------
 	// Methods dealing with Redis Sets
@@ -1616,7 +1616,7 @@ String bLMove(@NonNull String sourceKey, @NonNull String destinationKey, @NonNul
 	 * @see <a href="https://redis.io/commands/bzpopmin">Redis Documentation: BZPOPMIN</a>
 	 * @since 2.6
 	 */
-	StringTuple bZPopMin(@NonNull String key, long timeout, @NonNull TimeUnit unit);
+	StringTuple bZPopMin(@NonNull String key, double timeout, @NonNull TimeUnit unit);
 
 	/**
 	 * Remove and return the value with its score having the highest score from sorted set at {@code key}.
@@ -1650,7 +1650,7 @@ String bLMove(@NonNull String sourceKey, @NonNull String destinationKey, @NonNul
 	 * @see <a href="https://redis.io/commands/bzpopmax">Redis Documentation: BZPOPMAX</a>
 	 * @since 2.6
 	 */
-	StringTuple bZPopMax(@NonNull String key, long timeout, @NonNull TimeUnit unit);
+	StringTuple bZPopMax(@NonNull String key, double timeout, @NonNull TimeUnit unit);
 
 	/**
 	 * Get the size of sorted set with {@code key}.

src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterListCommands.java

@@ -294,43 +294,43 @@ public byte[] rPop(byte[] key) {
 	}
 
 	@Override
-	public List<byte @NonNull []> bLPop(int timeout, byte @NonNull [] @NonNull... keys) {
+	public List<byte @NonNull []> bLPop(double timeout, byte @NonNull [] @NonNull... keys) {
 
 		Assert.notNull(keys, "Key must not be null");
 		Assert.noNullElements(keys, "Keys must not contain null elements");
 
 		if (ClusterSlotHashUtil.isSameSlotForAllKeys(keys)) {
 			try {
-				return connection.getCluster().blpop(timeout, keys);
+				return JedisConverters.kvToList(connection.getCluster().blpop(timeout, keys));
 			} catch (Exception ex) {
 				throw convertJedisAccessException(ex);
 			}
 		}
 
 		return connection.getClusterCommandExecutor()
 				.executeMultiKeyCommand(
-						(JedisMultiKeyClusterCommandCallback<List<byte[]>>) (client, key) -> client.blpop(timeout, key),
+						(JedisMultiKeyClusterCommandCallback<List<byte[]>>) (client, key) -> JedisConverters.kvToList(client.blpop(timeout, key)),
 						Arrays.asList(keys))
 				.getFirstNonNullNotEmptyOrDefault(Collections.<byte[]> emptyList());
 	}
 
 	@Override
-	public List<byte @NonNull []> bRPop(int timeout, byte @NonNull [] @NonNull... keys) {
+	public List<byte @NonNull []> bRPop(double timeout, byte @NonNull [] @NonNull... keys) {
 
 		Assert.notNull(keys, "Key must not be null");
 		Assert.noNullElements(keys, "Keys must not contain null elements");
 
 		if (ClusterSlotHashUtil.isSameSlotForAllKeys(keys)) {
 			try {
-				return connection.getCluster().brpop(timeout, keys);
+				return JedisConverters.kvToList(connection.getCluster().brpop(timeout, keys));
 			} catch (Exception ex) {
 				throw convertJedisAccessException(ex);
 			}
 		}
 
 		return connection.getClusterCommandExecutor()
 				.executeMultiKeyCommand(
-						(JedisMultiKeyClusterCommandCallback<List<byte[]>>) (client, key) -> client.brpop(timeout, key),
+						(JedisMultiKeyClusterCommandCallback<List<byte[]>>) (client, key) -> JedisConverters.kvToList(client.brpop(timeout, key)),
 						Arrays.asList(keys))
 				.getFirstNonNullNotEmptyOrDefault(Collections.<byte[]> emptyList());
 	}
@@ -355,14 +355,14 @@ public byte[] rPopLPush(byte @NonNull [] srcKey, byte @NonNull [] dstKey) {
 	}
 
 	@Override
-	public byte[] bRPopLPush(int timeout, byte @NonNull [] srcKey, byte @NonNull [] dstKey) {
+	public byte[] bRPopLPush(double timeout, byte @NonNull [] srcKey, byte @NonNull [] dstKey) {
 
 		Assert.notNull(srcKey, "Source key must not be null");
 		Assert.notNull(dstKey, "Destination key must not be null");
 
 		if (ClusterSlotHashUtil.isSameSlotForAllKeys(srcKey, dstKey)) {
 			try {
-				return connection.getCluster().brpoplpush(srcKey, dstKey, timeout);
+				return connection.getCluster().brpoplpush(srcKey, dstKey, Double.valueOf(timeout).intValue());
 			} catch (Exception ex) {
 				throw convertJedisAccessException(ex);
 			}

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

@@ -349,13 +349,13 @@ public Set<Tuple> zPopMin(byte @NonNull [] key, long count) {
 	}
 
 	@Override
-	public Tuple bZPopMin(byte @NonNull [] key, long timeout, @NonNull TimeUnit unit) {
+	public Tuple bZPopMin(byte @NonNull [] key, double timeout, @NonNull TimeUnit unit) {
 
 		Assert.notNull(key, "Key must not be null");
 		Assert.notNull(unit, "TimeUnit must not be null");
 
 		try {
-			return toTuple(connection.getCluster().bzpopmin(JedisConverters.toSeconds(timeout, unit), key));
+			return toTuple(connection.getCluster().bzpopmin(timeout, key));
 		} catch (Exception ex) {
 			throw convertJedisAccessException(ex);
 		}
@@ -387,13 +387,13 @@ public Set<Tuple> zPopMax(byte @NonNull [] key, long count) {
 	}
 
 	@Override
-	public Tuple bZPopMax(byte @NonNull [] key, long timeout, @NonNull TimeUnit unit) {
+	public Tuple bZPopMax(byte @NonNull [] key, double timeout, @NonNull TimeUnit unit) {
 
 		Assert.notNull(key, "Key must not be null");
 		Assert.notNull(unit, "TimeUnit must not be null");
 
 		try {
-			return toTuple(connection.getCluster().bzpopmax(JedisConverters.toSeconds(timeout, unit), key));
+			return toTuple(connection.getCluster().bzpopmax(timeout, key));
 		} catch (Exception ex) {
 			throw convertJedisAccessException(ex);
 		}