X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=d48c027bc09bf860465de460182cd2e74f73fe0e;hb=feea88916b49420021313112a217bce261868978;hp=9b06b09367f7cf748dd6d770bd517ee4fcbede38;hpb=ecd63311e0b6af698185bcf1e085f2b3237bd264;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
index 9b06b09..d48c027 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,8 +1,7 @@
 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;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -12,7 +11,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 +18,44 @@ import java.util.function.Consumer;
 public class ApplicationConfiguration
 {
   @Bean
-  public Consumer<ConsumerRecord<String, Long>> consumer()
+  public WordcountRecordHandler wordcountRecordHandler()
   {
-    return (record) ->
-    {
-      // Handle record
-    };
+    return new WordcountRecordHandler();
   }
 
   @Bean
-  public EndlessConsumer<String, Long> endlessConsumer(
-      KafkaConsumer<String, Long> kafkaConsumer,
-      ExecutorService executor,
-      Consumer<ConsumerRecord<String, Long>> handler,
+  public WordcountRebalanceListener wordcountRebalanceListener(
+      WordcountRecordHandler wordcountRecordHandler,
       PartitionStatisticsRepository repository,
+      Consumer<String, String> consumer,
+      ApplicationProperties properties)
+  {
+    return new WordcountRebalanceListener(
+        wordcountRecordHandler,
+        repository,
+        properties.getClientId(),
+        properties.getTopic(),
+        Clock.systemDefaultZone(),
+        properties.getCommitInterval(),
+        consumer);
+  }
+
+  @Bean
+  public EndlessConsumer<String, String> endlessConsumer(
+      KafkaConsumer<String, String> kafkaConsumer,
+      ExecutorService executor,
+      WordcountRebalanceListener wordcountRebalanceListener,
+      WordcountRecordHandler wordcountRecordHandler,
       ApplicationProperties properties)
   {
     return
         new EndlessConsumer<>(
             executor,
-            repository,
             properties.getClientId(),
             properties.getTopic(),
-            Clock.systemDefaultZone(),
-            properties.getCommitInterval(),
             kafkaConsumer,
-            handler);
+            wordcountRebalanceListener,
+            wordcountRecordHandler);
   }
 
   @Bean
@@ -55,7 +65,7 @@ public class ApplicationConfiguration
   }
 
   @Bean(destroyMethod = "close")
-  public KafkaConsumer<String, Long> kafkaConsumer(ApplicationProperties properties)
+  public KafkaConsumer<String, String> kafkaConsumer(ApplicationProperties properties)
   {
     Properties props = new Properties();
 
@@ -67,7 +77,7 @@ public class ApplicationConfiguration
     props.put("auto.offset.reset", properties.getAutoOffsetReset());
     props.put("metadata.max.age.ms", "1000");
     props.put("key.deserializer", StringDeserializer.class.getName());
-    props.put("value.deserializer", LongDeserializer.class.getName());
+    props.put("value.deserializer", StringDeserializer.class.getName());
 
     return new KafkaConsumer<>(props);
   }