Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/kafdrop/service/KafkaHighLevelConsumer.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import kafdrop.model.TopicPartitionVO;
import kafdrop.model.TopicVO;
import kafdrop.service.SearchResults.CompletionReason;
import kafdrop.util.DefaultMessageDeserializer;
import kafdrop.util.Deserializers;
import kafdrop.util.MessageDeserializer;
import org.apache.commons.lang3.tuple.Pair;
Expand Down Expand Up @@ -35,6 +36,7 @@
import java.util.Properties;
import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

@Service
public final class KafkaHighLevelConsumer {
Expand Down Expand Up @@ -277,13 +279,15 @@ private ScanStatus searchPolledRecordsOfPartition(ConsumerRecords<byte[], byte[]
ScanStatus scanStatus) {
var records = polled.records(partition);
if (!records.isEmpty()) {

var headerDeserializer = new DefaultMessageDeserializer();
scanStatus = ScanStatus.createInstance(scanStatus, records.get(0).timestamp(), records.size());
// Add to found records if it matches the search criteria
foundRecords.addAll(records.stream()
.filter(rec ->
containsValue(deserializers.getKeyDeserializer(), rec.key(), loweredSearchString) ||
containsValue(deserializers.getValueDeserializer(), rec.value(), loweredSearchString))
containsValue(deserializers.getValueDeserializer(), rec.value(), loweredSearchString) ||
StreamSupport.stream(rec.headers().spliterator(), false)
.anyMatch(h -> containsValue(headerDeserializer, h.value(), loweredSearchString)))
.map(rec -> createConsumerRecord(rec, deserializers))
.toList());
}
Expand Down