Use OBJECT, PTTL, and RESTORE JedisCluster methods directly.

We now use directly JedisCluster methods instead of using our command executor routing as JedisCluster exposes the methods and we no longer require our own command routing.

Closes spring-projects#2589

Author: mp911de

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

@@ -16,6 +16,7 @@
 package org.springframework.data.redis.connection.jedis;
 
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.params.RestoreParams;
 import redis.clients.jedis.params.ScanParams;
 import redis.clients.jedis.resps.ScanResult;
 
@@ -366,33 +367,35 @@ public Long pTtl(byte[] key) {
 
 		Assert.notNull(key, "Key must not be null");
 
-		return connection.getClusterCommandExecutor()
-				.executeCommandOnSingleNode((JedisClusterCommandCallback<Long>) client -> client.pttl(key),
-						connection.clusterGetNodeForKey(key))
-				.getValue();
+		try {
+			return connection.getCluster().pttl(key);
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 	}
 
 	@Override
 	public Long pTtl(byte[] key, TimeUnit timeUnit) {
 
 		Assert.notNull(key, "Key must not be null");
 
-		return connection.getClusterCommandExecutor()
-				.executeCommandOnSingleNode(
-						(JedisClusterCommandCallback<Long>) client -> Converters.millisecondsToTimeUnit(client.pttl(key), timeUnit),
-						connection.clusterGetNodeForKey(key))
-				.getValue();
+		try {
+			return Converters.millisecondsToTimeUnit(connection.getCluster().pttl(key), timeUnit);
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 	}
 
 	@Override
 	public byte[] dump(byte[] key) {
 
 		Assert.notNull(key, "Key must not be null");
 
-		return connection.getClusterCommandExecutor()
-				.executeCommandOnSingleNode((JedisClusterCommandCallback<byte[]>) client -> client.dump(key),
-						connection.clusterGetNodeForKey(key))
-				.getValue();
+		try {
+			return connection.getCluster().dump(key);
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 	}
 
 	@Override
@@ -401,16 +404,16 @@ public void restore(byte[] key, long ttlInMillis, byte[] serializedValue, boolea
 		Assert.notNull(key, "Key must not be null");
 		Assert.notNull(serializedValue, "Serialized value must not be null");
 
-		connection.getClusterCommandExecutor().executeCommandOnSingleNode((JedisClusterCommandCallback<String>) client -> {
-
-			if (!replace) {
-				return client.restore(key, ttlInMillis, serializedValue);
-			}
-
-			return JedisConverters.toString(this.connection.execute("RESTORE", key,
-					Arrays.asList(JedisConverters.toBytes(ttlInMillis), serializedValue, JedisConverters.toBytes("REPLACE"))));
+		RestoreParams restoreParams = RestoreParams.restoreParams();
 
-		}, connection.clusterGetNodeForKey(key));
+		if (replace) {
+			restoreParams = restoreParams.replace();
+		}
+		try {
+			connection.getCluster().restore(key, ttlInMillis, serializedValue, restoreParams);
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 	}
 
 	@Override
@@ -471,10 +474,11 @@ public ValueEncoding encodingOf(byte[] key) {
 
 		Assert.notNull(key, "Key must not be null");
 
-		return connection.getClusterCommandExecutor()
-				.executeCommandOnSingleNode((JedisClusterCommandCallback<byte[]>) client -> client.objectEncoding(key),
-						connection.clusterGetNodeForKey(key))
-				.mapValue(JedisConverters::toEncoding);
+		try {
+			return JedisConverters.toEncoding(connection.getCluster().objectEncoding(key));
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 	}
 
 	@Nullable
@@ -483,10 +487,11 @@ public Duration idletime(byte[] key) {
 
 		Assert.notNull(key, "Key must not be null");
 
-		return connection.getClusterCommandExecutor()
-				.executeCommandOnSingleNode((JedisClusterCommandCallback<Long>) client -> client.objectIdletime(key),
-						connection.clusterGetNodeForKey(key))
-				.mapValue(Converters::secondsToDuration);
+		try {
+			return Converters.secondsToDuration(connection.getCluster().objectIdletime(key));
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 	}
 
 	@Nullable
@@ -495,10 +500,11 @@ public Long refcount(byte[] key) {
 
 		Assert.notNull(key, "Key must not be null");
 
-		return connection.getClusterCommandExecutor()
-				.executeCommandOnSingleNode((JedisClusterCommandCallback<Long>) client -> client.objectRefcount(key),
-						connection.clusterGetNodeForKey(key))
-				.getValue();
+		try {
+			return connection.getCluster().objectRefcount(key);
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 
 	}