From 3f9506896fc83ee10e648468898eaa7ef6b0c3a4 Mon Sep 17 00:00:00 2001
From: dlandiak <dlandiak@thingsboard.io>
Date: Fri, 6 Dec 2024 14:58:20 +0200
Subject: [PATCH] rewritten DefaultLettuceConnectionManager to reuse
 statefulConnection from Spring lettuce factory

---
 .../DefaultLettuceConnectionManager.java      | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/common/cache/src/main/java/org/thingsboard/mqtt/broker/cache/DefaultLettuceConnectionManager.java b/common/cache/src/main/java/org/thingsboard/mqtt/broker/cache/DefaultLettuceConnectionManager.java
index 451938abe..70fc9f013 100644
--- a/common/cache/src/main/java/org/thingsboard/mqtt/broker/cache/DefaultLettuceConnectionManager.java
+++ b/common/cache/src/main/java/org/thingsboard/mqtt/broker/cache/DefaultLettuceConnectionManager.java
@@ -15,16 +15,15 @@
  */
 package org.thingsboard.mqtt.broker.cache;
 
-import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.ScriptOutputType;
 import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.api.async.RedisAsyncCommands;
 import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -40,23 +39,16 @@ public class DefaultLettuceConnectionManager extends AbstractLettuceConnectionMa
 
     private StatefulRedisConnection<byte[], byte[]> connection;
 
+    @SuppressWarnings({"unchecked", "deprecation"})
     @PostConstruct
     public void init() {
-        RedisClient client = (RedisClient) lettuceConnectionFactory.getNativeClient();
-        if (client == null) {
-            throw new IllegalStateException("Failed to initiate Redis lettuce client!");
-        }
-        connection = client.connect(ByteArrayCodec.INSTANCE);
+        RedisConnection redisConnection = lettuceConnectionFactory.getConnection();
+        RedisAsyncCommands<byte[], byte[]> asyncCommands =
+                (RedisAsyncCommands<byte[], byte[]>) redisConnection.getNativeConnection();
+        connection = asyncCommands.getStatefulConnection();
         connection.setAutoFlushCommands(autoFlush);
     }
 
-    @PreDestroy
-    public void destroy() {
-        if (connection != null && connection.isOpen()) {
-            connection.close();
-        }
-    }
-
     @Override
     @SneakyThrows
     public String scriptLoad(String script) {