Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-1096 - Polishing.

Browse Source 
Remove unused imports and transition to java.time API.

Original Pull Request: #510
This commit is contained in:
Christoph Strobl
2020-02-12 07:58:55 +01:00
parent 871c6713dd
commit bbb4e10a85
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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;