Fixes

Author: germanosin

api/src/main/java/io/kafbat/ui/config/ClustersProperties.java

@@ -232,7 +232,7 @@ public static class FtsProperties {
   @AllArgsConstructor
   public static class ClusterFtsProperties {
     boolean enabled = false;
-    FtsProperties topics = new FtsProperties(true, 3, 5);
+    FtsProperties topics = new FtsProperties(false, 3, 5);
     FtsProperties schemas = new FtsProperties(true, 1, 4);
     FtsProperties consumers = new FtsProperties(true, 1, 4);
     FtsProperties connect = new FtsProperties(true, 1, 4);

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

@@ -130,22 +130,11 @@ public List<InternalTopic> find(String search, Boolean showInternal,
         }
         nameQuery = builder.build();
       } else {
-        QueryParser queryParser = new QueryParser(FIELD_NAME, this.analyzer);
+        QueryParser queryParser = new PrefixQueryParser(FIELD_NAME, this.analyzer);
         queryParser.setDefaultOperator(QueryParser.Operator.AND);
 
         try {
           nameQuery = queryParser.parse(search);
-
-          if (!search.contains(" ") && !search.contains("*")) {
-            String wildcardSearch = search + "*";
-            Query wildCardNameQuery = queryParser.parse(wildcardSearch);
-            BooleanQuery.Builder withWildcard = new BooleanQuery.Builder();
-            withWildcard.add(nameQuery, BooleanClause.Occur.SHOULD);
-            withWildcard.add(wildCardNameQuery, BooleanClause.Occur.SHOULD);
-            nameQuery = withWildcard.build();
-          }
-
-
         } catch (Exception e) {
           throw new RuntimeException(e);
         }

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

@@ -0,0 +1,42 @@
+package io.kafbat.ui.service.index;
+
+import static org.apache.lucene.search.BoostAttribute.DEFAULT_BOOST;
+
+import java.util.Optional;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.IntPoint;
+import org.apache.lucene.document.LongPoint;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.PrefixQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
+
+public class PrefixQueryParser extends QueryParser {
+  
+  public PrefixQueryParser(String field, Analyzer analyzer) {
+    super(field, analyzer);
+  }
+
+  @Override
+  protected Query newTermQuery(Term term, float boost) {
+
+    TopicsIndex.FieldType fieldType = Optional.ofNullable(term.field())
+        .map(TopicsIndex.FIELD_TYPES::get)
+        .orElse(TopicsIndex.FieldType.STRING);
+
+    Query query =  switch (fieldType) {
+      case STRING -> new PrefixQuery(term);
+      case INT -> IntPoint.newExactQuery(term.field(), Integer.parseInt(term.text()));
+      case LONG -> LongPoint.newExactQuery(term.field(), Long.parseLong(term.text()));
+      case BOOLEAN -> new TermQuery(term);
+    };
+
+    if (boost == DEFAULT_BOOST) {
+      return query;
+    }
+    return new BoostQuery(query, boost);
+  }
+
+}

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

@@ -2,6 +2,7 @@
 
 import io.kafbat.ui.model.InternalTopic;
 import java.util.List;
+import java.util.Map;
 
 public interface TopicsIndex extends AutoCloseable {
   String FIELD_NAME = "name";
@@ -11,6 +12,22 @@ public interface TopicsIndex extends AutoCloseable {
   String FIELD_SIZE = "size";
   String FIELD_CONFIG_PREFIX = "config";
 
+  enum FieldType {
+    STRING,
+    INT,
+    LONG,
+    BOOLEAN
+  }
+
+  Map<String, FieldType> FIELD_TYPES = Map.of(
+      FIELD_NAME, FieldType.STRING,
+      FIELD_INTERNAL, FieldType.BOOLEAN,
+      FIELD_PARTITIONS, FieldType.INT,
+      FIELD_REPLICATION, FieldType.INT,
+      FIELD_SIZE, FieldType.LONG,
+      FIELD_CONFIG_PREFIX, FieldType.STRING
+  );
+
   default List<InternalTopic> find(String search, Boolean showInternal, Integer count) {
     return this.find(search, showInternal, FIELD_NAME, count);
   }

api/src/test/java/io/kafbat/ui/service/index/TopicsIndexTest.java renamed to api/src/test/java/io/kafbat/ui/service/index/LuceneTopicsIndexTest.java

@@ -1,17 +1,21 @@
 package io.kafbat.ui.service.index;
 
 import io.kafbat.ui.config.ClustersProperties;
+import io.kafbat.ui.model.InternalPartition;
 import io.kafbat.ui.model.InternalTopic;
 import io.kafbat.ui.model.InternalTopicConfig;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
-class TopicsIndexTest {
+class LuceneTopicsIndexTest {
   @Test
   void testFindTopicsByName() throws Exception {
     List<InternalTopic> topics = new ArrayList<>(
@@ -36,6 +40,14 @@ void testFindTopicsByName() throws Exception {
         List.of(
             InternalTopic.builder().name("configurable").partitions(Map.of()).topicConfigs(
                 List.of(InternalTopicConfig.builder().name("retention").value("compact").build())
+            ).build(),
+            InternalTopic.builder().name("multiple_parts").partitionCount(10).partitions(
+                IntStream.range(0, 10).mapToObj(i ->
+                    InternalPartition.builder().partition(i).build()
+                ).collect(Collectors.toMap(
+                    InternalPartition::getPartition,
+                    Function.identity()
+                ))
             ).build()
         )
     );
@@ -68,6 +80,7 @@ void testFindTopicsByName() throws Exception {
 
     HashMap<String, Integer> indexExamples = new HashMap<>(examples);
     indexExamples.put("config_retention:compact", 1);
+    indexExamples.put("partitions:10", 1);
 
     try (LuceneTopicsIndex index = new LuceneTopicsIndex(topics,
         new ClustersProperties.FtsProperties(false, 1, 4))) {