service info sorting by service id asc

Author: dmytro-landiak

application/src/main/java/org/thingsboard/mqtt/broker/service/system/ServiceInfoDto.java

@@ -19,7 +19,7 @@
 import lombok.Data;
 
 @Data
-public class ServiceInfoDto {
+public class ServiceInfoDto implements Comparable<ServiceInfoDto> {
 
     @Schema(description = "Service Id.")
     private String serviceId;
@@ -45,4 +45,10 @@ public class ServiceInfoDto {
     public boolean isDataPresent() {
         return cpuUsage != null || cpuCount != null || memoryUsage != null || totalMemory != null || diskUsage != null || totalDiskSpace != null;
     }
+
+    @Override
+    public int compareTo(ServiceInfoDto serviceInfo) {
+        return serviceId.compareTo(serviceInfo.getServiceId());
+    }
+
 }

application/src/main/java/org/thingsboard/mqtt/broker/service/system/TbmqSystemInfoService.java

@@ -42,6 +42,7 @@
 import org.thingsboard.mqtt.broker.queue.cluster.ServiceInfoProvider;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -195,6 +196,7 @@ public ListenableFuture<PageData<ServiceInfoDto>> getServiceInfos() throws Thing
                 dto.setStatus(ServiceStatus.fromLastUpdateTime(dto.getLastUpdateTime()));
                 response.add(dto);
             }
+            Collections.sort(response);
             return new PageData<>(response, 1, response.size(), false);
         }, MoreExecutors.directExecutor());
     }