Rückbau der Berücksichtigung von `auto.offset.rest`, wenn Offset unbekannt

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

diff --git a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
index 109b205..da72555 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -5,30 +5,22 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.common.TopicPartition;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.*;
 
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+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 Clock clock;
-  private final Duration commitInterval;
-  private final Consumer<String, String> consumer;
+  private final Consumer consumer;
 
   private final Set<Integer> partitions = new HashSet<>();
 
-  private Instant lastCommit = Instant.EPOCH;
-  private boolean commitsEnabled = true;
-
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
   {
@@ -41,17 +33,12 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
           stateRepository
               .findById(Integer.toString(partition))
               .orElse(new StateDocument(partition));
-      if (document.offset >= 0)
-      {
-        // Only seek, if a stored offset was found
-        // Otherwise: Use initial offset, generated by Kafka
-        consumer.seek(tp, document.offset);
-        log.info(
-            "{} - Seeking to offset {} for partition {}",
-            id,
-            document.offset,
-            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())
       {
@@ -74,66 +61,24 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
       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);
-      if (commitsEnabled)
+      log.info(
+          "{} - offset of next unseen message for partition {} is {}",
+          id,
+          partition,
+          offset);
+      for (String user : state.keySet())
       {
         log.info(
-            "{} - Storing {} as offset of next message for partition {}",
+            "{} - Saved state for partition={}|user={}: {}",
             id,
-            offset,
-            partition);
-        Map<String, AdderResult> state = recordHandler.removePartition(partition);
-        for (String user : state.keySet())
-        {
-          log.info(
-              "{} - Saved state for partition={}|user={}: {}",
-              id,
-              partition,
-              user,
-              state.get(user));
-        }
-        Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
-        stateRepository.save(new StateDocument(partition, state, results, offset));
-      }
-      else
-      {
-        log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+            partition,
+            user,
+            state.get(user));
       }
+      Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
+      stateRepository.save(new StateDocument(partition, state, results, offset));
     });
   }
-
-
-  @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);
-      partitions.forEach(partition -> stateRepository.save(
-          new StateDocument(
-              partition,
-              recordHandler.getState(partition).getState(),
-              adderResults.getState(partition),
-              consumer.position(new TopicPartition(topic, partition)))));
-      lastCommit = clock.instant();
-    }
-  }
-
-  @Override
-  public void enableCommits()
-  {
-    commitsEnabled = true;
-  }
-
-  @Override
-  public void disableCommits()
-  {
-    commitsEnabled = false;
-  }
 }