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

DATAREDIS-545 - Polishing.

Browse Source 
Format source and use dedicated getClient() method to obtain the clusterClient.

Original Pull Request: #297
This commit is contained in:
Christoph Strobl
2018-03-16 11:20:20 +01:00
parent 155f45c376
commit c156c82cf0
4 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
View File

@@ -119,7 +119,7 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
Assert.isTrue(connectionProvider instanceof ClusterConnectionProvider,
"LettuceConnectionProvider must be a ClusterConnectionProvider.");
this.clusterClient = ((ClusterConnectionProvider) connectionProvider).getRedisClient();
this.clusterClient = getClient();
this.topologyProvider = new LettuceClusterTopologyProvider(this.clusterClient);
this.clusterCommandExecutor = new ClusterCommandExecutor(this.topologyProvider,
new LettuceClusterNodeResourceProvider(getConnectionProvider()), exceptionConverter);
@@ -156,7 +156,7 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
Assert.isTrue(connectionProvider instanceof ClusterConnectionProvider,
"LettuceConnectionProvider must be a ClusterConnectionProvider.");
this.clusterClient = ((ClusterConnectionProvider) connectionProvider).getRedisClient();
this.clusterClient = getClient();
this.topologyProvider = new LettuceClusterTopologyProvider(this.clusterClient);
this.clusterCommandExecutor = executor;
this.disposeClusterCommandExecutorOnClose = false;
@@ -210,7 +210,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
return clusterClient.getPartitions();
}
/*
* (non-Javadoc)
* @see org.springframework.data.redis.connection.lettuce.LettuceConnection#geoCommands()

3
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
View File

@@ -255,8 +255,7 @@ public class LettuceConnection extends AbstractRedisConnection {
* @since 2.1
*/
LettuceConnection(@Nullable StatefulConnection<byte[], byte[]> sharedConnection,
LettuceConnectionProvider connectionProvider,
long timeout, int defaultDbIndex) {
LettuceConnectionProvider connectionProvider, long timeout, int defaultDbIndex) {
Assert.notNull(connectionProvider, "LettuceConnectionProvider must not be null.");

5
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java
View File

@@ -112,9 +112,8 @@ public class LettuceClusterConnectionUnitTests {
when(clusterMock.getPartitions()).thenReturn(partitions);
ClusterCommandExecutor executor = new ClusterCommandExecutor(
new LettuceClusterTopologyProvider(clusterMock), resourceProvider,
LettuceClusterConnection.exceptionConverter);
ClusterCommandExecutor executor = new ClusterCommandExecutor(new LettuceClusterTopologyProvider(clusterMock),
resourceProvider, LettuceClusterConnection.exceptionConverter);
connection = new LettuceClusterConnection(clusterMock, executor) {

36
src/test/java/org/springframework/data/redis/core/RedisClusterTemplateTests.java
View File

@@ -161,8 +161,8 @@ public class RedisClusterTemplateTests<K, V> extends RedisTemplateTests<K, V> {
Jackson2JsonRedisSerializer<Person> jackson2JsonSerializer = new Jackson2JsonRedisSerializer<>(Person.class);
// JEDIS
JedisConnectionFactory jedisConnectionFactory = new JedisConnectionFactory(new RedisClusterConfiguration(
CLUSTER_NODES));
JedisConnectionFactory jedisConnectionFactory = new JedisConnectionFactory(
new RedisClusterConfiguration(CLUSTER_NODES));
jedisConnectionFactory.afterPropertiesSet();
@@ -198,8 +198,8 @@ public class RedisClusterTemplateTests<K, V> extends RedisTemplateTests<K, V> {
// LETTUCE
LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(new RedisClusterConfiguration(
CLUSTER_NODES));
LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(
new RedisClusterConfiguration(CLUSTER_NODES));
lettuceConnectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
lettuceConnectionFactory.afterPropertiesSet();
@@ -247,23 +247,23 @@ public class RedisClusterTemplateTests<K, V> extends RedisTemplateTests<K, V> {
return Arrays.asList(new Object[][] { //
// JEDIS
{ jedisStringTemplate, stringFactory, stringFactory }, //
{ jedisLongTemplate, stringFactory, longFactory }, //
{ jedisRawTemplate, rawFactory, rawFactory }, //
{ jedisPersonTemplate, stringFactory, personFactory }, //
{ jedisXstreamStringTemplate, stringFactory, stringFactory }, //
{ jedisJackson2JsonPersonTemplate, stringFactory, personFactory }, //
// JEDIS
{ jedisStringTemplate, stringFactory, stringFactory }, //
{ jedisLongTemplate, stringFactory, longFactory }, //
{ jedisRawTemplate, rawFactory, rawFactory }, //
{ jedisPersonTemplate, stringFactory, personFactory }, //
{ jedisXstreamStringTemplate, stringFactory, stringFactory }, //
{ jedisJackson2JsonPersonTemplate, stringFactory, personFactory }, //
// LETTUCE
{ lettuceStringTemplate, stringFactory, stringFactory }, //
{ lettuceLongTemplate, stringFactory, longFactory }, //
{ lettuceRawTemplate, rawFactory, rawFactory }, //
{ lettucePersonTemplate, stringFactory, personFactory }, //
{ lettuceXstreamStringTemplate, stringFactory, stringFactory }, //
// LETTUCE
{ lettuceStringTemplate, stringFactory, stringFactory }, //
{ lettuceLongTemplate, stringFactory, longFactory }, //
{ lettuceRawTemplate, rawFactory, rawFactory }, //
{ lettucePersonTemplate, stringFactory, personFactory }, //
{ lettuceXstreamStringTemplate, stringFactory, stringFactory }, //
{ lettuceJackson2JsonPersonTemplate, stringFactory, personFactory }, //
{ pooledLettuceStringTemplate, stringFactory, stringFactory } //
});
});
}
}