V7.1.0

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>today.bonfire.oss</groupId>
         <artifactId>bonfire-oss-parent</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.12</version>
     </parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -39,13 +39,13 @@
 	<properties>
 		<github.global.server>github</github.global.server>
         <jedis.module.name>bonfire.oss.jedis</jedis.module.name>
-		<slf4j.version>1.7.36</slf4j.version>
+		<slf4j.version>2.0.17</slf4j.version>
 		<resilience4j.version>1.7.1</resilience4j.version>
         <jackson.version>2.20.0</jackson.version>
         <maven.surefire.version>3.5.4</maven.surefire.version>
         <junit.version>5.13.4</junit.version>
         <!-- Default JVM options for tests -->
-        <JVM_OPTS></JVM_OPTS>
+        <JVM_OPTS>--add-opens java.base/java.time=ALL-UNNAMED</JVM_OPTS>
         <!-- Default excluded groups for tests - can be overridden from command line -->
         <excludedGroupsForUnitTests>integration,scenario</excludedGroupsForUnitTests>
         <skipUnitTests>false</skipUnitTests>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>today.bonfire.oss</groupId>
             <artifactId>simple-object-pool</artifactId>
-            <version>2.3.3</version>
+            <version>2.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -143,7 +143,6 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.13</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -317,6 +316,13 @@
                     <release>${java.version}</release>
                 </configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${maven.surefire.version}</version>
+				<configuration>
+					<argLine>@{argLine} ${JVM_OPTS}</argLine>
+				</configuration>
+			</plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>${maven.surefire.version}</version>
@@ -403,39 +409,21 @@
                     </execution>
                 </executions>
             </plugin>
-			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>3.3.1</version>
-				<configuration>
-					<attach>true</attach>
-				</configuration>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.3</version>
-				<configuration>
-					<source>8</source><!-- Until JDK 11+ -->
-					<detectJavaApiLink>false</detectJavaApiLink><!-- Until JDK 11+ -->
-					<!--<doclint>none</doclint>-->
-					<!--<doclint>all,-missing</doclint>-->
-				</configuration>
-				<executions>
-					<execution>
-						<id>attach-javadoc</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+<!--			<plugin>-->
+<!--				<artifactId>maven-source-plugin</artifactId>-->
+<!--				<version>3.3.1</version>-->
+<!--				<configuration>-->
+<!--					<attach>true</attach>-->
+<!--				</configuration>-->
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<id>attach-sources</id>-->
+<!--						<goals>-->
+<!--							<goal>jar</goal>-->
+<!--						</goals>-->
+<!--					</execution>-->
+<!--				</executions>-->
+<!--			</plugin>-->
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
@@ -549,9 +537,7 @@
                         <artifactId>maven-compiler-plugin</artifactId>
                         <version>3.14.1</version>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
-                            <parameters>true</parameters>
+                            <release>${java.version}</release>
                         </configuration>
                     </plugin>
                     <plugin>

src/main/java/redis/clients/jedis/ConnectionFactory.java

@@ -12,6 +12,7 @@
 import redis.clients.jedis.csc.Cache;
 import redis.clients.jedis.csc.CacheConnection;
 import redis.clients.jedis.exceptions.JedisException;
+import today.bonfire.oss.sop.PooledObject;
 import today.bonfire.oss.sop.PooledObjectFactory;
 
 /**
@@ -157,7 +158,6 @@ public void activateObject(Connection obj) {
     // no-op
   }
 
-  @Override
   public void activateObject(PooledObject<Connection> pooledConnection) throws Exception {
     // what to do ??
   }
@@ -186,7 +186,7 @@ public Connection createObject() {
   @Override
   public void passivateObject(Connection obj) {
     // TODO maybe should select db 0? Not sure right now.
-    reAuthenticate(jedis);
+      reAuthenticate(obj);
   }
 
   @Override
@@ -216,7 +216,7 @@ public boolean isObjectValid(Connection obj) {
     }
   }
 
-  private void reAuthenticate(Connection jedis) throws Exception {
+  private void reAuthenticate(Connection jedis) {
     try {
       String result = jedis.reAuthenticate();
       if (result != null && !result.equals("OK")) {

src/main/java/redis/clients/jedis/JedisCluster.java

@@ -5,8 +5,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.builders.ClusterClientBuilder;
 import redis.clients.jedis.executors.ClusterCommandExecutor;

src/main/java/redis/clients/jedis/JedisPooled.java

@@ -5,8 +5,6 @@
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.builders.StandaloneClientBuilder;
 import redis.clients.jedis.csc.Cache;

src/main/java/redis/clients/jedis/MultiDbConfig.java

@@ -6,13 +6,13 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisValidationException;
 import redis.clients.jedis.mcf.ConnectionFailoverException;
 import redis.clients.jedis.mcf.PingStrategy;
 import redis.clients.jedis.mcf.HealthCheckStrategy;
+import today.bonfire.oss.sop.SimpleObjectPoolConfig;
 
 /**
  * Configuration class for multi-database Redis deployments with automatic failover and failback
@@ -829,7 +829,7 @@ public static class DatabaseConfig {
     private final JedisClientConfig jedisClientConfig;
 
     /** Optional connection pool configuration for managing connections to this database. */
