Code an die Version aus 'sumup-adder--springified' angepasst

[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 cd9da64..f3e6c8a 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -13,7 +13,7 @@ import java.util.*;
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+public class ApplicationRebalanceListener implements RebalanceListener
 {
   private final ApplicationRecordHandler recordHandler;
   private final AdderResults adderResults;
@@ -22,7 +22,7 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   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<>();
 
@@ -35,19 +35,33 @@ 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);
+        log.info(
+            "{} - Seeking to offset {} for partition {}",
+            id,
+            document.offset,
+            partition);
       }
       recordHandler.addPartition(partition, document.state);
+      for (String user : document.state.keySet())
+      {
+        log.info(
+            "{} - Restored state for partition={}|user={}: {}",
+            id,
+            partition,
+            user,
+            document.state.get(user));
+      }
       adderResults.addPartition(partition, document.results);
     });
   }
@@ -58,22 +72,32 @@ 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);
+        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(
+              "{} - 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);
+        log.info("{} - Offset commits are disabled! Last commit: {}", id, lastCommit);
       }
     });
   }
@@ -84,19 +108,37 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
   {
     if (!commitsEnabled)
     {
-      log.info("Offset commits are disabled! Last commit: {}", lastCommit);
+      log.info("{} - Offset commits are disabled! Last commit: {}", id, 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(
+      partitions
+        .stream()
+        .forEach(partition ->
+        {
+          log.info("{} - persisting state & offset for partition: {}", id, partition);
+          Map<String, AdderResult> state = recordHandler.getState(partition).getState();
+          Long offset = consumer.position(new TopicPartition(topic, partition));
+          log.info(
+            "{} - offset of next unseen message for partition {} is {}",
+            id,
+            partition,
+            offset);
+          for (String user : state.keySet())
+          {
+            log.info(
+              "{} - Saved state for partition={}|user={}: {}",
+              id,
               partition,
-              recordHandler.getState(partition).getState(),
-              adderResults.getState(partition),
-              consumer.position(new TopicPartition(topic, partition)))));
+              user,
+              state.get(user));
+          }
+          Map<String, List<AdderResult>> results = adderResults.getState(partition);
+          stateRepository.save(new StateDocument(partition, state, results, offset));
+        });
+
       lastCommit = clock.instant();
     }
   }