X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRebalanceListener.java;h=a89c633c760c55e9ab36708b90b483cb2d96e718;hb=bfddb34a846a27a477d97eaa4db9221afbd6dbba;hp=7256732b81f9c1649021ca19e54171ca0d53307a;hpb=de4f94c45fd0678777fecba4dbcb63f89e0ebafa;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 7256732..a89c633 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -7,8 +7,7 @@ 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.Map;
+import java.util.*;
 
 
 @RequiredArgsConstructor
@@ -16,11 +15,14 @@ import java.util.Map;
 public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
 {
   private final ApplicationRecordHandler recordHandler;
+  private final AdderResults adderResults;
   private final StateRepository stateRepository;
   private final String id;
   private final Clock clock;
   private final Duration commitInterval;
 
+  private final Set<Integer> partitions = new HashSet<>();
+
   private Instant lastCommit = Instant.EPOCH;
 
   @Override
@@ -30,11 +32,22 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
     {
       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));
       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);
     });
   }
 
@@ -45,17 +58,19 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
     {
       Integer partition = tp.partition();
       log.info("{} - removing partition: {}", id, partition);
-      Map<String, Long> removed = recordHandler.removePartition(partition);
-      for (String key : removed.keySet())
+      this.partitions.remove(partition);
+      Map<String, AdderResult> state = recordHandler.removePartition(partition);
+      for (String user : state.keySet())
       {
         log.info(
-            "{} - Seen {} messages for partition={}|key={}",
+            "{} - Saved state for partition={}|user={}: {}",
             id,
-            removed.get(key),
             partition,
-            key);
+            user,
+            state.get(user));
       }
-      stateRepository.save(new StateDocument(partition, removed));
+      Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
+      stateRepository.save(new StateDocument(partition, state, results));
     });
   }
 
@@ -66,10 +81,11 @@ public class ApplicationRebalanceListener implements PollIntervalAwareConsumerRe
     if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
     {
       log.debug("Storing data, last commit: {}", lastCommit);
-      recordHandler.getState().forEach((partiton, adder) -> stateRepository.save(
+      partitions.forEach(partition -> stateRepository.save(
           new StateDocument(
-              partiton,
-              adder.getState())));
+              partition,
+              recordHandler.getState(partition).getState(),
+              adderResults.getState(partition))));
       lastCommit = clock.instant();
     }
   }