From 094e3790d127d582f6a8b8dbf485619a4818ad19 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 4 Mar 2019 16:23:26 +0100 Subject: [PATCH] DATAREDIS-939 - Polishing. Reformat code. Slightly tweak test. Original pull request: #388. --- .../connection/lettuce/LettuceConnectionFactory.java | 1 + .../lettuce/LettuceConnectionFactoryUnitTests.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java index b7563a74e..a4e47f56a 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java index ba428ed5b..79841ee69 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java @@ -15,10 +15,10 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.IsNull.*; import static org.hamcrest.core.Is.*; import static org.hamcrest.core.IsEqual.*; import static org.hamcrest.core.IsInstanceOf.*; +import static org.hamcrest.core.IsNull.*; import static org.junit.Assert.*; import static org.springframework.data.redis.connection.ClusterTestVariables.*; import static org.springframework.data.redis.connection.lettuce.LettuceTestClientResources.*; @@ -30,6 +30,7 @@ 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.RedisClusterConnection; @@ -41,7 +42,6 @@ import com.lambdaworks.redis.RedisClient; import com.lambdaworks.redis.RedisURI; import com.lambdaworks.redis.cluster.RedisClusterClient; - /** * @author Christoph Strobl * @author Mark Paluch @@ -297,9 +297,9 @@ public class LettuceConnectionFactoryUnitTests { } @Test // DATAREDIS-939 - public void timeoutShouldBePassedOnToSentinelConnection() { - RedisSentinelConfiguration sentinelConfiguration = new RedisSentinelConfiguration() - .master("test") + public void timeoutShouldBePassedOnToSentinelURI() { + + RedisSentinelConfiguration sentinelConfiguration = new RedisSentinelConfiguration().master("test") .sentinel("sentinel", 26379); LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(sentinelConfiguration); connectionFactory.setTimeout(5); @@ -310,7 +310,7 @@ public class LettuceConnectionFactoryUnitTests { assertThat(client, instanceOf(RedisClient.class)); RedisURI redisUri = (RedisURI) getField(client, "redisURI"); assertThat(redisUri, is(notNullValue())); - assertThat(redisUri.getTimeout(), is(equalTo(connectionFactory.getTimeout()))); + assertThat(redisUri.getTimeout(), is(equalTo(5L))); assertThat(redisUri.getUnit(), is(equalTo(TimeUnit.MILLISECONDS))); } }