Skip to content

Commit be023b8

Browse files
germanosingermanosin
authored
BE: Fixed filter comparators (#1353)
1 parent 31a0e8c commit be023b8

File tree

9 files changed

+221
-10
lines changed

9 files changed

+221
-10
lines changed

‎api/src/main/java/io/kafbat/ui/service/ConsumerGroupService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
172172
private Collection<ConsumerGroupListing> filterGroups(Collection<ConsumerGroupListing> groups, String search) {
173173
ClustersProperties.ClusterFtsProperties fts = clustersProperties.getFts();
174174
ConsumerGroupFilter filter = new ConsumerGroupFilter(groups, fts.isEnabled(), fts.getConsumers());
175-
return filter.find(search, false);
175+
return filter.find(search);
176176
}
177177

178178
private Mono<List<ConsumerGroupDescription>> loadSortedDescriptions(ReactiveAdminClient ac,

‎api/src/main/java/io/kafbat/ui/service/KafkaConnectService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private List<FullConnectorInfoDTO> filterConnectors(List<FullConnectorInfoDTO> c
161161
ClustersProperties.ClusterFtsProperties fts = clustersProperties.getFts();
162162
KafkaConnectNgramFilter filter =
163163
new KafkaConnectNgramFilter(connectors, fts.isEnabled(), fts.getConnect());
164-
return filter.find(search, false);
164+
return filter.find(search);
165165
}
166166

167167
private Stream<String> getStringsForSearch(FullConnectorInfoDTO fullConnectorInfo) {

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.google.common.cache.CacheBuilder;
66
import io.kafbat.ui.config.ClustersProperties;
77
import java.util.ArrayList;
8+
import java.util.Comparator;
89
import java.util.HashMap;
910
import java.util.HashSet;
1011
import java.util.List;
@@ -35,18 +36,18 @@ public NgramFilter(ClustersProperties.NgramProperties properties, boolean enable
3536
.asMap();
3637

3738
public List<T> find(String search) {
38-
return find(search, true);
39+
return find(search, null);
3940
}
4041

41-
public List<T> find(String search, boolean sort) {
42+
public List<T> find(String search, Comparator<T> comparator) {
4243
if (search == null || search.isBlank()) {
43-
return list(this.getItems().stream().map(Tuple2::getT2), sort);
44+
return list(this.getItems().stream().map(Tuple2::getT2), comparator);
4445
}
4546
if (!enabled) {
4647
return list(this.getItems()
4748
.stream()
4849
.filter(t -> t.getT1().stream().anyMatch(s -> CI.contains(s, search)))
49-
.map(Tuple2::getT2), sort);
50+
.map(Tuple2::getT2), comparator);
5051
}
5152
try {
5253
List<SearchResult<T>> result = new ArrayList<>();
@@ -63,18 +64,22 @@ public List<T> find(String search, boolean sort) {
6364
}
6465
}
6566
}
66-
if (sort) {
67+
68+
if (comparator == null) {
6769
result.sort((o1, o2) -> Double.compare(o2.score, o1.score));
70+
} else {
71+
result.sort((o1, o2) -> comparator.compare(o1.item, o2.item));
6872
}
73+
6974
return result.stream().map(r -> r.item).toList();
7075
} catch (Exception e) {
7176
throw new RuntimeException(e);
7277
}
7378
}
7479

75-
private List<T> list(Stream<T> stream, boolean sort) {
76-
if (sort) {
77-
return stream.sorted().toList();
80+
private List<T> list(Stream<T> stream, Comparator<T> comparator) {
81+
if (comparator != null) {
82+
return stream.sorted(comparator).toList();
7883
} else {
7984
return stream.toList();
8085
}

‎api/src/main/java/io/kafbat/ui/service/index/SchemasFilter.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ public SchemasFilter(Collection<String> subjects, boolean enabled, ClustersPrope
1414
this.subjects = subjects.stream().map(g -> Tuples.of(List.of(g), g)).toList();
1515
}
1616

17+
@Override
18+
public List<String> find(String search) {
19+
return super.find(search, String::compareTo);
20+
}
21+
1722
@Override
1823
protected List<Tuple2<List<String>, String>> getItems() {
1924
return this.subjects;

‎api/src/test/java/io/kafbat/ui/service/index/AbstractNgramFilterTest.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package io.kafbat.ui.service.index;
2+
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
5+
import io.kafbat.ui.config.ClustersProperties;
6+
import java.util.Comparator;
7+
import java.util.List;
8+
import java.util.Map;
9+
import org.junit.jupiter.params.ParameterizedTest;
10+
import org.junit.jupiter.params.provider.ValueSource;
11+
12+
abstract class AbstractNgramFilterTest<T> {
13+
private final ClustersProperties.NgramProperties ngramProperties = new ClustersProperties.NgramProperties();
14+
15+
16+
@ParameterizedTest
17+
@ValueSource(booleans = {true, false})
18+
void testFind(boolean enabled) {
19+
List<T> items = items();
20+
21+
NgramFilter<T> filter = buildFilter(items, enabled, ngramProperties);
22+
List<T> resultNoSearch = filter.find(null);
23+
assertThat(resultNoSearch).isNotEmpty().containsExactlyInAnyOrderElementsOf(items);
24+
25+
List<T> resultWithCompare = filter.find(null, comparator());
26+
assertThat(resultWithCompare).isNotEmpty().containsExactlyInAnyOrderElementsOf(items);
27+
28+
Map.Entry<String, T> example = example(items);
29+
List<T> resultNoCompare = filter.find(example.getKey());
30+
assertThat(resultNoCompare).isNotEmpty().contains(example.getValue());
31+
}
32+
33+
protected abstract NgramFilter<T> buildFilter(List<T> items,
34+
boolean enabled,
35+
ClustersProperties.NgramProperties ngramProperties);
36+
37+
protected abstract List<T> items();
38+
39+
protected abstract Comparator<T> comparator();
40+
41+
protected abstract Map.Entry<String, T> example(List<T> items);
42+
}

‎api/src/test/java/io/kafbat/ui/service/index/AclBindingFilterTest.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package io.kafbat.ui.service.index;
2+
3+
import io.kafbat.ui.config.ClustersProperties;
4+
import java.util.Comparator;
5+
import java.util.List;
6+
import java.util.Map;
7+
import java.util.stream.IntStream;
8+
import org.apache.kafka.common.acl.AccessControlEntry;
9+
import org.apache.kafka.common.acl.AclBinding;
10+
import org.apache.kafka.common.acl.AclOperation;
11+
import org.apache.kafka.common.acl.AclPermissionType;
12+
import org.apache.kafka.common.resource.PatternType;
13+
import org.apache.kafka.common.resource.ResourcePattern;
14+
import org.apache.kafka.common.resource.ResourceType;
15+
16+
public class AclBindingFilterTest extends AbstractNgramFilterTest<AclBinding> {
17+
@Override
18+
protected NgramFilter<AclBinding> buildFilter(List<AclBinding> items, boolean enabled,
19+
ClustersProperties.NgramProperties ngramProperties) {
20+
return new AclBindingNgramFilter(items, enabled, ngramProperties);
21+
}
22+
23+
@Override
24+
protected List<AclBinding> items() {
25+
return IntStream.range(0, 100).mapToObj(i ->
26+
new AclBinding(
27+
new ResourcePattern(ResourceType.TOPIC, "resource-" + i, PatternType.LITERAL),
28+
new AccessControlEntry("principal-" + i, "*", AclOperation.ALL, AclPermissionType.ALLOW)
29+
)
30+
).toList();
31+
}
32+
33+
@Override
34+
protected Comparator<AclBinding> comparator() {
35+
return Comparator.comparing(a -> a.entry().principal());
36+
}
37+
38+
@Override
39+
protected Map.Entry<String, AclBinding> example(List<AclBinding> items) {
40+
AclBinding binding = items.getFirst();
41+
return Map.entry(binding.entry().principal(), binding);
42+
}
43+
}

‎api/src/test/java/io/kafbat/ui/service/index/ConsumerGroupFilterTest.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package io.kafbat.ui.service.index;
2+
3+
import io.kafbat.ui.config.ClustersProperties;
4+
import java.util.Comparator;
5+
import java.util.List;
6+
import java.util.Map;
7+
import java.util.stream.IntStream;
8+
import org.apache.kafka.clients.admin.ConsumerGroupListing;
9+
10+
class ConsumerGroupFilterTest extends AbstractNgramFilterTest<ConsumerGroupListing> {
11+
12+
@Override
13+
protected NgramFilter<ConsumerGroupListing> buildFilter(List<ConsumerGroupListing> items,
14+
boolean enabled,
15+
ClustersProperties.NgramProperties ngramProperties) {
16+
return new ConsumerGroupFilter(items, enabled, ngramProperties);
17+
}
18+
19+
@Override
20+
protected List<ConsumerGroupListing> items() {
21+
return IntStream.range(0, 100).mapToObj(i ->
22+
new ConsumerGroupListing("resource-" + i, true)
23+
).toList();
24+
}
25+
26+
@Override
27+
protected Comparator<ConsumerGroupListing> comparator() {
28+
return Comparator.comparing(ConsumerGroupListing::groupId);
29+
}
30+
31+
@Override
32+
protected Map.Entry<String, ConsumerGroupListing> example(List<ConsumerGroupListing> items) {
33+
ConsumerGroupListing first = items.getFirst();
34+
return Map.entry(first.groupId(), first);
35+
}
36+
}

‎api/src/test/java/io/kafbat/ui/service/index/KafkaConnectNgramFilterTest.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package io.kafbat.ui.service.index;
2+
3+
import io.kafbat.ui.config.ClustersProperties;
4+
import io.kafbat.ui.model.ConnectorStateDTO;
5+
import io.kafbat.ui.model.ConnectorStatusDTO;
6+
import io.kafbat.ui.model.ConnectorTypeDTO;
7+
import io.kafbat.ui.model.FullConnectorInfoDTO;
8+
import java.util.Comparator;
9+
import java.util.List;
10+
import java.util.Map;
11+
import java.util.stream.IntStream;
12+
13+
class KafkaConnectNgramFilterTest extends AbstractNgramFilterTest<FullConnectorInfoDTO> {
14+
15+
@Override
16+
protected NgramFilter<FullConnectorInfoDTO> buildFilter(List<FullConnectorInfoDTO> items,
17+
boolean enabled,
18+
ClustersProperties.NgramProperties ngramProperties) {
19+
return new KafkaConnectNgramFilter(items, enabled, ngramProperties);
20+
}
21+
22+
@Override
23+
protected List<FullConnectorInfoDTO> items() {
24+
return IntStream.range(0, 100).mapToObj(i ->
25+
new FullConnectorInfoDTO(
26+
"connect-" + i,
27+
"connector-" + i,
28+
"class",
29+
ConnectorTypeDTO.SINK,
30+
List.of(),
31+
new ConnectorStatusDTO(ConnectorStateDTO.RUNNING, "reason"),
32+
1,
33+
0
34+
)
35+
).toList();
36+
}
37+
38+
@Override
39+
protected Comparator<FullConnectorInfoDTO> comparator() {
40+
return Comparator.comparing(FullConnectorInfoDTO::getConnect);
41+
}
42+
43+
@Override
44+
protected Map.Entry<String, FullConnectorInfoDTO> example(List<FullConnectorInfoDTO> items) {
45+
FullConnectorInfoDTO first = items.getFirst();
46+
return Map.entry(first.getConnect(), first);
47+
}
48+
}

‎api/src/test/java/io/kafbat/ui/service/index/SchemasFilterTest.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package io.kafbat.ui.service.index;
2+
3+
import io.kafbat.ui.config.ClustersProperties;
4+
import java.util.Comparator;
5+
import java.util.List;
6+
import java.util.Map;
7+
import java.util.stream.IntStream;
8+
9+
class SchemasFilterTest extends AbstractNgramFilterTest<String> {
10+
11+
@Override
12+
protected NgramFilter<String> buildFilter(List<String> items, boolean enabled,
13+
ClustersProperties.NgramProperties ngramProperties) {
14+
return new SchemasFilter(items, enabled, ngramProperties);
15+
}
16+
17+
@Override
18+
protected List<String> items() {
19+
return IntStream.range(0, 100).mapToObj(i -> "schema-" + i).toList();
20+
}
21+
22+
@Override
23+
protected Comparator<String> comparator() {
24+
return String::compareTo;
25+
}
26+
27+
@Override
28+
protected Map.Entry<String, String> example(List<String> items) {
29+
String item = items.getFirst();
30+
return Map.entry(item, item);
31+
}
32+
}

0 commit comments

Comments
 (0)