From 1c29bcb0567b3d1fbdff0b9b2372ab4dabb003bf Mon Sep 17 00:00:00 2001 From: iliax Date: Fri, 12 May 2023 12:53:04 +0400 Subject: [PATCH] sorting ACL list results to keep stable order on different calls --- .../java/com/provectus/kafka/ui/service/acl/AclsService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java index 8c5a8dab06..c2ab1b5eb4 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java @@ -3,6 +3,7 @@ package com.provectus.kafka.ui.service.acl; import com.google.common.collect.Sets; import com.provectus.kafka.ui.model.KafkaCluster; import com.provectus.kafka.ui.service.AdminClientService; +import java.util.Comparator; import java.util.List; import java.util.Set; import lombok.RequiredArgsConstructor; @@ -39,7 +40,8 @@ public class AclsService { public Flux listAcls(KafkaCluster cluster, ResourcePatternFilter filter) { return adminClientService.get(cluster) .flatMap(c -> c.listAcls(filter)) - .flatMapIterable(acls -> acls); + .flatMapIterable(acls -> acls) + .sort(Comparator.comparing(AclBinding::toString)); //sorting to keep stable order on different calls } public Mono getAclAsCsvString(KafkaCluster cluster) {