Verbesserungen / Korrekturen aus `sumup-adder--ohne-stored-offsets' gemerged

[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 d48c027..e4ac1ab 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -8,6 +8,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.time.Clock;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -18,21 +19,34 @@ import java.util.concurrent.Executors;
 public class ApplicationConfiguration
 {
   @Bean
-  public WordcountRecordHandler wordcountRecordHandler()
+  public ApplicationRecordHandler recordHandler(
+      AdderResults adderResults,
+      ApplicationProperties properties)
+  {
+    return new ApplicationRecordHandler(
+        adderResults,
+        Optional.ofNullable(properties.getThrottle()),
+        properties.getClientId());
+  }
+
+  @Bean
+  public AdderResults adderResults()
   {
-    return new WordcountRecordHandler();
+    return new AdderResults();
   }
 
   @Bean
-  public WordcountRebalanceListener wordcountRebalanceListener(
-      WordcountRecordHandler wordcountRecordHandler,
-      PartitionStatisticsRepository repository,
+  public ApplicationRebalanceListener rebalanceListener(
+      ApplicationRecordHandler recordHandler,
+      AdderResults adderResults,
+      StateRepository stateRepository,
       Consumer<String, String> consumer,
       ApplicationProperties properties)
   {
-    return new WordcountRebalanceListener(
-        wordcountRecordHandler,
-        repository,
+    return new ApplicationRebalanceListener(
+        recordHandler,
+        adderResults,
+        stateRepository,
         properties.getClientId(),
         properties.getTopic(),
         Clock.systemDefaultZone(),
@@ -44,8 +58,8 @@ public class ApplicationConfiguration
   public EndlessConsumer<String, String> endlessConsumer(
       KafkaConsumer<String, String> kafkaConsumer,
       ExecutorService executor,
-      WordcountRebalanceListener wordcountRebalanceListener,
-      WordcountRecordHandler wordcountRecordHandler,
+      ApplicationRebalanceListener rebalanceListener,
+      ApplicationRecordHandler recordHandler,
       ApplicationProperties properties)
   {
     return
@@ -54,8 +68,8 @@ public class ApplicationConfiguration
             properties.getClientId(),
             properties.getTopic(),
             kafkaConsumer,
-            wordcountRebalanceListener,
-            wordcountRecordHandler);
+            rebalanceListener,
+            recordHandler);
   }
 
   @Bean