Verbesserungen aus 'stored-state' nach 'rebalance-listener' 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 3925fcb..7a0a8ad 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,6 +1,5 @@
 package de.juplo.kafka;
 
-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;
@@ -8,7 +7,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.time.Clock;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -19,26 +17,19 @@ import java.util.concurrent.Executors;
 public class ApplicationConfiguration
 {
   @Bean
-  public KeyCountingRecordHandler messageCountingRecordHandler()
+  public KeyCountingRecordHandler keyCountingRecordHandler()
   {
     return new KeyCountingRecordHandler();
   }
 
   @Bean
-  public KeyCountingRebalanceListener wordcountRebalanceListener(
+  public KeyCountingRebalanceListener keyCountingRebalanceListener(
       KeyCountingRecordHandler keyCountingRecordHandler,
-      PartitionStatisticsRepository repository,
-      Consumer<String, Long> consumer,
       ApplicationProperties properties)
   {
     return new KeyCountingRebalanceListener(
         keyCountingRecordHandler,
-        repository,
-        properties.getClientId(),
-        properties.getTopic(),
-        Clock.systemDefaultZone(),
-        properties.getCommitInterval(),
-        consumer);
+        properties.getClientId());
   }
 
   @Bean
@@ -74,7 +65,6 @@ public class ApplicationConfiguration
     props.put("partition.assignment.strategy", "org.apache.kafka.clients.consumer.CooperativeStickyAssignor");
     props.put("group.id", properties.getGroupId());
     props.put("client.id", properties.getClientId());
-    props.put("enable.auto.commit", false);
     props.put("auto.offset.reset", properties.getAutoOffsetReset());
     props.put("auto.commit.interval.ms", (int)properties.getCommitInterval().toMillis());
     props.put("metadata.max.age.ms", "1000");