DATAREDIS-545 - Polishing.

Format source and use dedicated getClient() method to obtain the clusterClient. Original Pull Request: spring-projects#297
SystemOutPrint · Mar 16, 2018 · c156c82 · c156c82
1 parent 155f45c
commit c156c82
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 27 deletions.
diff --git a/...main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java b/...main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
@@ -119,7 +119,7 @@ public LettuceClusterConnection(LettuceConnectionProvider connectionProvider) {
 		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 LettuceClusterConnection(LettuceConnectionProvider connectionProvider, Cl
 		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 @@ private Partitions getPartitions() {
 		return clusterClient.getPartitions();
 	}
 
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#geoCommands()

diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
@@ -255,8 +255,7 @@ public LettuceConnection(@Nullable StatefulRedisConnection<byte[], byte[]> share
 	 * @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.");
 

diff --git a/.../org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java b/.../org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java
@@ -112,9 +112,8 @@ public void setUp() {
 
 		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) {
 

diff --git a/src/test/java/org/springframework/data/redis/core/RedisClusterTemplateTests.java b/src/test/java/org/springframework/data/redis/core/RedisClusterTemplateTests.java
@@ -161,8 +161,8 @@ public static Collection<Object[]> testParams() {
 		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 static Collection<Object[]> testParams() {
 
 		// 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 static Collection<Object[]> testParams() {
 
 		return Arrays.asList(new Object[][] { //
 
-						// 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 }, //
+				// 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 }, //
 				{ lettuceJackson2JsonPersonTemplate, stringFactory, personFactory }, //
 				{ pooledLettuceStringTemplate, stringFactory, stringFactory } //
-				});
+		});
 	}
 
 }