clean up - rename internal vars

Author: ggivo

src/main/java/io/lettuce/core/failover/health/PingStrategy.java

@@ -6,16 +6,16 @@
 
 public class PingStrategy implements HealthCheckStrategy {
 
-    private final DatabaseRawConnectionFactory connectionProvider;
+    private final DatabaseRawConnectionFactory connectionFactory;
 
     private final HealthCheckStrategy.Config config;
 
-    public PingStrategy(RedisURI redisURI, DatabaseRawConnectionFactory connectionProvider) {
-        this(redisURI, connectionProvider, HealthCheckStrategy.Config.create());
+    public PingStrategy(RedisURI redisURI, DatabaseRawConnectionFactory connectionFactory) {
+        this(redisURI, connectionFactory, HealthCheckStrategy.Config.create());
     }
 
-    public PingStrategy(RedisURI redisURI, DatabaseRawConnectionFactory connectionProvider, HealthCheckStrategy.Config config) {
-        this.connectionProvider = connectionProvider;
+    public PingStrategy(RedisURI redisURI, DatabaseRawConnectionFactory connectionFactory, HealthCheckStrategy.Config config) {
+        this.connectionFactory = connectionFactory;
         this.config = config;
     }
 
@@ -46,7 +46,7 @@ public int getDelayInBetweenProbes() {
 
     @Override
     public HealthStatus doHealthCheck(RedisURI endpoint) {
-        try (StatefulRedisConnection<?, ?> connection = connectionProvider.connectToDatabase(endpoint)) {
+        try (StatefulRedisConnection<?, ?> connection = connectionFactory.connectToDatabase(endpoint)) {
 
             if (connection == null) {
                 return HealthStatus.UNHEALTHY;

src/test/java/io/lettuce/core/failover/health/PingStrategyIntegrationTests.java

@@ -12,6 +12,8 @@
 import io.lettuce.core.failover.MultiDbTestSupport;
 import io.lettuce.core.failover.api.StatefulRedisMultiDbConnection;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 import io.lettuce.test.settings.TestSettings;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,7 +47,7 @@ public class PingStrategyIntegrationTests extends MultiDbTestSupport {
 
     private static RedisURI proxyUri2;
 
-    private static TestDatabaseRawConnectionFactoryImpl connectionProvider;
+    private static TestDatabaseRawConnectionFactoryImpl rawConnectionFactory;
 
     @Inject
     PingStrategyIntegrationTests(MultiDbClient client) {
@@ -105,12 +107,12 @@ void resetProxies() throws IOException {
 
     @BeforeAll
     static void setupDatabaseConnectionProvider() {
-        connectionProvider = new TestDatabaseRawConnectionFactoryImpl();
+        rawConnectionFactory = new TestDatabaseRawConnectionFactoryImpl();
     }
 
     @AfterAll
     static void cleanupDatabaseConnectionProvider() {
-        connectionProvider.close();
+        rawConnectionFactory.close();
     }
 
     @Test
@@ -150,7 +152,7 @@ void shouldRecoverAfterDisconnect() throws Exception {
         RedisURI uri = RedisURI.builder().withHost(TestSettings.host()).withPort(9479).withTimeout(Duration.ofMillis(1000))
                 .build();
 
-        PingStrategy strategy = new PingStrategy(uri, connectionProvider,
+        PingStrategy strategy = new PingStrategy(uri, rawConnectionFactory,
                 HealthCheckStrategy.Config.builder().interval(1000).timeout(500).numProbes(1).build());
 
         try {
@@ -184,7 +186,7 @@ void shouldHandleConnectionTimeout() throws Exception {
         RedisURI uri = RedisURI.builder().withHost(TestSettings.host()).withPort(9479).withTimeout(Duration.ofMillis(100))
                 .build();
 
-        PingStrategy strategy = new PingStrategy(uri, connectionProvider,
+        PingStrategy strategy = new PingStrategy(uri, rawConnectionFactory,
                 HealthCheckStrategy.Config.builder().interval(1000).timeout(500).numProbes(1).build());
 
         try {
@@ -217,7 +219,7 @@ void shouldHandleConnectionDrop() throws Exception {
         RedisURI uri = RedisURI.builder().withHost(TestSettings.host()).withPort(9479).withTimeout(Duration.ofMillis(2000))
                 .build();
 
-        PingStrategy strategy = new PingStrategy(uri, connectionProvider, HealthCheckStrategy.Config.create());
+        PingStrategy strategy = new PingStrategy(uri, rawConnectionFactory, HealthCheckStrategy.Config.create());
 
         try {
             // When: Initial health check
@@ -357,7 +359,7 @@ private static class TestDatabaseRawConnectionFactoryImpl implements DatabaseRaw
         private final RedisClient client;
 
         public TestDatabaseRawConnectionFactoryImpl() {
-            this.client = RedisClient.create();
+            this.client = RedisClient.create(TestClientResources.get());
         }
 
         @Override
@@ -366,7 +368,7 @@ public TestDatabaseRawConnectionFactoryImpl() {
         }
 
         public void close() {
-            client.shutdown();
+            FastShutdown.shutdown(client);
         }
 
     }