From 4ca4e94ce58286996f7a7615dfe08057cfcce2dd Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 20 Nov 2024 15:57:19 +0200
Subject: [PATCH] Sort exported resources

---
 .../thingsboard/server/dao/resource/BaseResourceService.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
index 871daddf11..22aa2ae748 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
@@ -60,6 +60,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -206,6 +207,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     @Override
     public List<ResourceExportData> exportResources(TenantId tenantId, Collection<TbResourceInfo> resources) {
         return resources.stream()
+                .sorted(Comparator.comparing(TbResourceInfo::getResourceType).thenComparing(TbResourceInfo::getResourceKey))
                 .map(resourceInfo -> {
                     if (resourceInfo.getResourceType() == ResourceType.IMAGE) {
                         ResourceExportData imageExportData = imageService.exportImage(resourceInfo);