From bbb4e10a851d5647d87bd08ffb1295bec0fe3d0d Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 12 Feb 2020 07:58:55 +0100 Subject: [PATCH] DATAREDIS-1096 - Polishing. Remove unused imports and transition to java.time API. Original Pull Request: #510 --- .../data/redis/connection/lettuce/DefaultLettucePool.java | 5 ++--- .../connection/lettuce/StandaloneConnectionProvider.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java index e6f641e99..a42e6c7be 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java @@ -22,7 +22,6 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.resource.ClientResources; import java.time.Duration; -import java.util.concurrent.TimeUnit; import org.apache.commons.pool2.BasePooledObjectFactory; import org.apache.commons.pool2.PooledObject; @@ -55,7 +54,7 @@ public class DefaultLettucePool implements LettucePool, InitializingBean { private String hostName = "localhost"; private int port = 6379; private @Nullable String password; - private long timeout = TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS); + private long timeout = Duration.ofMinutes(1).toMillis(); private @Nullable RedisSentinelConfiguration sentinelConfiguration; private @Nullable ClientResources clientResources; @@ -120,7 +119,7 @@ public class DefaultLettucePool implements LettucePool, InitializingBean { this.client = RedisClient.create(getRedisURI()); } - client.setDefaultTimeout(timeout, TimeUnit.MILLISECONDS); + client.setDefaultTimeout(Duration.ofMillis(timeout)); this.internalPool = new GenericObjectPool<>(new LettuceFactory(client, dbIndex), poolConfig); } diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java index e6127c912..34add5ae7 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java @@ -24,8 +24,6 @@ import io.lettuce.core.codec.RedisCodec; import io.lettuce.core.codec.StringCodec; import io.lettuce.core.masterreplica.MasterReplica; import io.lettuce.core.masterreplica.StatefulRedisMasterReplicaConnection; -import io.lettuce.core.masterslave.MasterSlave; -import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection; import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;