Refactor Lettuce connection handling in integration tests.

Reuse condition objects in command and version condition extensions.

Shut down ClientResources via ShutdownQueue and ensure shared client resources usage.

Add close support to our MethodArgumentsProvider. Reuse LettuceTestClientConfiguration for test client config settings.

Closes #2575

Author: mp911de

src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java

@@ -43,7 +43,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Range.Bound;
@@ -119,7 +118,7 @@ public JedisClusterConnectionTests(JedisCluster nativeConnection) {
 	}
 
 	@BeforeEach
-	void tearDown() throws IOException {
+	void beforeEach() throws IOException {
 
 		for (ConnectionPool pool : nativeConnection.getClusterNodes().values()) {
 			try (Jedis jedis = new Jedis(pool.getResource())) {

src/test/java/org/springframework/data/redis/connection/jedis/extension/JedisConnectionFactoryExtension.java

@@ -16,6 +16,7 @@
 package org.springframework.data.redis.connection.jedis.extension;
 
 import java.io.Closeable;
+import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.HashMap;
 import java.util.Map;
@@ -25,7 +26,6 @@
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
-
 import org.springframework.data.redis.ConnectionFactoryTracker;
 import org.springframework.data.redis.SettingsUtils;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
@@ -64,7 +64,7 @@ public class JedisConnectionFactoryExtension implements ParameterResolver {
 				CLIENT_CONFIGURATION);
 
 		factory.afterPropertiesSet();
-		ShutdownQueue.register(factory.toCloseable());
+		ShutdownQueue.register(factory);
 
 		return factory;
 	});
@@ -75,7 +75,7 @@ public class JedisConnectionFactoryExtension implements ParameterResolver {
 				CLIENT_CONFIGURATION);
 
 		factory.afterPropertiesSet();
-		ShutdownQueue.register(factory.toCloseable());
+		ShutdownQueue.register(factory);
 
 		return factory;
 	});
@@ -86,7 +86,7 @@ public class JedisConnectionFactoryExtension implements ParameterResolver {
 				CLIENT_CONFIGURATION);
 
 		factory.afterPropertiesSet();
-		ShutdownQueue.register(factory.toCloseable());
+		ShutdownQueue.register(factory);
 
 		return factory;
 	});
@@ -171,7 +171,7 @@ public T getNew() {
 	}
 
 	static class ManagedJedisConnectionFactory extends JedisConnectionFactory
