Add static master-replica mode

Signed-off-by: 용현 <[email protected]>

Author: facewise

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

@@ -103,6 +103,7 @@ 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,8 +40,8 @@
 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.Lettuce.StaticMasterReplica;
 import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Pool;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.boot.ssl.SslOptions;
@@ -145,14 +145,19 @@ 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() {
-		StaticMasterReplica staticMasterReplica = getProperties().getLettuce().getStaticMasterReplica();
+		RedisProperties.Lettuce lettuce = getProperties().getLettuce();
 
-		if (!CollectionUtils.isEmpty(staticMasterReplica.getNodes())) {
-			List<Node> nodes = asNodes(staticMasterReplica.getNodes());
+		if (!CollectionUtils.isEmpty(lettuce.getNodes())) {
+			List<Node> nodes = asNodes(lettuce.getNodes());
 			RedisStaticMasterReplicaConfiguration configuration = new RedisStaticMasterReplicaConfiguration(
 					nodes.get(0).host(), nodes.get(0).port());
 			configuration.setUsername(getProperties().getUsername());

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

@@ -35,6 +35,7 @@
 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.
@@ -48,6 +49,7 @@
  * @author Andy Wilkinson
  * @author Phillip Webb
  * @author Yanming Zhou
+ * @author Yong-Hyun Kim
  */
 abstract class RedisConnectionConfiguration {
 
@@ -156,7 +158,7 @@ protected final RedisProperties getProperties() {
 
 	protected @Nullable SslBundle getSslBundle() {
 		return switch (this.mode) {
-			case STANDALONE -> (this.connectionDetails.getStandalone() != null)
+			case STANDALONE, STATIC_MASTER_REPLICA -> (this.connectionDetails.getStandalone() != null)
 					? this.connectionDetails.getStandalone().getSslBundle() : null;
 			case CLUSTER -> (this.connectionDetails.getCluster() != null)
 					? this.connectionDetails.getCluster().getSslBundle() : null;
@@ -197,12 +199,15 @@ 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
+		STANDALONE, CLUSTER, SENTINEL, STATIC_MASTER_REPLICA
 
 	}
 

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

@@ -483,7 +483,19 @@ public static class Lettuce {
 
 		private final Cluster cluster = new Cluster();
 
-		private final StaticMasterReplica staticMasterReplica = new StaticMasterReplica();
+		/**
+		 * 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;
+
+		public @Nullable List<String> getNodes() {
+			return this.nodes;
+		}
+
+		public void setNodes(@Nullable List<String> nodes) {
+			this.nodes = nodes;
+		}
 
 		public Duration getShutdownTimeout() {
 			return this.shutdownTimeout;
@@ -509,10 +521,6 @@ public Cluster getCluster() {
 			return this.cluster;
 		}
 
-		public StaticMasterReplica getStaticMasterReplica() {
-			return this.staticMasterReplica;
-		}
-
 		public static class Cluster {
 
 			private final Refresh refresh = new Refresh();
@@ -569,27 +577,6 @@ public void setAdaptive(boolean adaptive) {
 
 		}
 
-		/**
-		 * Lettuce static master-replica properties.
-		 */
-		public static class StaticMasterReplica {
-
-			/**
-			 * List of "host:port" pairs regardless of role as the actual roles are
-			 * determined by querying each node's ROLE command.
-			 */
-			private @Nullable List<String> nodes;
-
-			public @Nullable List<String> getNodes() {
-				return this.nodes;
-			}
-
-			public void setNodes(@Nullable List<String> nodes) {
-				this.nodes = nodes;
-			}
-
-		}
-
 	}
 
 }