From 7a9fea03da936bbf1cf2ab58507dd847eee2bcfc Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Fri, 29 Nov 2024 10:41:56 +0100 Subject: [PATCH] minor refactoring due to comments --- .../server/install/ThingsboardInstallService.java | 6 +++--- .../service/install/DatabaseEntitiesUpgradeService.java | 2 +- .../server/service/install/SqlDatabaseUpgradeService.java | 4 ++-- .../server/service/install/update/CacheCleanupService.java | 2 +- .../server/service/install/update/DataUpdateService.java | 2 +- .../service/install/update/DefaultCacheCleanupService.java | 4 ++-- .../service/install/update/DefaultDataUpdateService.java | 4 ++-- 7 files changed, 12 insertions(+), 12 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 91c4e04bdf..52a079815c 100644 --- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java +++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java @@ -107,10 +107,10 @@ public class ThingsboardInstallService { // this list should include last version and can include previous versions without upgrade String fromVersion = databaseSchemaVersionService.getDbSchemaVersion(); String toVersion = databaseSchemaVersionService.getPackageSchemaVersion(); - cacheCleanupService.clearCache(fromVersion, toVersion); + cacheCleanupService.clearCache(); log.info("Upgrading ThingsBoard from version {} to {} ...", fromVersion, toVersion); - databaseEntitiesUpgradeService.upgradeDatabase(fromVersion, toVersion); -// dataUpdateService.updateData(fromVersion, toVersion); + databaseEntitiesUpgradeService.upgradeDatabase(); +// dataUpdateService.updateData(); installScripts.updateResourcesUsage(); entityDatabaseSchemaService.createDatabaseSchema(false); diff --git a/application/src/main/java/org/thingsboard/server/service/install/DatabaseEntitiesUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/DatabaseEntitiesUpgradeService.java index d7968f9f72..f46aa7c08e 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/DatabaseEntitiesUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/DatabaseEntitiesUpgradeService.java @@ -17,6 +17,6 @@ package org.thingsboard.server.service.install; public interface DatabaseEntitiesUpgradeService { - void upgradeDatabase(String fromVersion, String toVersion) throws Exception; + void upgradeDatabase() throws Exception; } diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java index d3e991b6b8..5780057340 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java @@ -51,8 +51,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService } @Override - public void upgradeDatabase(String fromVersion, String toVersion) { - log.info("Updating schema from version {} to {} ...", fromVersion, toVersion); + public void upgradeDatabase() { + log.info("Updating schema ..."); loadSql(getSchemaUpdateFile("basic")); log.info("Schema updated."); } diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/CacheCleanupService.java b/application/src/main/java/org/thingsboard/server/service/install/update/CacheCleanupService.java index 5542af2c51..f0c700337d 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/update/CacheCleanupService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/update/CacheCleanupService.java @@ -17,6 +17,6 @@ package org.thingsboard.server.service.install.update; public interface CacheCleanupService { - void clearCache(String from, String to) throws Exception; + void clearCache() throws Exception; } diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java index 210433f82e..37b2724f14 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java @@ -17,7 +17,7 @@ package org.thingsboard.server.service.install.update; public interface DataUpdateService { - void updateData(String fromVersion, String toVersion) throws Exception; + void updateData() throws Exception; void upgradeRuleNodes(); } 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 62b3061df7..4fc4f8d40d 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 @@ -42,8 +42,8 @@ public class DefaultCacheCleanupService implements CacheCleanupService { * to discover which tables were changed * */ @Override - public void clearCache(String from, String to) throws Exception { - log.info("Clearing cache to upgrade from version {} to {}", from, to); + public void clearCache() throws Exception { + log.info("Clearing cache to upgrade."); clearAll(); } 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 3431859d95..2381dd5fd7 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 @@ -58,8 +58,8 @@ public class DefaultDataUpdateService implements DataUpdateService { JpaExecutorService jpaExecutorService; @Override - public void updateData(String fromVersion, String toVersion) throws Exception { - log.info("Updating data from version {} to {} ...", fromVersion, toVersion); + public void updateData() throws Exception { + log.info("Updating data ..."); log.info("Data updated."); }