From 7d40952fea67bcbbe89c9524af820e0ffcad9189 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 25 Jan 2022 15:44:37 +0200
Subject: [PATCH] version upgrade: added clear redis to cache service

---
 .../install/update/DefaultCacheCleanupService.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
index ebeac451ac..95160f1b21 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
@@ -17,13 +17,14 @@ package org.thingsboard.server.service.install.update;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @Service
@@ -32,6 +33,8 @@ import java.util.Objects;
 public class DefaultCacheCleanupService implements CacheCleanupService {
 
     private final CacheManager cacheManager;
+    private final Optional<RedisTemplate<String, Object>> redisTemplate;
+
 
     /**
      * Cleanup caches that can not deserialize anymore due to schema upgrade or data update using sql scripts.
@@ -59,9 +62,7 @@ public class DefaultCacheCleanupService implements CacheCleanupService {
                 break;
             case "3.3.2":
                 log.info("Clear cache to upgrade from version 3.3.2 to 3.3.3 ...");
-                clearCacheByName("devices");
-                clearCacheByName("deviceProfiles");
-                clearCacheByName("tenantProfiles");
+                clearAll();
                 break;
             default:
                 //Do nothing, since cache cleanup is optional.
@@ -78,4 +79,8 @@ public class DefaultCacheCleanupService implements CacheCleanupService {
         cache.clear();
     }
 
+    void clearAll() {
+        redisTemplate.ifPresent(rt -> rt.execute(connection ->
+                connection.execute("FLUSHALL"), false));
+    }
 }