Merge branch rebalance-listener into counting-consumer

[demos/kafka/training] / src / main / java / de / juplo / kafka / EndlessConsumer.java

diff --git a/src/main/java/de/juplo/kafka/EndlessConsumer.java b/src/main/java/de/juplo/kafka/EndlessConsumer.java
index c7bc852..357a0b4 100644 (file)
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -1,17 +1,18 @@
 package de.juplo.kafka;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.WakeupException;
 import org.apache.kafka.common.serialization.StringDeserializer;
 
 import javax.annotation.PreDestroy;
 import java.time.Duration;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -33,7 +34,7 @@ public class EndlessConsumer implements Runnable
   private KafkaConsumer<String, String> consumer = null;
   private Future<?> future = null;
 
-  private final Map<TopicPartition, PartitionStatistics> seen = new HashMap<>();
+  private Map<Integer, Map<String, Integer>> seen;
 
 
   public EndlessConsumer(
@@ -69,37 +70,9 @@ public class EndlessConsumer implements Runnable
       this.consumer = new KafkaConsumer<>(props);
 
       log.info("{} - Subscribing to topic {}", id, topic);
-      consumer.subscribe(Arrays.asList(topic), new ConsumerRebalanceListener()
-      {
-        @Override
-        public void onPartitionsRevoked(Collection<TopicPartition> partitions)
-        {
-          partitions.forEach(tp ->
-          {
-            log.info("{} - removing partition: {}", id, tp);
-            PartitionStatistics removed = seen.remove(tp);
-            for (KeyCounter counter : removed.getStatistics())
-            {
-              log.info(
-                  "{} - Seen {} messages for partition={}|key={}",
-                  id,
-                  counter.getResult(),
-                  removed.getPartition(),
-                  counter.getKey());
-            }
-          });
-        }
+      consumer.subscribe(Arrays.asList(topic));
 
-        @Override
-        public void onPartitionsAssigned(Collection<TopicPartition> partitions)
-        {
-          partitions.forEach(tp ->
-          {
-            log.info("{} - adding partition: {}", id, tp);
-            seen.put(tp, new PartitionStatistics(tp));
-          });
-        }
-      });
+      seen = new HashMap<>();
 
       while (true)
       {
@@ -121,9 +94,20 @@ public class EndlessConsumer implements Runnable
               record.value()
           );
 
-          TopicPartition partition = new TopicPartition(record.topic(), record.partition());
+          Integer partition = record.partition();
           String key = record.key() == null ? "NULL" : record.key();
-          seen.get(partition).increment(key);
+
+          if (!seen.containsKey(partition))
+            seen.put(partition, new HashMap<>());
+
+          Map<String, Integer> byKey = seen.get(partition);
+
+          if (!byKey.containsKey(key))
+            byKey.put(key, 0);
+
+          int seenByKey = byKey.get(key);
+          seenByKey++;
+          byKey.put(key, seenByKey);
         }
       }
     }
@@ -140,11 +124,27 @@ public class EndlessConsumer implements Runnable
     {
       log.info("{} - Closing the KafkaConsumer", id);
       consumer.close();
+
+      for (Integer partition : seen.keySet())
+      {
+        Map<String, Integer> byKey = seen.get(partition);
+        for (String key : byKey.keySet())
+        {
+          log.info(
+              "{} - Seen {} messages for partition={}|key={}",
+              id,
+              byKey.get(key),
+              partition,
+              key);
+        }
+      }
+      seen = null;
+
       log.info("{} - Consumer-Thread exiting", id);
     }
   }
 
-  public Map<TopicPartition, PartitionStatistics> getSeen()
+  public Map<Integer, Map<String, Integer>> getSeen()
   {
     return seen;
   }