Fix InstallService

thingsboard · Nov 27, 2024 · c7b35a8 · c7b35a8
1 parent 1e3a688
commit c7b35a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 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
@@ -199,7 +199,7 @@ public void performInstall() {
 
                 // systemDataLoaderService.createSysAdmin();
                 systemDataLoaderService.createDefaultTenantProfiles();
-                systemDataLoaderService.createAdminSettings();
+                // systemDataLoaderService.createAdminSettings();
                 systemDataLoaderService.createRandomJwtSettings();
                 systemDataLoaderService.loadSystemWidgets();
                 // systemDataLoaderService.createOAuth2Templates();

diff --git a/.../main/java/org/thingsboard/server/service/cloud/rpc/processor/ResourceCloudProcessor.java b/.../main/java/org/thingsboard/server/service/cloud/rpc/processor/ResourceCloudProcessor.java
@@ -76,8 +76,7 @@ public ListenableFuture<Void> processResourceMsgFromCloud(TenantId tenantId, Res
     }
 
     private Pair<Boolean, TbResourceId> renamePreviousResource(TenantId tenantId, TbResourceId tbResourceId, ResourceType resourceType, String resourceKey) {
-        PageDataIterable<TbResource> resourcesIterable = new PageDataIterable<>(
-                link -> resourceService.findTenantResourcesByResourceTypeAndPageLink(tenantId, resourceType, link), 1024);
+        PageDataIterable<TbResource> resourcesIterable = new PageDataIterable<>(link -> resourceService.findTenantResourcesByResourceTypeAndPageLink(tenantId, resourceType, link), 1024);
         for (TbResource tbResource : resourcesIterable) {
             if (tbResource.getResourceKey().equals(resourceKey) && !tbResourceId.equals(tbResource.getId())) {
                 tbResource.setResourceKey(StringUtils.randomAlphanumeric(15) + resourceKey);