Springify: Merge der Umstellung auf die Auto-Konfiguration von Spring-Boot

[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 fd4ff28..26b81cb 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,20 +1,21 @@
 package de.juplo.kafka;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+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.listener.CommonContainerStoppingErrorHandler;
+import org.springframework.kafka.core.ConsumerFactory;
 
 import java.util.function.Consumer;
 
 
 @Configuration
-@EnableConfigurationProperties(ApplicationProperties.class)
+@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
 public class ApplicationConfiguration
 {
   @Bean
-  public Consumer<ConsumerRecord<String, Long>> consumer()
+  public Consumer<ConsumerRecord<String, ClientMessage>> consumer()
   {
     return (record) ->
     {
@@ -23,8 +24,14 @@ public class ApplicationConfiguration
   }
 
   @Bean
-  public CommonContainerStoppingErrorHandler errorHandler()
+  public ApplicationErrorHandler errorHandler()
   {
-    return new CommonContainerStoppingErrorHandler();
+    return new ApplicationErrorHandler();
+  }
+
+  @Bean(destroyMethod = "close")
+  public org.apache.kafka.clients.consumer.Consumer<String, ClientMessage> kafkaConsumer(ConsumerFactory<String, ClientMessage> factory)
+  {
+    return factory.createConsumer();
   }
 }