Correctly return connection future from StaticMasterReplicaConnectionProvider.

We now pass on the connection future when connecting through StaticMasterReplicaConnectionProvider.getConnectionAsync(…).

Closes #2296

Author: mp911de

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

@@ -98,10 +98,10 @@ class StaticMasterReplicaConnectionProvider implements LettuceConnectionProvider
 			CompletableFuture<? extends StatefulRedisMasterReplicaConnection<?, ?>> connection = MasterReplica
 					.connectAsync(client, codec, nodes);
 
-			connection.thenApply(it -> {
+			return connection.thenApply(it -> {
 
 				readFrom.ifPresent(readFrom -> it.setReadFrom(readFrom));
-				return connectionType.cast(connection);
+				return connectionType.cast(it);
 			});
 		}
 

src/test/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProviderIntegrationTest.java

@@ -0,0 +1,78 @@
+/*
+ * 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.lettuce;
+
+import static org.assertj.core.api.Assertions.*;
+
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.masterreplica.StatefulRedisMasterReplicaConnection;
+
+import java.util.Collections;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.data.redis.SettingsUtils;
+import org.springframework.data.redis.test.extension.LettuceExtension;
+
+/**
+ * Integration test for {@link StaticMasterReplicaConnectionProvider}.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class StaticMasterReplicaConnectionProviderIntegrationTest {
+
+	RedisURI uri = RedisURI.create(SettingsUtils.getHost(), SettingsUtils.getPort());
+
+	@Test
+	void shouldConnectToMasterReplicaSynchronously(RedisClient redisClient) {
+
+		StaticMasterReplicaConnectionProvider connectionProvider = new StaticMasterReplicaConnectionProvider(redisClient,
+				ByteArrayCodec.INSTANCE, Collections.singletonList(uri), ReadFrom.REPLICA);
+
+		StatefulRedisMasterReplicaConnection<?, ?> connection = connectionProvider
+				.getConnection(StatefulRedisMasterReplicaConnection.class);
+
+		assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.REPLICA);
+
+		connectionProvider.release(connection);
+	}
+
+	@Test
+	@SuppressWarnings("rawtypes")
+	void shouldConnectToMasterReplicaAsync(RedisClient redisClient)
+			throws ExecutionException, InterruptedException, TimeoutException {
+
+		StaticMasterReplicaConnectionProvider connectionProvider = new StaticMasterReplicaConnectionProvider(redisClient,
+				ByteArrayCodec.INSTANCE, Collections.singletonList(uri), ReadFrom.REPLICA);
+
+		CompletionStage<StatefulRedisMasterReplicaConnection> future = connectionProvider
+				.getConnectionAsync(StatefulRedisMasterReplicaConnection.class);
+
+		StatefulRedisMasterReplicaConnection<?, ?> connection = future.toCompletableFuture().get(5, TimeUnit.SECONDS);
+		assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.REPLICA);
+
+		connectionProvider.release(connection);
+	}
+}