Skip to content

Commit bbb4e10

Browse files
DATAREDIS-1096 - Polishing.
Remove unused imports and transition to java.time API. Original Pull Request: spring-projects#510
1 parent 871c671 commit bbb4e10

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.lettuce.core.resource.ClientResources;
2323

2424
import java.time.Duration;
25-
import java.util.concurrent.TimeUnit;
2625

2726
import org.apache.commons.pool2.BasePooledObjectFactory;
2827
import org.apache.commons.pool2.PooledObject;
@@ -55,7 +54,7 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
5554
private String hostName = "localhost";
5655
private int port = 6379;
5756
private @Nullable String password;
58-
private long timeout = TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS);
57+
private long timeout = Duration.ofMinutes(1).toMillis();
5958
private @Nullable RedisSentinelConfiguration sentinelConfiguration;
6059
private @Nullable ClientResources clientResources;
6160

@@ -120,7 +119,7 @@ public void afterPropertiesSet() {
120119
this.client = RedisClient.create(getRedisURI());
121120
}
122121

123-
client.setDefaultTimeout(timeout, TimeUnit.MILLISECONDS);
122+
client.setDefaultTimeout(Duration.ofMillis(timeout));
124123
this.internalPool = new GenericObjectPool<>(new LettuceFactory(client, dbIndex), poolConfig);
125124
}
126125

src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import io.lettuce.core.codec.StringCodec;
2525
import io.lettuce.core.masterreplica.MasterReplica;
2626
import io.lettuce.core.masterreplica.StatefulRedisMasterReplicaConnection;
27-
import io.lettuce.core.masterslave.MasterSlave;
28-
import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
2927
import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
3028
import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
3129

0 commit comments

Comments
 (0)