Browse Source

minor refactoring due to comments

pull/12133/head
YevhenBondarenko 2 years ago
parent
commit
7a9fea03da
  1. 6
      application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
  2. 2
      application/src/main/java/org/thingsboard/server/service/install/DatabaseEntitiesUpgradeService.java
  3. 4
      application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
  4. 2
      application/src/main/java/org/thingsboard/server/service/install/update/CacheCleanupService.java
  5. 2
      application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java
  6. 4
      application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
  7. 4
      application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java

6
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);

2
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;
}

4
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.");
}

2
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;
}

2
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();
}

4
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();
}

4
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.");
}

Loading…
Cancel
Save