Upgrades Jedis to 3.6.3 (#3302)

Signed-off-by: Laird Nelson <[email protected]>
helidon-io · Aug 25, 2021 · 4213405 · 4213405
1 parent e87a5ff
commit 4213405
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -81,7 +81,7 @@
         <version.lib.jboss.transaction-spi>7.6.0.Final</version.lib.jboss.transaction-spi>
         <!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
         <version.lib.jaxb-runtime>2.3.3</version.lib.jaxb-runtime>
-        <version.lib.jedis>3.1.0</version.lib.jedis>
+        <version.lib.jedis>3.6.3</version.lib.jedis>
         <version.lib.jersey>2.34</version.lib.jersey>
         <version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
         <version.lib.jms-api>2.0</version.lib.jms-api>

diff --git a/...rations/cdi/jedis-cdi/src/main/java/io/helidon/integrations/jedis/cdi/JedisExtension.java b/...rations/cdi/jedis-cdi/src/main/java/io/helidon/integrations/jedis/cdi/JedisExtension.java
@@ -258,7 +258,6 @@ private void addBeans(@Observes final AfterBeanDiscovery event, final BeanManage
                     } else {
                         qualifiers = Collections.singleton(NamedLiteral.of(instanceName));
                     }
-                    final Annotation[] qualifiersArray = qualifiers.toArray(new Annotation[qualifiers.size()]);
 
                     event.<JedisPoolConfig>addBean()
                         .addTransitiveTypeClosure(JedisPoolConfig.class)
@@ -277,6 +276,8 @@ private void addBeans(@Observes final AfterBeanDiscovery event, final BeanManage
                                 return returnValue;
                             });
 
+                    final Annotation[] qualifiersArray = qualifiers.toArray(new Annotation[qualifiers.size()]);
+
                     event.<JedisPool>addBean()
                         .addTransitiveTypeClosure(JedisPool.class)
                         .scope(ApplicationScoped.class)
@@ -316,6 +317,12 @@ private static JedisPool produceJedisPool(final Instance<Object> instance,
         final Integer socketTimeout =
             getPropertyValue(config, JedisPool.class, instanceName, "socketTimeout",
                              Integer.class, Integer.valueOf(Protocol.DEFAULT_TIMEOUT));
+        final Integer infiniteSocketTimeout =
+            getPropertyValue(config, JedisPool.class, instanceName, "infiniteSocketTimeout",
+                             Integer.class, Integer.valueOf(Protocol.DEFAULT_TIMEOUT));
+        final String user =
+            getPropertyValue(config, JedisPool.class, instanceName, "user",
+                             String.class, null);
         final String password =
             getPropertyValue(config, JedisPool.class, instanceName, "password",
                              String.class, null);
@@ -380,6 +387,8 @@ private static JedisPool produceJedisPool(final Instance<Object> instance,
                              port.intValue(),
                              connectionTimeout.intValue(),
                              socketTimeout.intValue(),
+                             infiniteSocketTimeout.intValue(),
+                             user,
                              password,
                              database.intValue(),
                              clientName,

diff --git a/integrations/cdi/jedis-cdi/src/main/java/module-info.java b/integrations/cdi/jedis-cdi/src/main/java/module-info.java
@@ -19,14 +19,15 @@
  * href="https://github.com/xetorthio/jedis/blob/master/README.md">Jedis
  * Redis client</a>.
  */
+@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module io.helidon.integrations.jedis.cdi {
-    requires java.desktop; // For java.beans
-    requires jakarta.enterprise.cdi.api;
+    requires transitive java.desktop; // For java.beans
+    requires transitive jakarta.enterprise.cdi.api;
     requires jakarta.inject.api;
     requires java.sql;
-    requires microprofile.config.api;
-    requires jedis;
-    requires commons.pool2;
+    requires transitive microprofile.config.api;
+    requires redis.clients.jedis;
+    requires org.apache.commons.pool2;
 
     exports io.helidon.integrations.jedis.cdi;