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

DATAREDIS-296 - Upgrade jedis to recent version.

Browse Source 
Upgrading to latest jedis version 2.5.1. Added new conversion for Long to byte[] in JedisConverters to be able to convert long cursorIds to byte[].

Original pull request: #77.
This commit is contained in:
Thomas Darimont
2014-05-28 15:08:22 +02:00
committed by Christoph Strobl
parent 29e70b8cd8
commit 1831ae9db7
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java
View File

@@ -24,6 +24,7 @@ import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.redis.SettingsUtils;
import org.springframework.data.redis.connection.AbstractConnectionPipelineIntegrationTests;
import org.springframework.data.redis.connection.DefaultStringRedisConnection;
@@ -39,6 +40,7 @@ import redis.clients.jedis.JedisPoolConfig;
*
* @author Jennifer Hickey
* @author Christoph Strobl
* @author Thomas Darimont
*/
@RunWith(RelaxedJUnit4ClassRunner.class)
@ContextConfiguration("JedisConnectionIntegrationTests-context.xml")
@@ -263,4 +265,12 @@ public class JedisConnectionPipelineIntegrationTests extends AbstractConnectionP
public void testListClientsContainsAtLeastOneElement() {
super.testListClientsContainsAtLeastOneElement();
}
/**
* @see DATAREDIS-296
*/
@Test(expected = InvalidDataAccessApiUsageException.class)
public void testExecWithoutMulti() {
super.testExecWithoutMulti();
}
}

4
src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java
View File

@@ -38,7 +38,6 @@ import org.junit.runners.Parameterized.Parameters;
import org.springframework.data.redis.ObjectFactory;
import org.springframework.data.redis.RedisTestProfileValueSource;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import org.springframework.data.redis.test.util.MinimumRedisVersionRule;
import org.springframework.test.annotation.IfProfileValue;
@@ -47,6 +46,7 @@ import org.springframework.test.annotation.IfProfileValue;
*
* @author Jennifer Hickey
* @author Christoph Strobl
* @author Thomas Darimont
*/
@RunWith(Parameterized.class)
public class DefaultSetOperationsTests<K, V> {
@@ -208,8 +208,6 @@ public class DefaultSetOperationsTests<K, V> {
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void testSSCanReadsValuesFully() {
// TODO: remove this when upgrading to jedis v.2.4.3 as this guard to avoids key serialization
assumeThat(redisTemplate.getKeySerializer(), instanceOf(StringRedisSerializer.class));
K key = keyFactory.instance();
V v1 = valueFactory.instance();
V v2 = valueFactory.instance();