DATAREDIS-1197 - Upgrade to Lettuce 6.0 RC1.

Adopt to API changes.

Original Pull Request: #554

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

@@ -22,12 +22,14 @@ import io.lettuce.core.EpollProvider;
 import io.lettuce.core.KqueueProvider;
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.reactive.BaseRedisReactiveCommands;
 import reactor.test.StepVerifier;
 
 import java.io.File;
 import java.time.Duration;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
@@ -230,11 +232,12 @@ public class LettuceConnectionFactoryTests {
 		assertThat(conn2.isClosed()).isTrue();
 		// Give some time for native connection to asynchronously close
 		Thread.sleep(100);
+		RedisFuture<String> future = ((RedisAsyncCommands<byte[], byte[]>) conn2.getNativeConnection()).ping();
 		try {
-			((RedisAsyncCommands<byte[], byte[]>) conn2.getNativeConnection()).ping();
+			future.get();
 			fail("The native connection should be closed");
-		} catch (RedisException e) {
-			// expected
+		} catch (ExecutionException e) {
+			// expected, Lettuce async failures are signalled on the Future
 		}
 	}
 

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

@@ -17,7 +17,6 @@ package org.springframework.data.redis.connection.lettuce;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.junit.Assume.*;
-import static org.springframework.data.redis.SpinBarrier.*;
 
 import io.lettuce.core.api.async.RedisAsyncCommands;
 

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

@@ -50,9 +50,7 @@ public class LettuceReactiveStreamCommandsTests extends LettuceReactiveCommandsT
 
 	@Before
 	public void before() {
-
-		// TODO: Upgrade to 5.0
-		assumeTrue(RedisTestProfileValueSource.atLeast("redisVersion", "4.9"));
+		assumeTrue(RedisTestProfileValueSource.atLeast("redisVersion", "5.0"));
 	}
 
 	@Test // DATAREDIS-864

src/test/java/org/springframework/data/redis/test/util/LettuceRedisClientProvider.java

@@ -15,10 +15,13 @@
  */
 package org.springframework.data.redis.test.util;
 
+import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.protocol.ProtocolVersion;
 
 import org.junit.rules.ExternalResource;
+
 import org.springframework.data.redis.SettingsUtils;
 import org.springframework.data.redis.connection.lettuce.LettuceTestClientResources;
 
@@ -44,6 +47,8 @@ public class LettuceRedisClientProvider extends ExternalResource {
 
 		client = RedisClient.create(LettuceTestClientResources.getSharedClientResources(),
 				RedisURI.builder().withHost(host).withPort(port).build());
+		client.setOptions(
+				ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
 	}
 
 	@Override

src/test/java/org/springframework/data/redis/test/util/LettuceRedisClusterClientProvider.java

@@ -15,12 +15,15 @@
  */
 package org.springframework.data.redis.test.util;
 
-import org.junit.rules.ExternalResource;
-import org.springframework.data.redis.connection.lettuce.LettuceTestClientResources;
-
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.ClusterClientOptions;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.protocol.ProtocolVersion;
+
+import org.junit.rules.ExternalResource;
+
+import org.springframework.data.redis.connection.lettuce.LettuceTestClientResources;
 
 /**
  * @author Christoph Strobl
@@ -44,6 +47,8 @@ public class LettuceRedisClusterClientProvider extends ExternalResource {
 
 		client = RedisClusterClient.create(LettuceTestClientResources.getSharedClientResources(),
 				RedisURI.builder().withHost(host).withPort(port).build());
+		client.setOptions(ClusterClientOptions.builder().protocolVersion(ProtocolVersion.RESP2)
+				.pingBeforeActivateConnection(false).build());
 	}
 
 	@Override