-    private GenericObjectPoolConfig<Connection> connectionPoolConfig;
+    private SimpleObjectPoolConfig connectionPoolConfig;
 
     /**
      * Weight value for database selection priority. Higher weights indicate higher priority.
@@ -871,7 +871,7 @@ public DatabaseConfig(Endpoint endpoint, JedisClientConfig clientConfig) {
      * @throws IllegalArgumentException if endpoint or clientConfig is null
      */
     public DatabaseConfig(Endpoint endpoint, JedisClientConfig clientConfig,
-        GenericObjectPoolConfig<Connection> connectionPoolConfig) {
+        SimpleObjectPoolConfig connectionPoolConfig) {
       this.endpoint = endpoint;
       this.jedisClientConfig = clientConfig;
       this.connectionPoolConfig = connectionPoolConfig;
@@ -921,7 +921,7 @@ public JedisClientConfig getJedisClientConfig() {
      * Returns the connection pool configuration for this database.
      * @return the connection pool configuration, may be null if not specified
      */
-    public GenericObjectPoolConfig<Connection> getConnectionPoolConfig() {
+    public SimpleObjectPoolConfig getConnectionPoolConfig() {
       return connectionPoolConfig;
     }
 
@@ -975,7 +975,7 @@ public static class Builder {
       private JedisClientConfig jedisClientConfig;
 
       /** Optional connection pool configuration. */
-      private GenericObjectPoolConfig<Connection> connectionPoolConfig;
+      private SimpleObjectPoolConfig connectionPoolConfig;
 
       /** Weight for database selection priority. Default: 1.0f */
       private float weight = 1.0f;
@@ -1003,8 +1003,7 @@ public Builder(Endpoint endpoint, JedisClientConfig clientConfig) {
        * @param connectionPoolConfig the connection pool configuration
        * @return this builder instance for method chaining
        */
-      public Builder connectionPoolConfig(
-          GenericObjectPoolConfig<Connection> connectionPoolConfig) {
+      public Builder connectionPoolConfig(SimpleObjectPoolConfig connectionPoolConfig) {
         this.connectionPoolConfig = connectionPoolConfig;
         return this;
       }
@@ -1467,4 +1466,4 @@ public MultiDbConfig build() {
 
   }
 
-}
+}

src/main/java/redis/clients/jedis/UnifiedJedis.java

@@ -8,15 +8,7 @@
 import org.json.JSONArray;
 import redis.clients.jedis.annots.Experimental;
 import redis.clients.jedis.annots.VisibleForTesting;
-import redis.clients.jedis.args.BitCountOption;
-import redis.clients.jedis.args.BitOP;
-import redis.clients.jedis.args.ExpiryOption;
-import redis.clients.jedis.args.FlushMode;
-import redis.clients.jedis.args.FunctionRestorePolicy;
-import redis.clients.jedis.args.GeoUnit;
-import redis.clients.jedis.args.ListDirection;
-import redis.clients.jedis.args.ListPosition;
-import redis.clients.jedis.args.SortedSetOption;
+import redis.clients.jedis.args.*;
 import redis.clients.jedis.bloom.BFInsertParams;
 import redis.clients.jedis.bloom.BFReserveParams;
 import redis.clients.jedis.bloom.CFInsertParams;
@@ -49,9 +41,7 @@
 import redis.clients.jedis.params.*;
 import redis.clients.jedis.providers.ClusterConnectionProvider;
 import redis.clients.jedis.providers.ConnectionProvider;
-import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
 import redis.clients.jedis.providers.PooledConnectionProvider;
-import redis.clients.jedis.providers.ShardedConnectionProvider;
 import redis.clients.jedis.resps.*;
 import redis.clients.jedis.search.*;
 import redis.clients.jedis.search.aggr.AggregationBuilder;
@@ -63,12 +53,6 @@
 import redis.clients.jedis.util.JedisURIHelper;
 import redis.clients.jedis.util.KeyValue;
 
-import java.net.URI;
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
 
 public class UnifiedJedis implements JedisCommands, JedisBinaryCommands, SampleKeyedCommands,
     SampleBinaryKeyedCommands, RedisModuleCommands, AutoCloseable {

src/main/java/redis/clients/jedis/authentication/AuthXManager.java

@@ -125,4 +125,4 @@ public RedisCredentials get() {
         return new TokenCredentials(this.currentToken);
     }
 
-}
+}

src/main/java/redis/clients/jedis/builders/AbstractClientBuilder.java

@@ -1,6 +1,5 @@
 package redis.clients.jedis.builders;
 
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import redis.clients.jedis.*;
 import redis.clients.jedis.csc.Cache;
 import redis.clients.jedis.csc.CacheConfig;
@@ -10,6 +9,7 @@
 import redis.clients.jedis.json.JsonObjectMapper;
 import redis.clients.jedis.providers.ConnectionProvider;
 import redis.clients.jedis.search.SearchProtocol;
+import today.bonfire.oss.sop.SimpleObjectPoolConfig;
 
 /**
  * Abstract base class for Redis client builders that provides common configuration options.
@@ -33,7 +33,7 @@
 public abstract class AbstractClientBuilder<T extends AbstractClientBuilder<T, C>, C> {
 
   // Common configuration fields
-  protected GenericObjectPoolConfig<Connection> poolConfig = new ConnectionPoolConfig();
+  protected SimpleObjectPoolConfig poolConfig = new ConnectionPoolConfig();
   protected Cache cache = null;
   protected CacheConfig cacheConfig = null;
   protected CommandExecutor commandExecutor = null;
@@ -172,7 +172,7 @@ public C build() {
    * @param poolConfig the pool configuration
    * @return this builder
    */
-  public T poolConfig(GenericObjectPoolConfig<Connection> poolConfig) {
+  public T poolConfig(SimpleObjectPoolConfig poolConfig) {
     this.poolConfig = poolConfig;
     return self();
   }

src/main/java/redis/clients/jedis/mcf/PingStrategy.java

@@ -1,13 +1,6 @@
 package redis.clients.jedis.mcf;
 
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-
-import redis.clients.jedis.Connection;
-import redis.clients.jedis.Endpoint;
-import redis.clients.jedis.HostAndPort;
-import redis.clients.jedis.JedisClientConfig;
-import redis.clients.jedis.JedisPooled;
-import redis.clients.jedis.UnifiedJedis;
+import redis.clients.jedis.*;
 import redis.clients.jedis.MultiDbConfig.StrategySupplier;
 
 public class PingStrategy implements HealthCheckStrategy {
@@ -22,9 +15,9 @@ public PingStrategy(HostAndPort hostAndPort, JedisClientConfig jedisClientConfig
 
   public PingStrategy(HostAndPort hostAndPort, JedisClientConfig jedisClientConfig,
       HealthCheckStrategy.Config config) {
-    GenericObjectPoolConfig<Connection> poolConfig = new GenericObjectPoolConfig<>();
-    poolConfig.setMaxTotal(MAX_HEALTH_CHECK_POOL_SIZE);
-    this.jedis = new JedisPooled(hostAndPort, jedisClientConfig, poolConfig);
+    var poolConfig = JedisPoolConfig.builder();
+    poolConfig.maxPoolSize(MAX_HEALTH_CHECK_POOL_SIZE);
+    this.jedis = new JedisPooled(hostAndPort, jedisClientConfig, poolConfig.build());
     this.config = config;
   }