BE: Issue#1332 Sort based on prefix offsets

Author: germanosin

api/src/main/java/io/kafbat/ui/service/acl/AclsService.java

@@ -75,10 +75,7 @@ public Flux<AclBinding> listAcls(KafkaCluster cluster, ResourcePatternFilter fil
                                    Boolean fts) {
     return adminClientService.get(cluster)
       .flatMap(c -> c.listAcls(filter))
-      .flatMapIterable(acls -> acls)
-      .filter(acl -> principalSearch == null || acl.entry().principal().contains(principalSearch))
-      .collectList()
-      .map(lst -> filter(lst, principalSearch, fts))
+      .map(lst -> filter(new ArrayList<>(lst), principalSearch, fts))
       .flatMapMany(Flux::fromIterable)
       .sort(Comparator.comparing(AclBinding::toString));  //sorting to keep stable order on different calls
   }

api/src/main/java/io/kafbat/ui/service/index/NgramFilter.java

@@ -10,9 +10,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.stream.Stream;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -125,7 +122,7 @@ static List<String> tokenizeString(Analyzer analyzer, String text) {
   }
 
   @SneakyThrows
-  static List<String> tokenizeStringSimple(Analyzer analyzer, String text) {
+  public static List<String> tokenizeStringSimple(Analyzer analyzer, String text) {
     List<String> tokens = new ArrayList<>();
     try (TokenStream tokenStream = analyzer.tokenStream(null, text)) {
       CharTermAttribute attr = tokenStream.addAttribute(CharTermAttribute.class);

api/src/main/java/io/kafbat/ui/service/index/ShortWordNGramAnalyzer.java

@@ -8,7 +8,7 @@
 import org.apache.lucene.analysis.ngram.NGramTokenFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 
-class ShortWordNGramAnalyzer extends Analyzer {
+public class ShortWordNGramAnalyzer extends Analyzer {
   private final int minGram;
   private final int maxGram;
   private final boolean preserveOriginal;

api/src/test/java/io/kafbat/ui/service/index/ShortWordNGramAnalyzerTest.java

@@ -0,0 +1,41 @@
+package io.kafbat.ui.service.index;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class ShortWordNGramAnalyzerTest {
+
+  @ParameterizedTest
+  @MethodSource("provider")
+  public void testOffsets(String name, List<String> parts) {
+    ShortWordNGramAnalyzer analyzer = new ShortWordNGramAnalyzer(2, 4);
+    List<String> strings = NgramFilter.tokenizeString(analyzer, name);
+    assertThat(strings).isEqualTo(parts);
+  }
+
+  public static Stream<Arguments> provider() {
+    return Stream.of(
+        Arguments.of("hello.world.text", List.of(
+            "he","hel","hell","el","ell","ello","ll","llo","lo","hello",
+            "wo","wor","worl","or","orl","orld","rl","rld","ld","world","te",
+            "tex","text","ex","ext","xt"
+        )),
+        Arguments.of("helloWorldText", List.of(
+            "he","hel","hell","el","ell","ello","ll","llo","lo","hello",
+            "wo","wor","worl","or","orl","orld","rl","rld","ld","world","te",
+            "tex","text","ex","ext","xt"
+
+        )),
+        Arguments.of("hello:world:text", List.of(
+            "he","hel","hell","el","ell","ello","ll","llo","lo","hello",
+            "wo","wor","worl","or","orl","orld","rl","rld","ld","world","te",
+            "tex","text","ex","ext","xt"
+        ))
+    );
+  }
+}

api/src/test/java/io/kafbat/ui/service/index/lucene/ShortWordAnalyzerTest.java

@@ -50,6 +50,12 @@ public static Stream<Arguments> provider() {
             Tuples.of("hello", 0, 5),
             Tuples.of("world", 5, 10),
             Tuples.of("text", 10, 14)
+        )),
+        Arguments.of("hello:world:text", List.of(
+            Tuples.of("hello:world:text", 0, 16),
+            Tuples.of("hello", 0, 5),
+            Tuples.of("world", 6, 11),
+            Tuples.of("text", 12, 16)
         ))
     );
   }