`EndlessConsumer` auf `@KafkaHandler` umgestellt

[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 523707f..1755747 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,17 +1,13 @@
 package de.juplo.kafka;
 
-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 org.springframework.kafka.support.serializer.JsonDeserializer;
 
 import java.util.Optional;
-import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
 
 
 @Configuration
@@ -19,7 +15,7 @@ import java.util.concurrent.Executors;
 public class ApplicationConfiguration
 {
   @Bean
-  public ApplicationRecordHandler recordHandler(
+  public ApplicationRecordHandler applicationRecordHandler(
       AdderResults adderResults,
       KafkaProperties kafkaProperties,
       ApplicationProperties applicationProperties)
@@ -41,8 +37,7 @@ public class ApplicationConfiguration
       ApplicationRecordHandler recordHandler,
       AdderResults adderResults,
       StateRepository stateRepository,
-      KafkaProperties kafkaProperties,
-      ApplicationProperties applicationProperties)
+      KafkaProperties kafkaProperties)
   {
     return new ApplicationRebalanceListener(
         recordHandler,
@@ -52,49 +47,23 @@ public class ApplicationConfiguration
   }
 
   @Bean
-  public EndlessConsumer<String, Message> endlessConsumer(
-      KafkaConsumer<String, Message> kafkaConsumer,
-      ExecutorService executor,
-      ApplicationRebalanceListener rebalanceListener,
-      ApplicationRecordHandler recordHandler,
-      KafkaProperties kafkaProperties,
-      ApplicationProperties applicationProperties)
+  public ApplicationErrorHandler applicationErrorHandler()
   {
-    return
-        new EndlessConsumer<>(
-            executor,
-            kafkaProperties.getClientId(),
-            applicationProperties.getTopic(),
-            kafkaConsumer,
-            rebalanceListener,
-            recordHandler);
+    return new ApplicationErrorHandler();
   }
 
   @Bean
-  public ExecutorService executor()
-  {
-    return Executors.newSingleThreadExecutor();
-  }
-
-  @Bean(destroyMethod = "close")
-  public KafkaConsumer<String, Message> kafkaConsumer(KafkaProperties kafkaProperties)
+  public EndlessConsumer endlessConsumer(
+      RecordHandler recordHandler,
+      ApplicationErrorHandler errorHandler,
+      KafkaProperties kafkaProperties,
+      KafkaListenerEndpointRegistry endpointRegistry)
   {
-    Properties props = new Properties();
-
-    props.put("bootstrap.servers", kafkaProperties.getBootstrapServers());
-    props.put("partition.assignment.strategy", "org.apache.kafka.clients.consumer.StickyAssignor");
-    props.put("group.id", kafkaProperties.getConsumer().getGroupId());
-    props.put("client.id", kafkaProperties.getClientId());
-    props.put("auto.offset.reset", kafkaProperties.getConsumer().getAutoOffsetReset());
-    props.put("auto.commit.interval.ms", (int)kafkaProperties.getConsumer().getAutoCommitInterval().toMillis());
-    props.put("metadata.max.age.ms", kafkaProperties.getConsumer().getProperties().get("metadata.max.age.ms"));
-    props.put("key.deserializer", StringDeserializer.class.getName());
-    props.put("value.deserializer", JsonDeserializer.class.getName());
-    props.put(JsonDeserializer.TRUSTED_PACKAGES, "de.juplo.kafka");
-    props.put(JsonDeserializer.TYPE_MAPPINGS,
-      Message.Type.ADD + ":" + MessageAddNumber.class.getName() + "," +
-      Message.Type.CALC + ":" + MessageCalculateSum.class.getName());
-
-    return new KafkaConsumer<>(props);
+    return
+        new EndlessConsumer(
+            kafkaProperties.getClientId(),
+            endpointRegistry,
+            errorHandler,
+            recordHandler);
   }
 }