X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=da725551acf71c392c8135f4e4291d01cf5273c4;hb=refs%2Fheads%2Fsumup-adder--stored-offsets;hp=d31929519e61a4a6fc18f84e4590a7295f757c4f;hpb=384ed293b9d6d71f68031f92bd7bf60670a7ba4b;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 d319295..da72555 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -10,18 +10,17 @@ import java.util.*;
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements CommittingConsumerRebalanceListener
+public class ApplicationRebalanceListener implements RebalanceListener
 {
   private final ApplicationRecordHandler recordHandler;
   private final AdderResults adderResults;
   private final StateRepository stateRepository;
   private final String id;
+  private final String topic;
   private final Consumer consumer;
 
   private final Set<Integer> partitions = new HashSet<>();
 
-  private boolean commitsEnabled = true;
-
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
   {
@@ -34,6 +33,12 @@ public class ApplicationRebalanceListener implements CommittingConsumerRebalance
           stateRepository
               .findById(Integer.toString(partition))
               .orElse(new StateDocument(partition));
+      log.info(
+        "{} - Offset of next unseen message for partition {}: {}",
+        id,
+        partition,
+        document.offset);
+      consumer.seek(tp, document.offset);
       recordHandler.addPartition(partition, document.state);
       for (String user : document.state.keySet())
       {
@@ -51,25 +56,18 @@ public class ApplicationRebalanceListener implements CommittingConsumerRebalance
   @Override
   public void onPartitionsRevoked(Collection<TopicPartition> partitions)
   {
-    if (commitsEnabled)
-    {
-      log.info("{} - Commiting offsets for all previously assigned partitions", id);
-      try
-      {
-        consumer.commitSync();
-      }
-      catch (Exception e)
-      {
-        log.warn("{} - Could not commit offsets in onPartitionsRevoked():", id, e);
-      }
-    }
-
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
       log.info("{} - removing partition: {}", id, partition);
       this.partitions.remove(partition);
       Map<String, AdderResult> state = recordHandler.removePartition(partition);
+      Long offset = consumer.position(tp);
+      log.info(
+          "{} - offset of next unseen message for partition {} is {}",
+          id,
+          partition,
+          offset);
       for (String user : state.keySet())
       {
         log.info(
@@ -80,19 +78,7 @@ public class ApplicationRebalanceListener implements CommittingConsumerRebalance
             state.get(user));
       }
       Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
-      stateRepository.save(new StateDocument(partition, state, results));
+      stateRepository.save(new StateDocument(partition, state, results, offset));
     });
   }
-
-  @Override
-  public void enableCommits()
-  {
-    commitsEnabled = true;
-  }
-
-  @Override
-  public void disableCommits()
-  {
-    commitsEnabled = false;
-  }
 }