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

DATAREDIS-749 - Upgrade to Jedis 3.0.0 M1.

Browse Source 
Upgrade dependency version to 3.0.0 M1. Adapt to API changes.

Original pull request: #374.
This commit is contained in:
Guy Korland
2018-11-29 06:00:53 +02:00
committed by Mark Paluch
parent 3a07a0d8ed
commit f4680a180c
25 changed files with 85 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java
View File

@@ -270,7 +270,7 @@ public class JedisConnectionUnitTestSuite {
public void doesNotSelectDbWhenCurrentDbDoesNotMatchDesiredOne() {
Jedis jedisSpy = spy(new MockedClientJedis("http://localhost:1234", getNativeRedisConnectionMock()));
when(jedisSpy.getDB()).thenReturn(3L);
when(jedisSpy.getDB()).thenReturn(3);
new JedisConnection(jedisSpy);

21
src/test/java/org/springframework/data/redis/connection/jedis/JedisConvertersUnitTests.java
View File

@@ -20,6 +20,8 @@ import static org.hamcrest.core.IsEqual.*;
import static org.hamcrest.core.IsNull.*;
import static org.junit.Assert.*;
import redis.clients.jedis.params.SetParams;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
@@ -48,7 +50,8 @@ public class JedisConvertersUnitTests {
@Test // DATAREDIS-268
public void convertingNullToListOfRedisClientInfoShouldReturnEmptyList() {
assertThat(JedisConverters.toListOfRedisClientInformation(null), equalTo(Collections.<RedisClientInfo> emptyList()));
assertThat(JedisConverters.toListOfRedisClientInformation(null),
equalTo(Collections.<RedisClientInfo> emptyList()));
}
@Test // DATAREDIS-268
@@ -168,8 +171,7 @@ public class JedisConvertersUnitTests {
@Test // DATAREDIS-352
public void boundaryToBytesForZRangeByShouldReturnValueCorrectlyWhenBoundaryIsIncluing() {
assertThat(
JedisConverters.boundaryToBytesForZRange(Range.range().gte(JedisConverters.toBytes("a")).getMin(), null),
assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gte(JedisConverters.toBytes("a")).getMin(), null),
is(JedisConverters.toBytes("a")));
}
@@ -201,34 +203,35 @@ public class JedisConvertersUnitTests {
@Test // DATAREDIS-316
public void toSetCommandExPxOptionShouldReturnEXforSeconds() {
assertThat(JedisConverters.toSetCommandExPxArgument(Expiration.seconds(100)), equalTo(JedisConverters.toBytes("EX")));
assertThat(JedisConverters.toSetCommandExPxArgument(Expiration.seconds(100)),
equalTo(JedisConverters.toBytes("EX")));
}
@Test // DATAREDIS-316
public void toSetCommandExPxOptionShouldReturnEXforMilliseconds() {
assertThat(JedisConverters.toSetCommandExPxArgument(Expiration.milliseconds(100)),
equalTo(JedisConverters.toBytes("PX")));
equalTo(SetParams.setParams().px(100)));
}
@Test // DATAREDIS-316
public void toSetCommandExPxOptionShouldReturnEmptyArrayForNull() {
assertThat(JedisConverters.toSetCommandExPxArgument(null), equalTo(new byte[] {}));
assertThat(JedisConverters.toSetCommandExPxArgument(null), equalTo(SetParams.setParams()));
}
@Test // DATAREDIS-316
public void toSetCommandNxXxOptionShouldReturnNXforAbsent() {
assertThat(JedisConverters.toSetCommandNxXxArgument(SetOption.ifAbsent()), equalTo(JedisConverters.toBytes("NX")));
assertThat(JedisConverters.toSetCommandNxXxArgument(SetOption.ifAbsent()), equalTo(SetParams.setParams().nx()));
}
@Test // DATAREDIS-316
public void toSetCommandNxXxOptionShouldReturnXXforAbsent() {
assertThat(JedisConverters.toSetCommandNxXxArgument(SetOption.ifPresent()), equalTo(JedisConverters.toBytes("XX")));
assertThat(JedisConverters.toSetCommandNxXxArgument(SetOption.ifPresent()), equalTo(SetParams.setParams().xx()));
}
@Test // DATAREDIS-316
public void toSetCommandNxXxOptionShouldReturnEmptyArrayforUpsert() {
assertThat(JedisConverters.toSetCommandNxXxArgument(SetOption.upsert()), equalTo(new byte[] {}));
assertThat(JedisConverters.toSetCommandNxXxArgument(SetOption.upsert()), equalTo(SetParams.setParams()));
}
private void verifyRedisServerInfo(RedisServer server, Map<String, String> values) {

4
src/test/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverterUnitTests.java
View File

@@ -27,7 +27,7 @@ import org.springframework.data.redis.TooManyClusterRedirectionsException;
import redis.clients.jedis.HostAndPort;
import redis.clients.jedis.exceptions.JedisAskDataException;
import redis.clients.jedis.exceptions.JedisClusterMaxRedirectionsException;
import redis.clients.jedis.exceptions.JedisClusterMaxAttemptsException;
import redis.clients.jedis.exceptions.JedisMovedDataException;
/**
@@ -70,7 +70,7 @@ public class JedisExceptionConverterUnitTests {
public void shouldConvertMaxRedirectException() {
DataAccessException converted = converter
.convert(new JedisClusterMaxRedirectionsException("Too many redirections?"));
.convert(new JedisClusterMaxAttemptsException("Too many redirections?"));
assertThat(converted, instanceOf(TooManyClusterRedirectionsException.class));
}