Refaktorisierungen aus 'wordcount' nach 'stored-offsets' zurück portiert

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

diff --git a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
index 9b06b09..8e2e867 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,6 +1,6 @@
 package de.juplo.kafka;
 
-import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.serialization.LongDeserializer;
 import org.apache.kafka.common.serialization.StringDeserializer;
@@ -12,7 +12,6 @@ import java.time.Clock;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.function.Consumer;
 
 
 @Configuration
@@ -20,32 +19,44 @@ import java.util.function.Consumer;
 public class ApplicationConfiguration
 {
   @Bean
-  public Consumer<ConsumerRecord<String, Long>> consumer()
+  public KeyCountingRecordHandler messageCountingRecordHandler()
   {
-    return (record) ->
-    {
-      // Handle record
-    };
+    return new KeyCountingRecordHandler();
+  }
+
+  @Bean
+  public KeyCountingRebalanceListener wordcountRebalanceListener(
+      KeyCountingRecordHandler keyCountingRecordHandler,
+      PartitionStatisticsRepository repository,
+      Consumer<String, Long> consumer,
+      ApplicationProperties properties)
+  {
+    return new KeyCountingRebalanceListener(
+        keyCountingRecordHandler,
+        repository,
+        properties.getClientId(),
+        properties.getTopic(),
+        Clock.systemDefaultZone(),
+        properties.getCommitInterval(),
+        consumer);
   }
 
   @Bean
   public EndlessConsumer<String, Long> endlessConsumer(
       KafkaConsumer<String, Long> kafkaConsumer,
       ExecutorService executor,
-      Consumer<ConsumerRecord<String, Long>> handler,
-      PartitionStatisticsRepository repository,
+      KeyCountingRebalanceListener keyCountingRebalanceListener,
+      KeyCountingRecordHandler keyCountingRecordHandler,
       ApplicationProperties properties)
   {
     return
         new EndlessConsumer<>(
             executor,
-            repository,
             properties.getClientId(),
             properties.getTopic(),
-            Clock.systemDefaultZone(),
-            properties.getCommitInterval(),
             kafkaConsumer,
-            handler);
+            keyCountingRebalanceListener,
+            keyCountingRecordHandler);
   }
 
   @Bean