Polish "Add support for static master-replica with Lettuce"

See spring-projectsgh-46957

Author: snicoll

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java

@@ -103,7 +103,6 @@ private JedisConnectionFactory createJedisConnectionFactory(
 				Assert.state(sentinelConfig != null, "'sentinelConfig' must not be null");
 				yield new JedisConnectionFactory(sentinelConfig, clientConfiguration);
 			}
-			case STATIC_MASTER_REPLICA -> throw new IllegalStateException("Static master replica is not supported for Jedis");
 		};
 	}
 

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceConnectionConfiguration.java

@@ -40,7 +40,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
 import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Node;
-import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Lettuce;
 import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Lettuce.Cluster.Refresh;
 import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Pool;
 import org.springframework.boot.ssl.SslBundle;
@@ -145,17 +144,11 @@ private LettuceConnectionFactory createConnectionFactory(
 				Assert.state(sentinelConfig != null, "'sentinelConfig' must not be null");
 				yield new LettuceConnectionFactory(sentinelConfig, clientConfiguration);
 			}
-			case STATIC_MASTER_REPLICA -> {
-				RedisStaticMasterReplicaConfiguration configuration = getStaticMasterReplicaConfiguration();
-				Assert.state(configuration != null, "'staticMasterReplicaConfiguration' must not be null");
-				yield new LettuceConnectionFactory(configuration, clientConfiguration);
-			}
 		};
 	}
 
 	private @Nullable RedisStaticMasterReplicaConfiguration getStaticMasterReplicaConfiguration() {
 		RedisProperties.Lettuce lettuce = getProperties().getLettuce();
-
 		if (!CollectionUtils.isEmpty(lettuce.getNodes())) {
 			List<Node> nodes = asNodes(lettuce.getNodes());
 			RedisStaticMasterReplicaConfiguration configuration = new RedisStaticMasterReplicaConfiguration(
@@ -169,7 +162,6 @@ private LettuceConnectionFactory createConnectionFactory(
 
 			return configuration;
 		}
-
 		return null;
 	}
 

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionConfiguration.java

@@ -35,7 +35,6 @@
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
 
 /**
  * Base Redis connection configuration.
@@ -158,7 +157,8 @@ protected final RedisProperties getProperties() {
 
 	protected @Nullable SslBundle getSslBundle() {
 		return switch (this.mode) {
-			case STANDALONE, STATIC_MASTER_REPLICA -> (this.connectionDetails.getStandalone() != null)
+			// FIXME: SSL bundle for static master replica
+			case STANDALONE -> (this.connectionDetails.getStandalone() != null)
 					? this.connectionDetails.getStandalone().getSslBundle() : null;
 			case CLUSTER -> (this.connectionDetails.getCluster() != null)
 					? this.connectionDetails.getCluster().getSslBundle() : null;
@@ -199,15 +199,12 @@ private Mode determineMode() {
 		if (getClusterConfiguration() != null) {
 			return Mode.CLUSTER;
 		}
-		if (!CollectionUtils.isEmpty(this.properties.getLettuce().getNodes())) {
-			return Mode.STATIC_MASTER_REPLICA;
-		}
 		return Mode.STANDALONE;
 	}
 
 	enum Mode {
 
-		STANDALONE, CLUSTER, SENTINEL, STATIC_MASTER_REPLICA
+		STANDALONE, CLUSTER, SENTINEL
 
 	}
 

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisProperties.java

@@ -484,8 +484,8 @@ public static class Lettuce {
 		private final Cluster cluster = new Cluster();
 
 		/**
-		 * List of static master-replica "host:port" pairs regardless of role
-		 * as the actual roles are determined by querying each node's ROLE command.
+		 * List of static master-replica "host:port" pairs regardless of role as the
+		 * actual roles are determined by querying each node's ROLE command.
 		 */
 		private @Nullable List<String> nodes;
 

module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationTests.java

@@ -506,10 +506,9 @@ void testRedisConfigurationWithClusterAndAuthentication() {
 	void testRedisConfigurationWithStaticMasterReplica() {
 		List<String> staticMasterReplicaNodes = Arrays.asList("127.0.0.1:28319", "127.0.0.1:28320", "[::1]:28321");
 		this.contextRunner
-			.withPropertyValues(
-					"spring.data.redis.lettuce.static-master-replica.nodes[0]:" + staticMasterReplicaNodes.get(0),
-					"spring.data.redis.lettuce.static-master-replica.nodes[1]:" + staticMasterReplicaNodes.get(1),
-					"spring.data.redis.lettuce.static-master-replica.nodes[2]:" + staticMasterReplicaNodes.get(2))
+			.withPropertyValues("spring.data.redis.lettuce.nodes[0]:" + staticMasterReplicaNodes.get(0),
+					"spring.data.redis.lettuce.nodes[1]:" + staticMasterReplicaNodes.get(1),
+					"spring.data.redis.lettuce.nodes[2]:" + staticMasterReplicaNodes.get(2))
 			.run((context) -> {
 				LettuceConnectionFactory connectionFactory = context.getBean(LettuceConnectionFactory.class);
 				assertThat(connectionFactory.getSentinelConfiguration()).isNull();