Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-762 - Polishing.

Browse Source 
Introduce marker interface RedisConfiguration along with several others providing access to specific setup scenarios like cluster and sentinel.

Original Pull Request: #306
This commit is contained in:
Christoph Strobl
2018-03-19 10:46:29 +01:00
parent bb990b14ae
commit 4a064c5ad0
12 changed files with 582 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/org/springframework/data/redis/connection/RedisElastiCacheConfigurationUnitTests.java
View File

@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
/**
* Unit tests for {@link RedisElastiCacheConfiguration}.
* Unit tests for {@link RedisStaticMasterSlaveConfiguration}.
*
* @author Mark Paluch
*/
@@ -29,7 +29,7 @@ public class RedisElastiCacheConfigurationUnitTests {
@Test // DATAREDIS-762
public void shouldCreateSingleHostConfiguration() {
RedisElastiCacheConfiguration singleHost = new RedisElastiCacheConfiguration("localhost");
RedisStaticMasterSlaveConfiguration singleHost = new RedisStaticMasterSlaveConfiguration("localhost");
assertThat(singleHost.getNodes()).hasSize(1);
@@ -42,7 +42,7 @@ public class RedisElastiCacheConfigurationUnitTests {
@Test // DATAREDIS-762
public void shouldCreateMultiHostConfiguration() {
RedisElastiCacheConfiguration multiHost = new RedisElastiCacheConfiguration("localhost");
RedisStaticMasterSlaveConfiguration multiHost = new RedisStaticMasterSlaveConfiguration("localhost");
multiHost.node("other-host", 6479);
assertThat(multiHost.getNodes()).hasSize(2);
@@ -61,7 +61,7 @@ public class RedisElastiCacheConfigurationUnitTests {
@Test // DATAREDIS-762
public void shouldApplyPasswordToNodes() {
RedisElastiCacheConfiguration multiHost = new RedisElastiCacheConfiguration("localhost").node("other-host", 6479);
RedisStaticMasterSlaveConfiguration multiHost = new RedisStaticMasterSlaveConfiguration("localhost").node("other-host", 6479);
multiHost.setPassword(RedisPassword.of("foobar"));
multiHost.node("third", 1234);
@@ -73,7 +73,7 @@ public class RedisElastiCacheConfigurationUnitTests {
@Test // DATAREDIS-762
public void shouldApplyDatabaseToNodes() {
RedisElastiCacheConfiguration multiHost = new RedisElastiCacheConfiguration("localhost").node("other-host", 6479);
RedisStaticMasterSlaveConfiguration multiHost = new RedisStaticMasterSlaveConfiguration("localhost").node("other-host", 6479);
multiHost.setDatabase(4);
multiHost.node("third", 1234);

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

@@ -41,7 +41,7 @@ import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.SettingsUtils;
import org.springframework.data.redis.connection.DefaultStringRedisConnection;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisElastiCacheConfiguration;
import org.springframework.data.redis.connection.RedisStaticMasterSlaveConfiguration;
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
import org.springframework.data.redis.connection.StringRedisConnection;
@@ -394,7 +394,7 @@ public class LettuceConnectionFactoryTests {
LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.SLAVE)
.build();
RedisElastiCacheConfiguration elastiCache = new RedisElastiCacheConfiguration(SettingsUtils.getHost())
RedisStaticMasterSlaveConfiguration elastiCache = new RedisStaticMasterSlaveConfiguration(SettingsUtils.getHost())
.node(SettingsUtils.getHost(), SettingsUtils.getPort() + 1);
LettuceConnectionFactory factory = new LettuceConnectionFactory(elastiCache,
@@ -422,7 +422,7 @@ public class LettuceConnectionFactoryTests {
LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.MASTER)
.build();
RedisElastiCacheConfiguration elastiCache = new RedisElastiCacheConfiguration(SettingsUtils.getHost(),
RedisStaticMasterSlaveConfiguration elastiCache = new RedisStaticMasterSlaveConfiguration(SettingsUtils.getHost(),
SettingsUtils.getPort() + 1);
LettuceConnectionFactory factory = new LettuceConnectionFactory(elastiCache, configuration);