From d94c17e991a6ab55b36bbd3eec2468c7701a2158 Mon Sep 17 00:00:00 2001
From: mrniko <1104661+mrniko@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:00:04 +0300
Subject: [PATCH] Fixed - Quarkus shutdown process fails if version 3.18 or
 higher. #6445

---
 .../client/runtime/RedissonClientProducer.java  | 17 +++++++++--------
 redisson-quarkus/redisson-quarkus-30/pom.xml    |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java b/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
index 53795ae90..d150d0f4c 100644
--- a/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
+++ b/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
@@ -17,19 +17,19 @@ 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.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
 import org.redisson.config.ConfigSupport;
 import org.redisson.config.PropertiesConvertor;
 
-import jakarta.annotation.PreDestroy;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -51,7 +51,8 @@ public class RedissonClientProducer {
     private RedissonClient redisson;
 
     @Inject
-    public ShutdownConfig shutdownConfig;
+    @ConfigProperty(name = "quarkus.shutdown.timeout")
+    Optional<Duration> shutdownTimeout;
 
     @Produces
     @Singleton
@@ -90,8 +91,8 @@ public class RedissonClientProducer {
     @PreDestroy
     public void close() {
         if (redisson != null) {
-            if (shutdownConfig.isShutdownTimeoutSet()){
-                Duration grace = shutdownConfig.timeout.get();
+            if (shutdownTimeout.isPresent()){
+                Duration grace = shutdownTimeout.get();
                 redisson.shutdown(grace.toMillis(),grace.toMillis()*2, TimeUnit.MILLISECONDS);
             }else{
                 redisson.shutdown();
diff --git a/redisson-quarkus/redisson-quarkus-30/pom.xml b/redisson-quarkus/redisson-quarkus-30/pom.xml
index 04b9af0eb..0818cac11 100644
--- a/redisson-quarkus/redisson-quarkus-30/pom.xml
+++ b/redisson-quarkus/redisson-quarkus-30/pom.xml
@@ -19,8 +19,8 @@
     </modules>
 
      <properties>
-       <quarkus.version>3.17.5</quarkus.version>
-       <quarkus.plugin.version>3.17.5</quarkus.plugin.version>
+       <quarkus.version>3.18.4</quarkus.version>
+       <quarkus.plugin.version>3.18.4</quarkus.plugin.version>
        <maven.compiler.source>11</maven.compiler.source>
        <maven.compiler.target>11</maven.compiler.target>
        <maven.compiler.release>11</maven.compiler.release>