From 7957e5cca67ae097d532b866e534226cb7f4db4b Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 12 Dec 2023 12:17:53 +0200
Subject: [PATCH 1/2] updated upgrade script for 3.6.1 to clean up
 securitySettings cache

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

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 278fc0adf5..3c838e23b9 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
@@ -86,6 +86,10 @@ public class DefaultCacheCleanupService implements CacheCleanupService {
                 log.info("Clearing cache to upgrade from version 3.4.4 to 3.5.0");
                 clearAll();
                 break;
+            case "3.6.1":
+                log.info("Clearing cache to upgrade from version 3.6.1 to 3.6.2");
+                clearCacheByName("securitySettings");
+                break;
             default:
                 //Do nothing, since cache cleanup is optional.
         }

From 355503bbbcb977ea05b75b31240e46007c58ae1e Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 12 Dec 2023 12:35:57 +0200
Subject: [PATCH 2/2] refactoring: used const instead of String

---
 .../service/install/update/DefaultCacheCleanupService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 3c838e23b9..e4e1ddf427 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
@@ -27,6 +27,8 @@ import org.springframework.stereotype.Service;
 import java.util.Objects;
 import java.util.Optional;
 
+import static org.thingsboard.server.common.data.CacheConstants.SECURITY_SETTINGS_CACHE;
+
 @RequiredArgsConstructor
 @Service
 @Profile("install")
@@ -88,7 +90,7 @@ public class DefaultCacheCleanupService implements CacheCleanupService {
                 break;
             case "3.6.1":
                 log.info("Clearing cache to upgrade from version 3.6.1 to 3.6.2");
-                clearCacheByName("securitySettings");
+                clearCacheByName(SECURITY_SETTINGS_CACHE);
                 break;
             default:
                 //Do nothing, since cache cleanup is optional.