Refine defaulted connection arrangement.

DefaultedRedis…Connection is now deprecated to help with migration towards segregated/commands interface usage. The connection now exposes a commands() object providing access to RedisCommands so that a composite commands object can be accessed independently from the connection.

Redis…Commands provider represent entry points to obtain segregated command interfaces.

See: #2273
Original Pull Request: #2276

Author: mp911de

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

@@ -31,7 +31,7 @@
  * @author Mark Paluch
  * @since 1.4
  */
-public abstract class AbstractRedisConnection implements DefaultedRedisConnection {
+public abstract class AbstractRedisConnection implements RedisConnection {
 
 	private @Nullable RedisSentinelConfiguration sentinelConfiguration;
 	private final Map<RedisNode, RedisSentinelConnection> connectionCache = new ConcurrentHashMap<>();

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

@@ -80,6 +80,7 @@
  * @author ihaohong
  * @author Dennis Neufeld
  */
+@SuppressWarnings({ "ConstantConditions", "deprecation" })
 public class DefaultStringRedisConnection implements StringRedisConnection, DecoratedRedisConnection {
 
 	private static final byte[][] EMPTY_2D_BYTE_ARRAY = new byte[0][];
@@ -184,6 +185,66 @@ public DefaultStringRedisConnection(RedisConnection connection, RedisSerializer<
 		this.byteGeoResultsToStringGeoResults = Converters.deserializingGeoResultsConverter(serializer);
 	}
 
+	@Override
+	public RedisCommands commands() {
+		return this;
+	}
+
+	@Override
+	public RedisGeoCommands geoCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisHashCommands hashCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisHyperLogLogCommands hyperLogLogCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisKeyCommands keyCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisListCommands listCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisSetCommands setCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisScriptingCommands scriptingCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisServerCommands serverCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisStreamCommands streamCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisStringCommands stringCommands() {
+		return this;
+	}
+
+	@Override
+	public RedisZSetCommands zSetCommands() {
+		return this;
+	}
+
 	@Override
 	public Long append(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.append(key, value), Converters.identityConverter());
@@ -1011,6 +1072,13 @@ public Set<StringTuple> zInterWithScores(Aggregate aggregate, Weights weights, S
 		return convertAndReturn(delegate.zInterWithScores(aggregate, weights, serializeMulti(sets)), tupleToStringTuple);
 	}
 
+	@Nullable
+	@Override
+	public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) {
+		return convertAndReturn(delegate.zInterStore(destKey, aggregate, Weights.of(weights), sets),
+				Converters.identityConverter());
+	}
+
 	@Override
 	public Long zInterStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 		return convertAndReturn(delegate.zInterStore(destKey, aggregate, weights, sets), Converters.identityConverter());
@@ -1211,6 +1279,13 @@ public Long zUnionStore(byte[] destKey, Aggregate aggregate, Weights weights, by
 		return convertAndReturn(delegate.zUnionStore(destKey, aggregate, weights, sets), Converters.identityConverter());
 	}
 
+	@Nullable
+	@Override
+	public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) {
+		return convertAndReturn(delegate.zUnionStore(destKey, aggregate, Weights.of(weights), sets),
+				Converters.identityConverter());
+	}
+
 	public Long zUnionStore(byte[] destKey, byte[]... sets) {
 		return convertAndReturn(delegate.zUnionStore(destKey, sets), Converters.identityConverter());
 	}
@@ -1303,7 +1378,6 @@ private GeoReference<byte[]> serialize(GeoReference<String> data) {
 				: (GeoReference) data;
 	}
 
-	@SuppressWarnings("unchecked")
 	private StreamOffset<byte[]>[] serialize(StreamOffset<String>[] offsets) {
 
 		return Arrays.stream(offsets).map(it -> StreamOffset.create(serialize(it.getKey()), it.getOffset()))

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

@@ -15,22 +15,21 @@
  */
 package org.springframework.data.redis.connection;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.data.redis.core.types.RedisClientInfo;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Dennis Neufeld
  * @since 2.0
  */
-public interface DefaultedRedisClusterConnection extends RedisClusterConnection, DefaultedRedisConnection {
+@Deprecated
+public interface DefaultedRedisClusterConnection
+		extends DefaultedRedisConnection, RedisClusterCommands, RedisClusterServerCommands, RedisClusterCommandsProvider {
 
 	/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
 	@Override
@@ -165,24 +164,4 @@ default List<RedisClientInfo> getClientList(RedisClusterNode node) {
 		return serverCommands().getClientList(node);
 	}
 
-	@Nullable
-	@Override
-	@SuppressWarnings("unchecked")
-	default <T> T execute(String command, byte[] key, Collection<byte[]> args) {
-
-		Assert.notNull(command, "Command must not be null!");
-		Assert.notNull(key, "Key must not be null!");
-		Assert.notNull(args, "Args must not be null!");
-
-		byte[][] commandArgs = new byte[args.size() + 1][];
-
-		commandArgs[0] = key;
-		int targetIndex = 1;
-
-		for (byte[] binaryArgument : args) {
-			commandArgs[targetIndex++] = binaryArgument;
-		}
-
-		return (T) execute(command, commandArgs);
-	}
 }

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

@@ -65,7 +65,8 @@
  * @author Dennis Neufeld
  * @since 2.0
  */
-public interface DefaultedRedisConnection extends RedisConnection {
+@Deprecated
+public interface DefaultedRedisConnection extends RedisCommands, RedisCommandsProvider {
 
 	// KEY COMMANDS
 

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.redis.connection;
+
+/**
+ * Provides access to {@link RedisClusterCommands} and the segregated command interfaces.
+ *
+ * @author Mark Paluch
+ * @since 3.0
+ */
+public interface RedisClusterCommandsProvider extends RedisCommandsProvider {
+
+	/**
+	 * Get {@link RedisGeoCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisClusterCommands clusterCommands();
+
+	/**
+	 * Get {@link RedisServerCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisClusterServerCommands serverCommands();
+
+}

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

@@ -21,6 +21,7 @@
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 
 /**
  * {@link RedisClusterConnection} allows sending commands to dedicated nodes within the cluster. A
@@ -32,7 +33,8 @@
  * @author Mark Paluch
  * @since 1.7
  */
-public interface RedisClusterConnection extends RedisConnection, RedisClusterCommands, RedisClusterServerCommands {
+public interface RedisClusterConnection
+		extends RedisConnection, DefaultedRedisClusterConnection, RedisClusterCommandsProvider {
 
 	/**
 	 * @param node must not be {@literal null}.
@@ -89,15 +91,22 @@ public interface RedisClusterConnection extends RedisConnection, RedisClusterCom
 	 * @since 2.1
 	 */
 	@Nullable
-	<T> T execute(String command, byte[] key, Collection<byte[]> args);
+	default <T> T execute(String command, byte[] key, Collection<byte[]> args) {
 
-	/**
-	 * Get {@link RedisClusterServerCommands}.
-	 *
-	 * @return never {@literal null}.
-	 * @since 2.0
-	 */
-	default RedisClusterServerCommands serverCommands() {
-		return this;
+		Assert.notNull(command, "Command must not be null!");
+		Assert.notNull(key, "Key must not be null!");
+		Assert.notNull(args, "Args must not be null!");
+
+		byte[][] commandArgs = new byte[args.size() + 1][];
+
+		commandArgs[0] = key;
+		int targetIndex = 1;
+
+		for (byte[] binaryArgument : args) {
+			commandArgs[targetIndex++] = binaryArgument;
+		}
+
+		return (T) execute(command, commandArgs);
 	}
+
 }

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

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.redis.connection;
+
+/**
+ * Provides access to {@link RedisCommands} and the segregated command interfaces.
+ *
+ * @author Mark Paluch
+ * @since 3.0
+ */
+public interface RedisCommandsProvider {
+
+	/**
+	 * Get {@link RedisCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.0
+	 */
+	RedisCommands commands();
+
+	/**
+	 * Get {@link RedisGeoCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisGeoCommands geoCommands();
+
+	/**
+	 * Get {@link RedisHashCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisHashCommands hashCommands();
+
+	/**
+	 * Get {@link RedisHyperLogLogCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisHyperLogLogCommands hyperLogLogCommands();
+
+	/**
+	 * Get {@link RedisKeyCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisKeyCommands keyCommands();
+
+	/**
+	 * Get {@link RedisListCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisListCommands listCommands();
+
+	/**
+	 * Get {@link RedisSetCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisSetCommands setCommands();
+
+	/**
+	 * Get {@link RedisScriptingCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisScriptingCommands scriptingCommands();
+
+	/**
+	 * Get {@link RedisServerCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisServerCommands serverCommands();
+
+	/**
+	 * Get {@link RedisStreamCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.2
+	 */
+	RedisStreamCommands streamCommands();
+
+	/**
+	 * Get {@link RedisStringCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisStringCommands stringCommands();
+
+	/**
+	 * Get {@link RedisZSetCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 2.0
+	 */
+	RedisZSetCommands zSetCommands();
+}