From 5579b7ad8ece29ea5598a9fb3694fa1052ad0842 Mon Sep 17 00:00:00 2001
From: filipecosta90 <filipecosta.90@gmail.com>
Date: Tue, 5 Sep 2023 16:52:01 +0100
Subject: [PATCH] Bumped Jedis to v5.0.0 - fixed breaking changes from v3.7.0

---
 driver-redis/pom.xml                                          | 2 +-
 .../benchmark/driver/redis/RedisBenchmarkConsumer.java        | 2 +-
 .../benchmark/driver/redis/RedisBenchmarkDriver.java          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/driver-redis/pom.xml b/driver-redis/pom.xml
index 38c9a2855..32f877b1b 100644
--- a/driver-redis/pom.xml
+++ b/driver-redis/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>3.7.0</version>
+            <version>5.0.0</version>
         </dependency>
     </dependencies>
 
diff --git a/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkConsumer.java b/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkConsumer.java
index 877d12080..4e8bb88e8 100644
--- a/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkConsumer.java
+++ b/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkConsumer.java
@@ -27,9 +27,9 @@
 import org.slf4j.LoggerFactory;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.StreamEntry;
 import redis.clients.jedis.StreamEntryID;
 import redis.clients.jedis.params.XReadGroupParams;
+import redis.clients.jedis.resps.StreamEntry;
 
 public class RedisBenchmarkConsumer implements BenchmarkConsumer {
     private final JedisPool pool;
diff --git a/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkDriver.java b/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkDriver.java
index 2579ccb30..d1ef95c3d 100644
--- a/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkDriver.java
+++ b/driver-redis/src/main/java/io/openmessaging/benchmark/driver/redis/RedisBenchmarkDriver.java
@@ -28,11 +28,11 @@
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import org.apache.bookkeeper.stats.StatsLogger;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
 
 public class RedisBenchmarkDriver implements BenchmarkDriver {
     JedisPool jedisPool;
@@ -80,7 +80,7 @@ public CompletableFuture<BenchmarkConsumer> createConsumer(
     }
 
     private void setupJedisConn() {
-        JedisPoolConfig poolConfig = new JedisPoolConfig();
+        GenericObjectPoolConfig<Jedis> poolConfig = new GenericObjectPoolConfig<>();
         poolConfig.setMaxTotal(this.clientConfig.jedisPoolMaxTotal);
         poolConfig.setMaxIdle(this.clientConfig.jedisPoolMaxIdle);
         if (this.clientConfig.redisPass != null) {