X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=de77c60b422ace95604e9ca07e70207614e1a9f3;hb=46849dd63a31b524ba1f4565e35c3ed8787464b0;hp=bae5d5102a0a4d3e57803b32d9a383cd8c05520e;hpb=7adff476ad862d30d668d75212d1ca1c7cf16b03;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 bae5d51..de77c60 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -6,77 +6,28 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.Optional;
 import org.springframework.kafka.core.ConsumerFactory;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 
 @Configuration
 @EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
 public class ApplicationConfiguration
 {
   @Bean
-  public ApplicationRecordHandler recordHandler(
-      AdderResults adderResults,
-      KafkaProperties kafkaProperties,
-      ApplicationProperties applicationProperties)
-  {
-    return new ApplicationRecordHandler(
-        adderResults,
-        Optional.ofNullable(applicationProperties.getThrottle()),
-        kafkaProperties.getClientId());
-  }
-
-  @Bean
-  public AdderResults adderResults()
-  {
-    return new AdderResults();
-  }
-
-  @Bean
-  public ApplicationRebalanceListener rebalanceListener(
-      ApplicationRecordHandler recordHandler,
-      AdderResults adderResults,
-      StateRepository stateRepository,
-      KafkaProperties kafkaProperties,
-      ApplicationProperties applicationProperties)
-  {
-    return new ApplicationRebalanceListener(
-        recordHandler,
-        adderResults,
-        stateRepository,
-        kafkaProperties.getClientId());
-  }
-
-  @Bean
-  public EndlessConsumer<String, Message> endlessConsumer(
-      Consumer<String, Message> kafkaConsumer,
-      ExecutorService executor,
-      ApplicationRebalanceListener rebalanceListener,
-      ApplicationRecordHandler recordHandler,
+  public SimpleConsumer endlessConsumer(
+      Consumer<String, String> kafkaConsumer,
       KafkaProperties kafkaProperties,
       ApplicationProperties applicationProperties)
   {
     return
-        new EndlessConsumer<>(
-            executor,
+        new SimpleConsumer(
             kafkaProperties.getClientId(),
             applicationProperties.getTopic(),
-            kafkaConsumer,
-            rebalanceListener,
-            recordHandler);
-  }
-
-  @Bean
-  public ExecutorService executor()
-  {
-    return Executors.newSingleThreadExecutor();
+            kafkaConsumer);
   }
 
   @Bean(destroyMethod = "close")
-  public Consumer<String, Message> kafkaConsumer(ConsumerFactory<String, Message> factory)
+  public Consumer<?, ?> kafkaConsumer(ConsumerFactory<?, ?> factory)
   {
     return factory.createConsumer();
   }