X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=18ef37d04b8c5f797de619b65319d3c57476aafe;hb=7d270fa1c846f2cde38dcdda6f2111d032dbbc3e;hp=973e973271d601ff4b0d8026d413505c0bf6f4ce;hpb=5b4b7acf7b6a02e0e5c779257d3f5996366625e6;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..18ef37d 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,84 +1,38 @@
 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 org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import java.util.concurrent.Executor;
 
 
 @Configuration
-@EnableConfigurationProperties(ApplicationProperties.class)
+@EnableAsync
+@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
 public class ApplicationConfiguration
 {
   @Bean
-  public AdderRecordHandler sumRecordHandler()
-  {
-    return new AdderRecordHandler();
-  }
-
-  @Bean
-  public AdderRebalanceListener sumRebalanceListener(
-      AdderRecordHandler adderRecordHandler,
-      PartitionStatisticsRepository repository,
-      Consumer<String, String> consumer,
-      ApplicationProperties properties)
-  {
-    return new AdderRebalanceListener(
-        adderRecordHandler,
-        repository,
-        properties.getClientId(),
-        properties.getTopic(),
-        Clock.systemDefaultZone(),
-        properties.getCommitInterval(),
-        consumer);
-  }
-
-  @Bean
-  public EndlessConsumer<String, String> endlessConsumer(
-      KafkaConsumer<String, String> kafkaConsumer,
-      ExecutorService executor,
-      AdderRebalanceListener adderRebalanceListener,
-      AdderRecordHandler adderRecordHandler,
-      ApplicationProperties properties)
+  public SimpleConsumer endlessConsumer(
+      Consumer<String, String> kafkaConsumer,
+      KafkaProperties kafkaProperties,
+      ApplicationProperties applicationProperties)
   {
     return
-        new EndlessConsumer<>(
-            executor,
-            properties.getClientId(),
-            properties.getTopic(),
-            kafkaConsumer,
-            adderRebalanceListener,
-            adderRecordHandler);
-  }
-
-  @Bean
-  public ExecutorService executor()
-  {
-    return Executors.newSingleThreadExecutor();
+        new SimpleConsumer(
+            kafkaProperties.getClientId(),
+            applicationProperties.getTopic(),
+            kafkaConsumer);
   }
 
   @Bean(destroyMethod = "close")
-  public KafkaConsumer<String, String> kafkaConsumer(ApplicationProperties properties)
+  public Consumer<?, ?> kafkaConsumer(ConsumerFactory<?, ?> factory)
   {
-    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 factory.createConsumer();
   }
 }