diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 851c763fd3228..bff5c9b8d86f9 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -50,7 +50,7 @@ redis.clients jedis - 2.9.0 + 7.2.1 test diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java index 6f0b0f615acf5..54fb9e7fd76f4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java @@ -22,6 +22,9 @@ import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import redis.clients.jedis.ClientSetInfoConfig; +import redis.clients.jedis.DefaultJedisClientConfig; +import redis.clients.jedis.HostAndPort; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; @@ -59,7 +62,13 @@ public class RedisCommonAbstractTest extends GridCommonAbstractTest { jedisPoolCfg.setTestWhileIdle(true); jedisPoolCfg.setTimeBetweenEvictionRunsMillis(30000); - pool = new JedisPool(jedisPoolCfg, HOST, PORT, 10000); + DefaultJedisClientConfig clientCfg = DefaultJedisClientConfig.builder() + .connectionTimeoutMillis(10000) + .socketTimeoutMillis(10000) + .clientSetInfoConfig(ClientSetInfoConfig.DISABLED) + .build(); + + pool = new JedisPool(jedisPoolCfg, new HostAndPort(HOST, PORT), clientCfg); } /** {@inheritDoc} */ diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java index c1d5e08416fa6..0ee98cdf419e5 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import redis.clients.jedis.Jedis; import redis.clients.jedis.exceptions.JedisDataException; +import redis.clients.jedis.params.SetParams; /** * Tests for String commands of Redis protocol. @@ -188,14 +189,14 @@ public void testSet() throws Exception { Assert.assertEquals("b0", jcache().get("setKey2")); // test options. - jedis.set("setKey1", "2", "nx"); - jedis.set("setKey3", "3", "nx", "px", EXPIRE_MS); + jedis.set("setKey1", "2", SetParams.setParams().nx()); + jedis.set("setKey3", "3", SetParams.setParams().nx().px(EXPIRE_MS)); Assert.assertEquals("1", jcache().get("setKey1")); Assert.assertEquals("3", jcache().get("setKey3")); - jedis.set("setKey1", "2", "xx", "ex", EXPIRE_SEC); - jedis.set("setKey4", "4", "xx"); + jedis.set("setKey1", "2", SetParams.setParams().xx().ex(EXPIRE_SEC)); + jedis.set("setKey4", "4", SetParams.setParams().xx()); Assert.assertEquals("2", jcache().get("setKey1")); Assert.assertNull(jcache().get("setKey4"));