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

DATAREDIS-930 - Polishing.

Browse Source 
Add since tags. Simplify test using Lombok annotations. Reformat code.

Original pull request: #385.
This commit is contained in:
Mark Paluch
2019-02-15 11:06:04 +01:00
parent 34951495ba
commit 2622f054ab
3 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java
View File

@@ -37,6 +37,8 @@ import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
import io.lettuce.core.codec.ByteArrayCodec;
import io.lettuce.core.codec.RedisCodec;
import io.lettuce.core.resource.ClientResources;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.security.NoSuchAlgorithmException;
import java.time.Duration;
@@ -47,6 +49,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentMatchers;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.data.redis.ConnectionFactoryTracker;
import org.springframework.data.redis.connection.RedisClusterConfiguration;
@@ -642,7 +645,8 @@ public class LettuceConnectionFactoryUnitTests {
RedisClusterClient clientMock = mock(RedisClusterClient.class);
StatefulRedisClusterConnection<byte[], byte[]> connectionMock = mock(StatefulRedisClusterConnection.class);
when(clientMock.connectAsync(ByteArrayCodec.INSTANCE)).thenReturn(CompletableFuture.completedFuture(connectionMock));
when(clientMock.connectAsync(ByteArrayCodec.INSTANCE))
.thenReturn(CompletableFuture.completedFuture(connectionMock));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(clusterConfig,
LettuceClientConfiguration.defaultConfiguration()) {
@@ -676,7 +680,7 @@ public class LettuceConnectionFactoryUnitTests {
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory() {
@Override
protected LettuceConnectionProvider doCreateConnectionProvider(AbstractRedisClient client,
RedisCodec<?, ?> codec) {
RedisCodec<?, ?> codec) {
return connectionProviderMock;
}
};
@@ -707,41 +711,15 @@ public class LettuceConnectionFactoryUnitTests {
assertThat(redisUri.getDatabase(), is(equalTo(1)));
}
private static class CustomRedisConfiguration implements RedisConfiguration, WithHostAndPort {
@Data
@AllArgsConstructor
static class CustomRedisConfiguration implements RedisConfiguration, WithHostAndPort {
private static final String DEFAULT_HOST = "localhost";
private static final int DEFAULT_PORT = 6379;
private String hostName;
private int port;
private String hostName = DEFAULT_HOST;
private int port = DEFAULT_PORT;
public CustomRedisConfiguration(String hostName) {
this(hostName, DEFAULT_PORT);
}
public CustomRedisConfiguration(String hostName, int port) {
this.hostName = hostName;
this.port = port;
}
@Override
public String getHostName() {
return hostName;
}
@Override
public void setHostName(String hostName) {
this.hostName = hostName;
}
@Override
public int getPort() {
return port;
}
@Override
public void setPort(int port) {
this.port = port;
CustomRedisConfiguration(String hostName) {
this(hostName, 6379);
}
}
}