Introduce executeWithoutResult(…) method.

Original Pull Request: #2276

Author: mp911de

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

@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -552,20 +553,6 @@ protected <T> T postProcessResult(@Nullable T result, RedisConnection conn, bool
 	// Methods dealing with Redis Keys
 	// -------------------------------------------------------------------------
 
-	@Override
-	public void convertAndSend(String channel, Object message) {
-
-		Assert.hasText(channel, "a non-empty channel is required");
-
-		byte[] rawChannel = rawString(channel);
-		byte[] rawMessage = rawValue(message);
-
-		execute(connection -> {
-			connection.publish(rawChannel, rawMessage);
-			return null;
-		}, true);
-	}
-
 	@Override
 	public Boolean copy(K source, K target, boolean replace) {
 
@@ -801,7 +788,6 @@ private <T> T doWithKeys(Function<RedisKeyCommands, T> action) {
 		return execute((RedisCallback<? extends T>) connection -> action.apply(connection.keyCommands()), true);
 	}
 
-
 	// -------------------------------------------------------------------------
 	// Methods dealing with sorting
 	// -------------------------------------------------------------------------
@@ -875,48 +861,31 @@ public void watch(K key) {
 
 		byte[] rawKey = rawKey(key);
 
-		execute(connection -> {
-			connection.watch(rawKey);
-			return null;
-		}, true);
+		executeWithoutResult(connection -> connection.watch(rawKey));
 	}
 
 	@Override
 	public void watch(Collection<K> keys) {
 
 		byte[][] rawKeys = rawKeys(keys);
 
-		execute(connection -> {
-			connection.watch(rawKeys);
-			return null;
-		}, true);
+		executeWithoutResult(connection -> connection.watch(rawKeys));
 	}
 
 	@Override
 	public void unwatch() {
 
-		execute(connection -> {
-			connection.unwatch();
-			return null;
-		}, true);
+		executeWithoutResult(RedisTxCommands::unwatch);
 	}
 
-
 	@Override
 	public void multi() {
-		execute(connection -> {
-			connection.multi();
-			return null;
-		}, true);
+		executeWithoutResult(RedisTxCommands::multi);
 	}
 
 	@Override
 	public void discard() {
-
-		execute(connection -> {
-			connection.discard();
-			return null;
-		}, true);
+		executeWithoutResult(RedisTxCommands::discard);
 	}
 
 	/**
@@ -960,33 +929,20 @@ public List<RedisClientInfo> getClientList() {
 
 	@Override
 	public void killClient(String host, int port) {
-
-		execute((RedisCallback<Void>) connection -> {
-			connection.killClient(host, port);
-			return null;
-		});
+		executeWithoutResult(connection -> connection.killClient(host, port));
 	}
 
 	/*
 	 * @see org.springframework.data.redis.core.RedisOperations#replicaOf(java.lang.String, int)
 	 */
 	@Override
 	public void replicaOf(String host, int port) {
-
-		execute((RedisCallback<Void>) connection -> {
-
-			connection.replicaOf(host, port);
-			return null;
-		});
+		executeWithoutResult(connection -> connection.replicaOf(host, port));
 	}
 
 	@Override
 	public void replicaOfNoOne() {
-
-		execute((RedisCallback<Void>) connection -> {
-			connection.replicaOfNoOne();
-			return null;
-		});
+		executeWithoutResult(RedisServerCommands::replicaOfNoOne);
 	}
 
 	@Override
@@ -997,8 +953,13 @@ public void convertAndSend(String channel, Object message) {
 		byte[] rawChannel = rawString(channel);
 		byte[] rawMessage = rawValue(message);
 
-		execute(connection -> {
-			connection.publish(rawChannel, rawMessage);
+		executeWithoutResult(connection -> connection.publish(rawChannel, rawMessage));
+	}
+
+	private void executeWithoutResult(Consumer<RedisConnection> action) {
+		execute(it -> {
+
+			action.accept(it);
 			return null;
 		}, true);
 	}

src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionUnitTests.java

@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
@@ -46,7 +47,7 @@ class AbstractRedisCollectionUnitTests {
 	@SuppressWarnings("rawtypes")//
 	private RedisTemplate redisTemplateSpy;
 	private @Mock RedisConnectionFactory connectionFactoryMock;
-	private @Mock RedisConnection connectionMock;
+	private @Mock(answer = Answers.RETURNS_MOCKS) RedisConnection connectionMock;
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@BeforeEach