From d166353ce280802e69895dd78b155b7cd5cfbc3e Mon Sep 17 00:00:00 2001
From: AndrewVolosytnykhThingsboard <avolostnykh@thingsboard.io>
Date: Wed, 2 Jun 2021 10:55:07 +0300
Subject: [PATCH] Refactoring of versions to update, correct update of tenant
 profile

---
 .../thingsboard/server/install/ThingsboardInstallService.java  | 2 --
 .../service/install/update/DefaultDataUpdateService.java       | 3 +--
 .../server/service/install/update/RateLimitsUpdater.java       | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
index 9f9e78dc3d..267fb31ad7 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -203,8 +203,6 @@ public class ThingsboardInstallService {
                             log.info("Updating system data...");
                             systemDataLoaderService.updateSystemWidgets();
                             break;
-                        case "3.3.0":
-                            dataUpdateService.updateData("3.3.0");
                         default:
                             throw new RuntimeException("Unable to upgrade ThingsBoard, unsupported fromVersion: " + upgradeFromVersion);
 
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
index 9d78fed87c..51a5fec601 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@@ -110,9 +110,8 @@ public class DefaultDataUpdateService implements DataUpdateService {
                 log.info("Updating data from version 3.2.2 to 3.3.0 ...");
                 tenantsDefaultEdgeRuleChainUpdater.updateEntities(null);
                 tenantsAlarmsCustomerUpdater.updateEntities(null);
-                break;
-            case "3.3.0":
                 rateLimitsUpdater.updateEntities(null);
+                break;
             default:
                 throw new RuntimeException("Unable to update data, unsupported fromVersion: " + fromVersion);
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/RateLimitsUpdater.java b/application/src/main/java/org/thingsboard/server/service/install/update/RateLimitsUpdater.java
index aa11a12ff1..e333641da3 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/RateLimitsUpdater.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/RateLimitsUpdater.java
@@ -110,6 +110,8 @@ class RateLimitsUpdater extends PaginatedUpdater<String, TenantProfile> {
                 profileConfiguration.setCassandraTenantLimitsConfiguration(cassandraTenantLimitsConfiguration);
                 profileConfiguration.setPrintTenantNames(printTenantNames);
             }
+
+            tenantProfileService.saveTenantProfile(null, entity);
         }
     }
 }