-			implements ConnectionFactoryTracker.Managed {
+			implements ConnectionFactoryTracker.Managed, Closeable {
 
 		private volatile boolean mayClose;
 
@@ -219,15 +219,14 @@ public String toString() {
 			return builder.toString();
 		}
 
-		Closeable toCloseable() {
-			return () -> {
-				try {
-					mayClose = true;
-					destroy();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			};
+		@Override
+		public void close() throws IOException {
+			try {
+				mayClose = true;
+				destroy();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 		}
 	}
 }

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

@@ -24,7 +24,6 @@
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 import org.springframework.data.redis.connection.RedisSentinelConnection;
@@ -88,8 +87,7 @@ void shouldConnectSentinelWithAuthentication() throws IOException {
 
 		// Note: As per https://github.com/redis/redis/issues/7708, Sentinel does not support ACL authentication yet.
 
-		LettuceClientConfiguration configuration = LettuceClientConfiguration.builder()
-				.clientResources(LettuceTestClientResources.getSharedClientResources())
+		LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder()
 				.clientOptions(ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).build()).build();
 
 		RedisSentinelConfiguration sentinelConfiguration = new RedisSentinelConfiguration("mymaster",

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

@@ -41,7 +41,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Range.Bound;
@@ -144,6 +143,7 @@ private static LettuceConnectionFactory createConnectionFactory() {
 		LettucePoolingClientConfiguration clientConfiguration = LettucePoolingClientConfiguration.builder() //
 				.clientResources(LettuceTestClientResources.getSharedClientResources()) //
 				.shutdownTimeout(Duration.ZERO) //
+				.shutdownQuietPeriod(Duration.ZERO) //
 				.build();
 
 		RedisClusterConfiguration clusterConfiguration = new RedisClusterConfiguration();

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

@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.data.redis.ConnectionFactoryTracker;
 import org.springframework.data.redis.RedisConnectionFailureException;
 import org.springframework.data.redis.RedisSystemException;
@@ -238,7 +237,6 @@ void testResetConnection() {
 				.getNativeConnection();
 		factory.resetConnection();
 		assertThat(factory.getConnection().getNativeConnection()).isNotSameAs(nativeConn);
-		nativeConn.getStatefulConnection().close();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -352,7 +350,8 @@ void factoryCreatesPooledConnections() {
 		GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
 
 		LettuceClientConfiguration configuration = LettucePoolingClientConfiguration.builder().poolConfig(poolConfig)
-				.clientResources(LettuceTestClientResources.getSharedClientResources()).shutdownTimeout(Duration.ZERO).build();
+				.clientResources(LettuceTestClientResources.getSharedClientResources()).shutdownTimeout(Duration.ZERO)
+				.shutdownQuietPeriod(Duration.ZERO).build();
 
 		LettuceConnectionFactory factory = new LettuceConnectionFactory(new RedisStandaloneConfiguration(), configuration);
 		factory.setShareNativeConnection(false);
@@ -431,8 +430,8 @@ void pubSubDoesNotSupportMasterReplicaConnections() {
 		RedisStaticMasterReplicaConfiguration elastiCache = new RedisStaticMasterReplicaConfiguration(
 				SettingsUtils.getHost()).node(SettingsUtils.getHost(), SettingsUtils.getPort() + 1);
 
-		LettuceConnectionFactory factory = new LettuceConnectionFactory(elastiCache);
-		factory.setClientResources(LettuceTestClientResources.getSharedClientResources());
+		LettuceConnectionFactory factory = new LettuceConnectionFactory(elastiCache,
+				LettuceTestClientConfiguration.defaultConfiguration());
 		factory.afterPropertiesSet();
 
 		RedisConnection connection = factory.getConnection();
@@ -502,8 +501,8 @@ void factoryUsesMasterReplicaConnections() {
 	@Test // DATAREDIS-576
 	void connectionAppliesClientName() {
 
-		LettuceClientConfiguration configuration = LettuceClientConfiguration.builder()
-				.clientResources(LettuceTestClientResources.getSharedClientResources()).clientName("clientName").build();
+		LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().clientName("clientName")
+				.build();
 
 		LettuceConnectionFactory factory = new LettuceConnectionFactory(new RedisStandaloneConfiguration(), configuration);
 		factory.setShareNativeConnection(false);
@@ -536,8 +535,7 @@ void getClientNameShouldEqualWithFactorySetting() {
 	@Test // GH-2186
 	void shouldInitializeMasterReplicaConnectionsEagerly() {
 
-		LettuceClientConfiguration configuration = LettuceClientConfiguration.builder()
-				.clientResources(LettuceTestClientResources.getSharedClientResources()).build();
+		LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().build();
 
 		RedisStaticMasterReplicaConfiguration elastiCache = new RedisStaticMasterReplicaConfiguration(
 				SettingsUtils.getHost()).node(SettingsUtils.getHost(), SettingsUtils.getPort() + 1);
@@ -557,8 +555,7 @@ void shouldInitializeMasterReplicaConnectionsEagerly() {
 	@EnabledOnRedisClusterAvailable
 	void shouldInitializeClusterConnectionsEagerly() {
 
-		LettuceClientConfiguration configuration = LettuceClientConfiguration.builder()
-				.clientResources(LettuceTestClientResources.getSharedClientResources()).build();
+		LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().build();
 
 		LettuceConnectionFactory factory = new LettuceConnectionFactory(SettingsUtils.clusterConfiguration(),
 				configuration);