refactor DefaultDatabaseSchemaSettingsService

Author: dmytro-landiak

application/src/main/java/org/thingsboard/mqtt/broker/service/install/DefaultDatabaseSchemaSettingsService.java

@@ -17,7 +17,6 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.info.BuildProperties;
 import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -31,12 +30,11 @@
 @RequiredArgsConstructor
 public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSettingsService {
 
-    private static final String CURRENT_PRODUCT = "CE";
     // This list should include all versions that are compatible for the upgrade.
     // The compatibility cycle usually breaks when we have some scripts written in Java that may not work after new release.
     private static final List<String> SUPPORTED_VERSIONS_FOR_UPGRADE = List.of("2.2.0");
 
-    private final BuildProperties buildProperties;
+    private final ProjectInfo projectInfo;
     private final JdbcTemplate jdbcTemplate;
 
     private String packageSchemaVersion;
@@ -50,8 +48,8 @@ public void validateSchemaSettings() {
         }
 
         String product = getProductFromDb();
-        if (!CURRENT_PRODUCT.equals(product)) {
-            onSchemaSettingsError(String.format("Upgrade failed: can't upgrade TBMQ %s database using TBMQ %s.", product, CURRENT_PRODUCT));
+        if (!projectInfo.getProductType().equals(product)) {
+            onSchemaSettingsError(String.format("Upgrade failed: can't upgrade TBMQ %s database using TBMQ %s.", product, projectInfo.getProductType()));
         }
 
         String dbSchemaVersion = getDbSchemaVersion();
@@ -69,7 +67,7 @@ public void validateSchemaSettings() {
     public void createSchemaSettings() {
         Long schemaVersion = getSchemaVersionFromDb();
         if (schemaVersion == null) {
-            jdbcTemplate.execute("INSERT INTO tb_schema_settings (schema_version, product) VALUES (" + getPackageSchemaVersionForDb() + ", '" + CURRENT_PRODUCT + "')");
+            jdbcTemplate.execute("INSERT INTO tb_schema_settings (schema_version, product) VALUES (" + getPackageSchemaVersionForDb() + ", '" + projectInfo.getProductType() + "')");
         }
     }
 
@@ -81,7 +79,7 @@ public void updateSchemaVersion() {
     @Override
     public String getPackageSchemaVersion() {
         if (packageSchemaVersion == null) {
-            packageSchemaVersion = buildProperties.getVersion().replaceAll("[^\\d.]", "");
+            packageSchemaVersion = projectInfo.getProjectVersion();
         }
         return packageSchemaVersion;
     }

application/src/main/java/org/thingsboard/mqtt/broker/service/install/ProjectInfo.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright © 2016-2025 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.mqtt.broker.service.install;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.info.BuildProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class ProjectInfo {
+
+    private final BuildProperties buildProperties;
+
+    public String getProjectVersion() {
+        return buildProperties.getVersion().replaceAll("[^\\d.]", "");
+    }
+
+    public String getProductType() {
+        return "CE";
+    }
+
+}