DATAREDIS-524 - Use password to connect Redis nodes using Sentinel.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-redis</artifactId>
-	<version>1.8.0.BUILD-SNAPSHOT</version>
+	<version>1.8.0.DATAREDIS-524-SNAPSHOT</version>
 
 	<name>Spring Data Redis</name>
 

src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java

@@ -26,6 +26,7 @@
 import org.springframework.data.redis.connection.PoolException;
 import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.lambdaworks.redis.RedisAsyncConnection;
 import com.lambdaworks.redis.RedisClient;
@@ -120,7 +121,13 @@ public void afterPropertiesSet() {
 	private RedisURI getRedisURI() {
 
 		if (isRedisSentinelAware()) {
-			return LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
+			RedisURI redisURI = LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
+
+			if (StringUtils.hasText(password)) {
+				redisURI.setPassword(password);
+			}
+
+			return redisURI;
 		}
 
 		return createSimpleHostRedisURI();

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java

@@ -607,7 +607,14 @@ private AbstractRedisClient createRedisClient() {
 	}
 
 	private RedisURI getSentinelRedisURI() {
-		return LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
+
+		RedisURI redisURI = LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
+
+		if (StringUtils.hasText(password)) {
+			redisURI.setPassword(password);
+		}
+
+		return redisURI;
 	}
 
 	/**

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

@@ -15,8 +15,11 @@
  */
 package org.springframework.data.redis.connection.lettuce;
 
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.springframework.test.util.ReflectionTestUtils.*;
 
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
@@ -26,9 +29,11 @@
 import org.springframework.data.redis.SettingsUtils;
 import org.springframework.data.redis.connection.PoolConfig;
 import org.springframework.data.redis.connection.PoolException;
+import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 
 import com.lambdaworks.redis.RedisAsyncConnection;
 import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.RedisURI;
 
 /**
  * Unit test of {@link DefaultLettucePool}
@@ -189,6 +194,22 @@ public void testCreateInvalidPassword() {
 		pool.getResource();
 	}
 
+	/**
+	 * @see DATAREDIS-524
+	 */
+	@Test
+	public void testCreateSentinelWithPassword() {
+
+		pool = new DefaultLettucePool(new RedisSentinelConfiguration("mymaster", Collections.singleton("host:1234")));
+		pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
+		pool.setPassword("foo");
+		pool.afterPropertiesSet();
+
+		RedisURI redisURI = (RedisURI) getField(pool.getClient(), "redisURI");
+
+		assertThat(redisURI.getPassword(), is(equalTo(pool.getPassword().toCharArray())));
+	}
+
 	/**
 	 * @see DATAREDIS-462
 	 */

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

@@ -21,13 +21,15 @@
 import static org.junit.Assert.*;
 import static org.springframework.test.util.ReflectionTestUtils.*;
 
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.redis.ConnectionFactoryTracker;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
+import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 
 import com.lambdaworks.redis.AbstractRedisClient;
 import com.lambdaworks.redis.RedisClient;
@@ -114,6 +116,28 @@ public void passwordShouldBeSetCorrectlyOnClusterClient() {
 		}
 	}
 
+	/**
+	 * @see DATAREDIS-524
+	 */
+	@Test
+	@SuppressWarnings("unchecked")
+	public void passwordShouldBeSetCorrectlyOnSentinelClient() {
+
+		LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(
+				new RedisSentinelConfiguration("mymaster", Collections.singleton("host:1234")));
+		connectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
+		connectionFactory.setPassword("o_O");
+		connectionFactory.afterPropertiesSet();
+		ConnectionFactoryTracker.add(connectionFactory);
+
+		AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
+		assertThat(client, instanceOf(RedisClient.class));
+
+		RedisURI redisURI = (RedisURI) getField(client, "redisURI");
+
+		assertThat(redisURI.getPassword(), is(equalTo(connectionFactory.getPassword().toCharArray())));
+	}
+
 	/**
 	 * @see DATAREDIS-462
 	 */