DATAREDIS-545 - Polishing.

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

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) {

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 } //
});
});
}
}