X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=f8bf8576eb6b0ae99f12699c373a3f00bebaf29d;hb=f095f71a104fcde025a63f87ba75eb5cb3136656;hp=973e973271d601ff4b0d8026d413505c0bf6f4ce;hpb=c9d7601fc551069cd3a77da06a6333f22101a8a0;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 973e973..f8bf857 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,84 +1,69 @@
 package de.juplo.kafka;
 
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.common.serialization.StringDeserializer;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 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;
+import java.util.Optional;
+
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
 
 
 @Configuration
-@EnableConfigurationProperties(ApplicationProperties.class)
+@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
 public class ApplicationConfiguration
 {
   @Bean
-  public AdderRecordHandler sumRecordHandler()
+  public ApplicationRecordHandler applicationRecordHandler(
+      AdderResults adderResults,
+      KafkaProperties kafkaProperties,
+      ApplicationProperties applicationProperties)
   {
-    return new AdderRecordHandler();
+    return new ApplicationRecordHandler(
+        adderResults,
+        Optional.ofNullable(applicationProperties.getThrottle()),
+        kafkaProperties.getClientId());
   }
 
   @Bean
-  public AdderRebalanceListener sumRebalanceListener(
-      AdderRecordHandler adderRecordHandler,
-      PartitionStatisticsRepository repository,
-      Consumer<String, String> consumer,
-      ApplicationProperties properties)
+  public AdderResults adderResults()
   {
-    return new AdderRebalanceListener(
-        adderRecordHandler,
-        repository,
-        properties.getClientId(),
-        properties.getTopic(),
-        Clock.systemDefaultZone(),
-        properties.getCommitInterval(),
-        consumer);
+    return new AdderResults();
   }
 
   @Bean
-  public EndlessConsumer<String, String> endlessConsumer(
-      KafkaConsumer<String, String> kafkaConsumer,
-      ExecutorService executor,
-      AdderRebalanceListener adderRebalanceListener,
-      AdderRecordHandler adderRecordHandler,
-      ApplicationProperties properties)
+  public ApplicationRebalanceListener rebalanceListener(
+      ApplicationRecordHandler recordHandler,
+      AdderResults adderResults,
+      StateRepository stateRepository,
+      KafkaProperties kafkaProperties)
   {
-    return
-        new EndlessConsumer<>(
-            executor,
-            properties.getClientId(),
-            properties.getTopic(),
-            kafkaConsumer,
-            adderRebalanceListener,
-            adderRecordHandler);
+    return new ApplicationRebalanceListener(
+        recordHandler,
+        adderResults,
+        stateRepository,
+        kafkaProperties.getClientId());
   }
 
   @Bean
-  public ExecutorService executor()
+  public ApplicationErrorHandler applicationErrorHandler()
   {
-    return Executors.newSingleThreadExecutor();
+    return new ApplicationErrorHandler();
   }
 
-  @Bean(destroyMethod = "close")
-  public KafkaConsumer<String, String> kafkaConsumer(ApplicationProperties properties)
+  @Bean
+  public EndlessConsumer<String, Message> endlessConsumer(
+      RecordHandler recordHandler,
+      ApplicationErrorHandler errorHandler,
+      KafkaProperties kafkaProperties,
+      KafkaListenerEndpointRegistry endpointRegistry)
   {
-    Properties props = new Properties();
-
-    props.put("bootstrap.servers", properties.getBootstrapServer());
-    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("metadata.max.age.ms", "1000");
-    props.put("key.deserializer", StringDeserializer.class.getName());
-    props.put("value.deserializer", StringDeserializer.class.getName());
-
-    return new KafkaConsumer<>(props);
+    return
+        new EndlessConsumer<>(
+            kafkaProperties.getClientId(),
+            endpointRegistry,
+            errorHandler,
+            recordHandler);
   }
 }