Skip to content

Commit ad9517c

Browse files
committed
IGNITE-28444: Upgrade Jedis to 7.2.1 in clients tests
1 parent 7ca39e3 commit ad9517c

3 files changed

Lines changed: 16 additions & 6 deletions

File tree

modules/clients/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>redis.clients</groupId>
5252
<artifactId>jedis</artifactId>
53-
<version>2.9.0</version>
53+
<version>7.2.1</version>
5454
<scope>test</scope>
5555
</dependency>
5656

modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
import org.apache.ignite.configuration.ConnectorConfiguration;
2323
import org.apache.ignite.configuration.IgniteConfiguration;
2424
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
25+
import redis.clients.jedis.ClientSetInfoConfig;
26+
import redis.clients.jedis.DefaultJedisClientConfig;
27+
import redis.clients.jedis.HostAndPort;
2528
import redis.clients.jedis.JedisPool;
2629
import redis.clients.jedis.JedisPoolConfig;
2730

@@ -59,7 +62,13 @@ public class RedisCommonAbstractTest extends GridCommonAbstractTest {
5962
jedisPoolCfg.setTestWhileIdle(true);
6063
jedisPoolCfg.setTimeBetweenEvictionRunsMillis(30000);
6164

62-
pool = new JedisPool(jedisPoolCfg, HOST, PORT, 10000);
65+
DefaultJedisClientConfig clientCfg = DefaultJedisClientConfig.builder()
66+
.connectionTimeoutMillis(10000)
67+
.socketTimeoutMillis(10000)
68+
.clientSetInfoConfig(ClientSetInfoConfig.DISABLED)
69+
.build();
70+
71+
pool = new JedisPool(jedisPoolCfg, new HostAndPort(HOST, PORT), clientCfg);
6372
}
6473

6574
/** {@inheritDoc} */

modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.junit.Test;
2727
import redis.clients.jedis.Jedis;
2828
import redis.clients.jedis.exceptions.JedisDataException;
29+
import redis.clients.jedis.params.SetParams;
2930

3031
/**
3132
* Tests for String commands of Redis protocol.
@@ -188,14 +189,14 @@ public void testSet() throws Exception {
188189
Assert.assertEquals("b0", jcache().get("setKey2"));
189190

190191
// test options.
191-
jedis.set("setKey1", "2", "nx");
192-
jedis.set("setKey3", "3", "nx", "px", EXPIRE_MS);
192+
jedis.set("setKey1", "2", SetParams.setParams().nx());
193+
jedis.set("setKey3", "3", SetParams.setParams().nx().px(EXPIRE_MS));
193194

194195
Assert.assertEquals("1", jcache().get("setKey1"));
195196
Assert.assertEquals("3", jcache().get("setKey3"));
196197

197-
jedis.set("setKey1", "2", "xx", "ex", EXPIRE_SEC);
198-
jedis.set("setKey4", "4", "xx");
198+
jedis.set("setKey1", "2", SetParams.setParams().xx().ex(EXPIRE_SEC));
199+
jedis.set("setKey4", "4", SetParams.setParams().xx());
199200

200201
Assert.assertEquals("2", jcache().get("setKey1"));
201202
Assert.assertNull(jcache().get("setKey4"));

0 commit comments

Comments
 (0)