From 8fa4617a7ad7ace79ce5ac443f10c498c9b0c849 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Mon, 20 Mar 2023 15:30:00 +0200
Subject: [PATCH] sparkplug: commit1

---
 .../install/ThingsboardInstallService.java    |  8 ++------
 .../service/install/InstallScripts.java       | 20 ++++++-------------
 2 files changed, 8 insertions(+), 20 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 7186a4a697..257db58a9b 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -22,7 +22,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.service.component.ComponentDiscoveryService;
 import org.thingsboard.server.service.install.DatabaseEntitiesUpgradeService;
 import org.thingsboard.server.service.install.DatabaseTsUpgradeService;
@@ -90,9 +89,6 @@ public class ThingsboardInstallService {
     @Autowired(required = false)
     private TsLatestMigrateService latestMigrateService;
 
-    @Autowired
-    private ResourceService resourceService;
-
     @Autowired
     private InstallScripts installScripts;
 
@@ -250,7 +246,7 @@ public class ThingsboardInstallService {
                             databaseEntitiesUpgradeService.upgradeDatabase("3.4.4");
                             log.info("Updating system data...");
                             systemDataLoaderService.updateSystemWidgets();
-                            installScripts.migrateLwm2mResources();
+                            installScripts.loadSystemLwm2mResources();
                             break;
                         //TODO update CacheCleanupService on the next version upgrade
                         default:
@@ -293,7 +289,7 @@ public class ThingsboardInstallService {
                 systemDataLoaderService.createQueues();
 //                systemDataLoaderService.loadSystemPlugins();
 //                systemDataLoaderService.loadSystemRules();
-                installScripts.migrateLwm2mResources();
+                installScripts.loadSystemLwm2mResources();
 
                 if (loadDemo) {
                     log.info("Loading demo data...");
diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
index 36212fa4e9..5f3d50a1fd 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
@@ -267,13 +267,7 @@ public class InstallScripts {
         }
     }
 
-    /**
-     * TbResource res = new TbResource();
-     * res.setTenantId(TenantId.SYS_TENANT_ID); // SisAdmin
-     * res.setData("File base64");
-     * res.setResourceType(ResourceType.LWM2M_MODEL);
-     */
-    public void migrateLwm2mResources() {
+    public void loadSystemLwm2mResources() {
         Path resourceLwm2mPath = Paths.get(dataDir, MODELS_LWM2M_DIR);
         try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(resourceLwm2mPath, path -> path.toString().endsWith(InstallScripts.XML_EXT))) {
             dirStream.forEach(
@@ -281,7 +275,7 @@ public class InstallScripts {
                         try {
                             String data = Base64.getEncoder().encodeToString(Files.readAllBytes(path));
                             TbResource tbResource = new TbResource();
-                            tbResource.setTenantId(TenantId.SYS_TENANT_ID); // SisAdmin
+                            tbResource.setTenantId(TenantId.SYS_TENANT_ID);
                             tbResource.setData(data);
                             tbResource.setResourceType(ResourceType.LWM2M_MODEL);
                             tbResource.setFileName(path.toFile().getName());
@@ -306,12 +300,10 @@ public class InstallScripts {
             }
             toLwm2mResource(resource);
             resourceService.saveResource(resource);
-        } catch (Exception e) {
-            if (e.getMessage().equals("Resource with such resourceKey already exists!")) {
-                log.trace("File of lwm2m model: [{}]. [{}]", resource.getFileName(), e.getMessage());
-            } else {
-                throw e;
-            }
+        } catch (DataValidationException e) {
+            log.error("[{}] {}", resource.getFileName(), e.getMessage());
+        } catch (Exception ex) {
+            throw ex;
         }
     }
 }