Verbesserungen aus 'stored-state' nach 'rebalance-listener' gemerged

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

diff --git a/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java b/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
index 636ff86..0ad1f31 100644 (file)
--- a/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
@@ -2,26 +2,20 @@ package de.juplo.kafka;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.common.TopicPartition;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 
 @RequiredArgsConstructor
 @Slf4j
-public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+public class KeyCountingRebalanceListener implements ConsumerRebalanceListener
 {
   private final KeyCountingRecordHandler handler;
-  private final PartitionStatisticsRepository repository;
   private final String id;
-  private final Clock clock;
-  private final Duration commitInterval;
-
-  private Instant lastCommit = Instant.EPOCH;
 
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
@@ -30,11 +24,7 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
     {
       Integer partition = tp.partition();
       log.info("{} - adding partition: {}", id, partition);
-      StatisticsDocument document =
-          repository
-              .findById(Integer.toString(partition))
-              .orElse(new StatisticsDocument(partition));
-      handler.addPartition(partition, document.statistics);
+      handler.addPartition(partition, new HashMap<>());
     });
   }
 
@@ -55,22 +45,6 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
             partition,
             key);
       }
-      repository.save(new StatisticsDocument(partition, removed));
     });
   }
-
-
-  @Override
-  public void beforeNextPoll()
-  {
-    if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
-    {
-      log.debug("Storing data, last commit: {}", lastCommit);
-      handler.getSeen().forEach((partiton, statistics) -> repository.save(
-          new StatisticsDocument(
-              partiton,
-              statistics)));
-      lastCommit = clock.instant();
-    }
-  }
 }