Rückbau auf einen Consumer, der in `onPartitionsRevoked()` immer committed

[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 9e75112..eef0d00 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRebalanceListener.java
@@ -6,22 +6,18 @@ import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.common.TopicPartition;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.*;
-import java.util.concurrent.CountDownLatch;
 
 
 @RequiredArgsConstructor
 @Slf4j
 public class ApplicationRebalanceListener implements ConsumerRebalanceListener
 {
-  private final Consumer consumer;
   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<>();
 
@@ -55,22 +51,14 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
   public void onPartitionsRevoked(Collection<TopicPartition> partitions)
   {
     log.info("{} - Commiting offsets for all previously assigned partitions", id);
-    CountDownLatch commitDone = new CountDownLatch(1);
-    consumer.commitAsync((offsets, e) ->
+    try
     {
-      commitDone.countDown();
-      if (e == null)
-      {
-        log.error("{} - Could not commit offsets to Kafka!", id, e);
-      }
-      else
-      {
-        offsets.entrySet().stream().forEach(entry ->
-        {
-          log.info("{} - Commited offset for {}: {}", id, entry.getKey(), entry.getValue());
-        });
-      }
-    });
+      consumer.commitSync();
+    }
+    catch (Exception e)
+    {
+      log.warn("{} - Could not commit offsets in onPartitionsRevoked():", id, e);
+    }
 
     partitions.forEach(tp ->
     {
@@ -90,19 +78,5 @@ public class ApplicationRebalanceListener implements ConsumerRebalanceListener
       Map<String, List<AdderResult>> results = adderResults.removePartition(partition);
       stateRepository.save(new StateDocument(partition, state, results));
     });
-
-    try
-    {
-      log.debug("{} - Waiting for async commit to complete", id);
-      commitDone.await();
-    }
-    catch (InterruptedException e)
-    {
-      log.warn(
-        "{} - Interrupted while waiting for async commit in onPartitionsRevoked({})",
-        id,
-        partitions,
-        e);
-    }
   }
 }