Merge branch 'jedis-x2' into JedisXBinaryCommands_pipeline_commands

redis · Oct 28, 2021 · 80f5a57 · 80f5a57
2 parents 9c93a86 + 9fa96a4
commit 80f5a57
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -4194,12 +4194,14 @@ public long pfcount(final byte[]... keys) {
 
   @Override
   public ScanResult<byte[]> scan(final byte[] cursor) {
-    return scan(cursor, new ScanParams());
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.scan(cursor));
   }
 
   @Override
   public ScanResult<byte[]> scan(final byte[] cursor, final ScanParams params) {
-    return scan(cursor, params, (byte[]) null);
+    checkIsInMultiOrPipeline();
+    return connection.executeCommand(commandObjects.scan(cursor, params));
   }
 
   @Override

diff --git a/src/main/java/redis/clients/jedis/providers/ManagedJedisConnectionProvider.java b/src/main/java/redis/clients/jedis/providers/ManagedJedisConnectionProvider.java
@@ -16,7 +16,7 @@ public void close() {
   }
 
   @Override
-  public Connection getConnection(CommandArguments args) {
+  public final Connection getConnection(CommandArguments args) {
     return connection;
   }
 }
diff --git a/src/main/java/redis/clients/jedis/providers/PooledJedisConnectionProvider.java b/src/main/java/redis/clients/jedis/providers/PooledJedisConnectionProvider.java
@@ -4,11 +4,11 @@
 import redis.clients.jedis.Connection;
 import redis.clients.jedis.util.Pool;
 
-public class PooledJedisConnectionProvider<C extends Connection> implements JedisConnectionProvider {
+public class PooledJedisConnectionProvider implements JedisConnectionProvider {
 
-  private final Pool<C> pool;
+  private final Pool<Connection> pool;
 
-  public PooledJedisConnectionProvider(Pool<C> pool) {
+  public PooledJedisConnectionProvider(Pool<Connection> pool) {
     this.pool = pool;
   }