X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;fp=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=1d642219d8d115a349fa3ef29a16066c45df9bcf;hb=f348b232d39c0b03f21a4d1e083fc6f2b44468f0;hp=d9c7661eba0c2b510b43034c983b31e7b1e2fc96;hpb=6d6877ff078d4fa9d4709f8ff497488abded231b;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 d9c7661..1d64221 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,47 +1,39 @@
 package de.juplo.kafka;
 
 import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.common.serialization.IntegerSerializer;
-import org.apache.kafka.common.serialization.StringSerializer;
+import org.apache.kafka.clients.producer.Producer;
+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.annotation.EnableKafka;
+import org.springframework.kafka.core.ProducerFactory;
 
 import java.util.Properties;
 
 
 @Configuration
-@EnableConfigurationProperties(ApplicationProperties.class)
+@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
+@EnableKafka
 public class ApplicationConfiguration
 {
   @Bean
   public RestGateway restGateway(
-      ApplicationProperties properties,
-      KafkaProducer<String, Integer> kafkaProducer)
+      ApplicationProperties applicationProperties,
+      KafkaProperties kafkaProperties,
+      Producer<String, Integer> kafkaProducer)
   {
     return
         new RestGateway(
-            properties.getClientId(),
-            properties.getTopic(),
-            properties.getPartition(),
+            kafkaProperties.getClientId(),
+            applicationProperties.getTopic(),
+            applicationProperties.getPartition(),
             kafkaProducer);
   }
 
   @Bean(destroyMethod = "close")
-  public KafkaProducer<String, Integer> kafkaProducer(ApplicationProperties properties)
+  public Producer<String, Integer> kafkaProducer(ProducerFactory<String, Integer> factory)
   {
-    Properties props = new Properties();
-    props.put("bootstrap.servers", properties.getBootstrapServer());
-    props.put("client.id", properties.getClientId());
-    props.put("acks", properties.getAcks());
-    props.put("batch.size", properties.getBatchSize());
-    props.put("delivery.timeout.ms", 20000); // 20 Sekunden
-    props.put("request.timeout.ms",  10000); // 10 Sekunden
-    props.put("linger.ms", properties.getLingerMs());
-    props.put("compression.type", properties.getCompressionType());
-    props.put("key.serializer", StringSerializer.class.getName());
-    props.put("value.serializer", IntegerSerializer.class.getName());
-
-    return new KafkaProducer<>(props);
+    return factory.createProducer();
   }
 }