IGNITE-28444: Fix deprecated Jedis pool usage in Redis tests

Author: animovscw

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

@@ -25,8 +25,7 @@
 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;
+import redis.clients.jedis.Jedis;
 
 /**
  * Common for all Redis tests.
@@ -42,7 +41,7 @@ public class RedisCommonAbstractTest extends GridCommonAbstractTest {
     protected static final int PORT = 6379;
 
     /** Pool. */
-    protected static JedisPool pool;
+    protected static RedisPool pool;
 
     /** Default Redis cache name. */
     private static final String DFLT_CACHE_NAME = "redis-ignite-internal-cache-0";
@@ -51,29 +50,19 @@ public class RedisCommonAbstractTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGrids(gridCount());
 
-        JedisPoolConfig jedisPoolCfg = new JedisPoolConfig();
-
-        jedisPoolCfg.setMaxWaitMillis(20000);
-        jedisPoolCfg.setMaxIdle(100);
-        jedisPoolCfg.setMinIdle(1);
-        jedisPoolCfg.setNumTestsPerEvictionRun(10);
-        jedisPoolCfg.setTestOnBorrow(true);
-        jedisPoolCfg.setTestOnReturn(true);
-        jedisPoolCfg.setTestWhileIdle(true);
-        jedisPoolCfg.setTimeBetweenEvictionRunsMillis(30000);
-
-        DefaultJedisClientConfig clientCfg = DefaultJedisClientConfig.builder()
-                .connectionTimeoutMillis(10000)
-                .socketTimeoutMillis(10000)
-                .clientSetInfoConfig(ClientSetInfoConfig.DISABLED)
-                .build();
-
-        pool = new JedisPool(jedisPoolCfg, new HostAndPort(HOST, PORT), clientCfg);
+        pool = new RedisPool(
+                new HostAndPort(HOST, PORT),
+                DefaultJedisClientConfig.builder()
+                    .connectionTimeoutMillis(10000)
+                    .socketTimeoutMillis(10000)
+                    .clientSetInfoConfig(ClientSetInfoConfig.DISABLED)
+                    .build()
+        );
     }
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        pool.destroy();
+        pool = null;
     }
 
     /** {@inheritDoc} */
@@ -91,7 +80,7 @@ public class RedisCommonAbstractTest extends GridCommonAbstractTest {
 
         cfg.setConnectorConfiguration(redisCfg);
 
-        CacheConfiguration ccfg = defaultCacheConfiguration();
+        CacheConfiguration<String, String> ccfg = defaultCacheConfiguration();
 
         ccfg.setStatisticsEnabled(true);
         ccfg.setIndexedTypes(String.class, String.class);
@@ -125,4 +114,31 @@ protected int gridCount() {
 
         assertTrue(jcache().localSize() == 0);
     }
+
+    /**
+     * Lightweight Redis connection factory.
+     */
+    protected static class RedisPool {
+        /** Redis address. */
+        private final HostAndPort addr;
+
+        /** Client config. */
+        private final DefaultJedisClientConfig cfg;
+
+        /**
+         * @param addr Redis address.
+         * @param cfg Client config.
+         */
+        RedisPool(HostAndPort addr, DefaultJedisClientConfig cfg) {
+            this.addr = addr;
+            this.cfg = cfg;
+        }
+
+        /**
+         * @return Redis client.
+         */
+        Jedis getResource() {
+            return new Jedis(addr, cfg);
+        }
+    }
 }

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

@@ -64,15 +64,15 @@ public void testGetSet() throws Exception {
         try (Jedis jedis = pool.getResource()) {
             jcache().put("getSetKey1", "1");
 
-            Assert.assertEquals("1", jedis.getSet("getSetKey1", "0"));
+            Assert.assertEquals("1", jedis.setGet("getSetKey1", "0"));
             Assert.assertNull(jedis.get("getSetNonExistingKey"));
 
-            jcache().put("setDataTypeKey", new HashSet<String>(Arrays.asList("1", "2")));
+            jcache().put("setDataTypeKey", new HashSet<>(Arrays.asList("1", "2")));
 
             try {
-                jedis.getSet("setDataTypeKey", "0");
+                jedis.setGet("setDataTypeKey", "0");
 
-                assert false : "Exception has to be thrown!";
+                fail("Exception has to be thrown!");
             }
             catch (JedisDataException e) {
                 assertTrue(e.getMessage().startsWith("WRONGTYPE"));

modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java

@@ -376,7 +376,7 @@ public void testCustomCiphersOnServer() throws Exception {
 
             // Explicit cipher not supported by server.
             GridTestUtils.assertThrows(log, () -> DriverManager.getConnection(
-                    "jdbc:ignite:thin://127.0.0.1/?sslMode=require" +
+                "jdbc:ignite:thin://127.0.0.1/?sslMode=require" +
                     "&sslCipherSuites=" + cipher2 +
                     "&sslClientCertificateKeyStoreUrl=" + CLI_KEY_STORE_PATH +
                     "&sslClientCertificateKeyStorePassword=123456" +