Vorlage für den 1. Teil der Summenformel-Übung

[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 d319295..e214a14 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -2,7 +2,7 @@ package de.juplo.kafka;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.common.TopicPartition;
 
 import java.util.*;
@@ -10,18 +10,15 @@ import java.util.*;
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRebalanceListener implements CommittingConsumerRebalanceListener
+public class ApplicationRebalanceListener implements ConsumerRebalanceListener
 {
   private final ApplicationRecordHandler recordHandler;
   private final AdderResults adderResults;
   private final StateRepository stateRepository;
   private final String id;
-  private final Consumer consumer;
 
   private final Set<Integer> partitions = new HashSet<>();
 
-  private boolean commitsEnabled = true;
-
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
   {
@@ -29,47 +26,17 @@ public class ApplicationRebalanceListener implements CommittingConsumerRebalance
     {
       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);
     });
   }
 
   @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);
+      Map<String, AdderResult> state = recordHandler.getState(partition).getState();
       for (String user : state.keySet())
       {
         log.info(
@@ -79,20 +46,6 @@ public class ApplicationRebalanceListener implements CommittingConsumerRebalance
             user,
             state.get(user));
       }
-      Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
-      stateRepository.save(new StateDocument(partition, state, results));
     });
   }
-
-  @Override
-  public void enableCommits()
-  {
-    commitsEnabled = true;
-  }
-
-  @Override
-  public void disableCommits()
-  {
-    commitsEnabled = false;
-  }
 }