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

DATAREDIS-260 - Upgrade to jedis 2.3.1.

Browse Source 
Jedis upgraded from commons-pool to commons-pool2. Required changes have been introduced. Currently there are both commons-pool and commons-pool2 in class-path which is no problem as those dependencies are optional.

Original pull request: #31
This commit is contained in:
Christoph Strobl
2014-02-06 09:58:45 +01:00
committed by Thomas Darimont
parent dea6403c24
commit 5466a70034
7 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java
View File

@@ -16,6 +16,14 @@
package org.springframework.data.redis.connection.jedis;
import static org.junit.Assert.*;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.BlockingDeque;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,23 +40,16 @@ import org.springframework.data.redis.connection.StringRedisConnection.StringTup
import org.springframework.test.annotation.IfProfileValue;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import redis.clients.jedis.JedisPoolConfig;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.BlockingDeque;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/**
* Integration test of {@link JedisConnection}
*
* @author Costin Leau
* @author Jennifer Hickey
* @author Thomas Darimont
* @author Christoph Strobl
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
@@ -95,13 +96,16 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati
@Test
public void testClosePool() {
JedisPoolConfig config = new JedisPoolConfig();
config.setMaxActive(1);
config.setMaxWait(1l);
config.setMaxTotal(1);
config.setMaxIdle(1);
JedisConnectionFactory factory2 = new JedisConnectionFactory(config);
factory2.setHostName(SettingsUtils.getHost());
factory2.setPort(SettingsUtils.getPort());
factory2.afterPropertiesSet();
RedisConnection conn2 = factory2.getConnection();
conn2.close();
factory2.getConnection();
@@ -290,13 +294,16 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati
@Test
public void testPoolNPE() {
JedisPoolConfig config = new JedisPoolConfig();
config.setMaxActive(1);
config.setMaxTotal(1);
JedisConnectionFactory factory2 = new JedisConnectionFactory(config);
factory2.setUsePool(true);
factory2.setHostName(SettingsUtils.getHost());
factory2.setPort(SettingsUtils.getPort());
factory2.afterPropertiesSet();
RedisConnection conn = factory2.getConnection();
try {
conn.get(null);

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

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2013 the original author or authors.
* Copyright 2011-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
*/
package org.springframework.data.redis.connection.jedis;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.List;
@@ -38,6 +38,7 @@ import redis.clients.jedis.JedisPoolConfig;
* Integration test of {@link JedisConnection} pipeline functionality
*
* @author Jennifer Hickey
* @author Christoph Strobl
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("JedisConnectionIntegrationTests-context.xml")
@@ -104,9 +105,10 @@ public class JedisConnectionPipelineIntegrationTests extends AbstractConnectionP
@Test
// DATAREDIS-213 - Verify connection returns to pool after select
public void testClosePoolPipelinedDbSelect() {
JedisPoolConfig config = new JedisPoolConfig();
config.setMaxActive(1);
config.setMaxWait(1l);
config.setMaxTotal(1);
config.setMaxIdle(1);
JedisConnectionFactory factory2 = new JedisConnectionFactory(config);
factory2.setHostName(SettingsUtils.getHost());
factory2.setPort(SettingsUtils.getPort());

3
src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java
View File

@@ -47,6 +47,7 @@ import org.springframework.oxm.xstream.XStreamMarshaller;
* @author Costin Leau
* @author Jennifer Hickey
* @author Thomas Darimont
* @author Christoph Strobl
*/
public class RedisMapTests extends AbstractRedisMapTests<Object, Object> {
@@ -94,7 +95,7 @@ public class RedisMapTests extends AbstractRedisMapTests<Object, Object> {
ObjectFactory<byte[]> rawFactory = new RawObjectFactory();
JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory();
jedisConnFactory.getPoolConfig().setMaxActive(defaultPoolConfig.maxActive);
jedisConnFactory.getPoolConfig().setMaxTotal(defaultPoolConfig.maxActive);
jedisConnFactory.setUsePool(true);
jedisConnFactory.setPort(SettingsUtils.getPort());
jedisConnFactory.setHostName(SettingsUtils.getHost());