Merge branch 'master' of github.com:redisson/redisson

redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java

@@ -17,6 +17,7 @@ package io.quarkus.redisson.client.runtime;
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.runtime.shutdown.ShutdownConfig;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -27,11 +28,14 @@ import org.redisson.config.PropertiesConvertor;
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -46,6 +50,9 @@ public class RedissonClientProducer {
 
     private RedissonClient redisson;
 
+    @Inject
+    public ShutdownConfig shutdownConfig;
+
     @Produces
     @Singleton
     @DefaultBean
@@ -87,7 +94,12 @@ public class RedissonClientProducer {
     @PreDestroy
     public void close() {
         if (redisson != null) {
-            redisson.shutdown();
+            if (shutdownConfig.isShutdownTimeoutSet()){
+                Duration grace = shutdownConfig.timeout.get();
+                redisson.shutdown(grace.toMillis(),grace.toMillis()*2, TimeUnit.MILLISECONDS);
+            }else{
+                redisson.shutdown();
+            }
         }
     }
 

redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java

@@ -17,6 +17,7 @@ package io.quarkus.redisson.client.runtime;
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.runtime.shutdown.ShutdownConfig;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -27,11 +28,14 @@ import org.redisson.config.PropertiesConvertor;
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -46,6 +50,9 @@ public class RedissonClientProducer {
 
     private RedissonClient redisson;
 
+    @Inject
+    public ShutdownConfig shutdownConfig;
+
     @Produces
     @Singleton
     @DefaultBean
@@ -83,7 +90,12 @@ public class RedissonClientProducer {
     @PreDestroy
     public void close() {
         if (redisson != null) {
-            redisson.shutdown();
+            if (shutdownConfig.isShutdownTimeoutSet()){
+                Duration grace = shutdownConfig.timeout.get();
+                redisson.shutdown(grace.toMillis(),grace.toMillis()*2, TimeUnit.MILLISECONDS);
+            }else{
+                redisson.shutdown();
+            }
         }
     }
 

redisson-quarkus/redisson-quarkus-30/runtime/pom.xml

@@ -50,6 +50,11 @@
               <artifactId>jakarta.enterprise.cdi-api</artifactId>
           </dependency>
 
+          <dependency>
+              <groupId>jakarta.inject</groupId>
+              <artifactId>jakarta.inject-api</artifactId>
+          </dependency>
+
           <dependency>
               <groupId>org.graalvm.nativeimage</groupId>
               <artifactId>svm</artifactId>

redisson-quarkus/redisson-quarkus-30/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java

@@ -17,6 +17,8 @@ package io.quarkus.redisson.client.runtime;
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.runtime.shutdown.ShutdownConfig;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -31,7 +33,9 @@ import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -46,6 +50,9 @@ public class RedissonClientProducer {
 
     private RedissonClient redisson;
 
+    @Inject
+    public ShutdownConfig shutdownConfig;
+
     @Produces
     @Singleton
     @DefaultBean
@@ -83,7 +90,12 @@ public class RedissonClientProducer {
     @PreDestroy
     public void close() {
         if (redisson != null) {
-            redisson.shutdown();
+            if (shutdownConfig.isShutdownTimeoutSet()){
+                Duration grace = shutdownConfig.timeout.get();
+                redisson.shutdown(grace.toMillis(),grace.toMillis()*2, TimeUnit.MILLISECONDS);
+            }else{
+                redisson.shutdown();
+            }
         }
     }
 

redisson/pom.xml

@@ -353,7 +353,7 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <!-- 4.1+ -->
-            <version>6.0.17</version>
+            <version>6.0.18</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>