improve methods add tests

redis · Sep 3, 2023 · 64c14bd · 64c14bd
1 parent 31f8637
commit 64c14bd
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 11 deletions.
diff --git a/src/main/java/redis/clients/jedis/JedisPool.java b/src/main/java/redis/clients/jedis/JedisPool.java
@@ -395,13 +395,13 @@ public void returnResource(final Jedis resource) {
     }
   }
 
-  void withJedisDo(Consumer<Jedis> consumer) {
+  public void withJedisDo(Consumer<Jedis> consumer) {
     try (Jedis jedis = getResource()) {
       consumer.accept(jedis);
     }
   }
 
-  <K> K withJedisGet(Function<Jedis, K> function) {
+  public <K> K withJedisGet(Function<Jedis, K> function) {
     try (Jedis jedis = getResource()) {
       return function.apply(jedis);
     }

diff --git a/src/main/java/redis/clients/jedis/JedisPooled.java b/src/main/java/redis/clients/jedis/JedisPooled.java
@@ -404,15 +404,19 @@ public Pipeline pipelined() {
     return (Pipeline) super.pipelined();
   }
 
-  void withJedisDo(Consumer<Jedis> consumer) {
-    try (Connection connection = getPool().getResource()) {
-      consumer.accept(new Jedis(connection));
+  public Jedis newJedis() {
+    return new Jedis(getPool().getResource());
+  }
+
+  public void withJedisDo(Consumer<Jedis> consumer) {
+    try (Jedis jedis = newJedis()) {
+      consumer.accept(jedis);
     }
   }
 
-  <K> K withJedisGet(Function<Jedis, K> function) {
-    try (Connection connection = getPool().getResource()) {
-      return function.apply(new Jedis(connection));
+  public <K> K withJedisGet(Function<Jedis, K> function) {
+    try (Jedis jedis = newJedis()) {
+      return function.apply(jedis);
     }
   }
 

diff --git a/src/test/java/redis/clients/jedis/JedisPoolTest.java b/src/test/java/redis/clients/jedis/JedisPoolTest.java
@@ -1,5 +1,8 @@
 package redis.clients.jedis;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -8,6 +11,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.PooledObjectFactory;
@@ -453,4 +457,30 @@ public void testResetValidCredentials() {
       }
     }
   }
+
+  @Test
+  public void testWithJedisDo() {
+    HostAndPort hpTest = HostAndPorts.getRedisServers().get(0);
+    try (JedisPool pool = new JedisPool(new JedisPoolConfig(), hpTest.getHost(), hpTest.getPort())) {
+      pool.withJedisDo(jedis -> {
+        assertThat(jedis.getClient().getHostAndPort().getHost(), equalTo(hpTest.getHost()));
+        assertThat(jedis.getClient().getHostAndPort().getPort(), equalTo(hpTest.getPort()));
+        assertThat(jedis.time(), notNullValue());
+      });
+    }
+  }
+
+  @Test
+  public void testWithJedisGet() {
+    HostAndPort hpTest = HostAndPorts.getRedisServers().get(0);
+    try (JedisPool pool = new JedisPool(new JedisPoolConfig(), hpTest.getHost(), hpTest.getPort())) {
+      List<String> result = pool.withJedisGet(jedis -> {
+        assertThat(jedis.getClient().getHostAndPort().getHost(), equalTo(hpTest.getHost()));
+        assertThat(jedis.getClient().getHostAndPort().getPort(), equalTo(hpTest.getPort()));
+        return jedis.time();
+      });
+      assertThat(result,notNullValue());
+    }
+  }
+
 }
diff --git a/src/test/java/redis/clients/jedis/JedisPooledTest.java b/src/test/java/redis/clients/jedis/JedisPooledTest.java
@@ -1,15 +1,14 @@
 package redis.clients.jedis;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.anything;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
@@ -255,4 +254,41 @@ public void cleanUp() {
       assertThat(cleanupCount.get(), equalTo(1));
     }
   }
+
+  @Test
+  public void testNewJedis() {
+    HostAndPort hostAndPortTest = HostAndPorts.getRedisServers().get(0);
+    try (JedisPooled pool = new JedisPooled(hostAndPortTest)) {
+      Jedis jedis = pool.newJedis();
+      assertThat(jedis.getClient().getHostAndPort().getHost(), equalTo(hostAndPortTest.getHost()));
+      assertThat(jedis.getClient().getHostAndPort().getPort(), equalTo(hostAndPortTest.getPort()));
+      assertThat(jedis.time(), notNullValue());
+    }
+  }
+
+  @Test
+  public void testWithJedisDo() {
+    HostAndPort hostAndPortTest = HostAndPorts.getRedisServers().get(0);
+    try (JedisPooled pool = new JedisPooled(hostAndPortTest)) {
+      pool.withJedisDo(jedis -> {
+        assertThat(jedis.getClient().getHostAndPort().getHost(), equalTo(hostAndPortTest.getHost()));
+        assertThat(jedis.getClient().getHostAndPort().getPort(), equalTo(hostAndPortTest.getPort()));
+        assertThat(jedis.time(), notNullValue());
+      });
+    }
+  }
+
+  @Test
+  public void testWithJedisGet() {
+    HostAndPort hostAndPortTest = HostAndPorts.getRedisServers().get(0);
+    try (JedisPooled pool = new JedisPooled(hostAndPortTest)) {
+      List<String> result = pool.withJedisGet(jedis -> {
+        assertThat(jedis.getClient().getHostAndPort().getHost(), equalTo(hostAndPortTest.getHost()));
+        assertThat(jedis.getClient().getHostAndPort().getPort(), equalTo(hostAndPortTest.getPort()));
+        return jedis.time();
+      });
+      assertThat(result,notNullValue());
+    }
+  }
+
 }