X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=32e14e8159774f1421cb65a045939ac27e7e0e28;hb=1c6d263c619010d23bf502c14dda45db11a2baf6;hp=cd9da64538cf0097d669fc26606120f72aba4d90;hpb=d2eb370acf1a2195c36421ffc471f67cb4a8e86e;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
index cd9da64..32e14e8 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -2,7 +2,6 @@ package de.juplo.kafka;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.common.TopicPartition;
 
 import java.time.Clock;
@@ -19,15 +18,12 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   private final AdderResults adderResults;
   private final StateRepository stateRepository;
   private final String id;
-  private final String topic;
   private final Clock clock;
   private final Duration commitInterval;
-  private final Consumer<String, String> consumer;
 
   private final Set<Integer> partitions = new HashSet<>();
 
   private Instant lastCommit = Instant.EPOCH;
-  private boolean commitsEnabled = true;
 
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
@@ -35,18 +31,12 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
+      log.info("{} - adding partition: {}", id, partition);
       this.partitions.add(partition);
       StateDocument document =
           stateRepository
               .findById(Integer.toString(partition))
               .orElse(new StateDocument(partition));
-      log.info("{} - adding partition: {}, offset={}", id, partition, document.offset);
-      if (document.offset >= 0)
-      {
-        // Only seek, if a stored offset was found
-        // Otherwise: Use initial offset, generated by Kafka
-        consumer.seek(tp, document.offset);
-      }
       recordHandler.addPartition(partition, document.state);
       adderResults.addPartition(partition, document.results);
     });
@@ -58,23 +48,20 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
+      log.info("{} - removing partition: {}", id, partition);
       this.partitions.remove(partition);
-      Long offset = consumer.position(tp);
-      log.info(
-          "{} - removing partition: {}, offset of next message {})",
-          id,
-          partition,
-          offset);
-      if (commitsEnabled)
-      {
-        Map<String, AdderResult> state = recordHandler.removePartition(partition);
-        Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
-        stateRepository.save(new StateDocument(partition, state, results, offset));
-      }
-      else
+      Map<String, AdderResult> state = recordHandler.removePartition(partition);
+      for (String key : state.keySet())
       {
-        log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+        log.info(
+            "{} - Seen {} messages for partition={}|key={}",
+            id,
+            state.get(key),
+            partition,
+            key);
       }
+      Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
+      stateRepository.save(new StateDocument(partition, state, results));
     });
   }
 
@@ -82,34 +69,15 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   @Override
   public void beforeNextPoll()
   {
-    if (!commitsEnabled)
-    {
-      log.info("Offset commits are disabled! Last commit: {}", lastCommit);
-      return;
-    }
-
     if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
     {
-      log.debug("Storing data and offsets, last commit: {}", lastCommit);
+      log.debug("Storing data, last commit: {}", lastCommit);
       partitions.forEach(partition -> stateRepository.save(
           new StateDocument(
               partition,
               recordHandler.getState(partition).getState(),
-              adderResults.getState(partition),
-              consumer.position(new TopicPartition(topic, partition)))));
+              adderResults.getState(partition))));
       lastCommit = clock.instant();
     }
   }
-
-  @Override
-  public void enableCommits()
-  {
-    commitsEnabled = true;
-  }
-
-  @Override
-  public void disableCommits()
-  {
-    commitsEnabled = false;
-  }
 }