X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=523707f42ea2f5f4c474c19ed7ddfc89f3f71c46;hb=f18a765cc650b81788f356a80f975926930600c5;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..523707f 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,61 +1,73 @@
 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 org.springframework.kafka.support.serializer.JsonDeserializer;
 
-import java.time.Clock;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 
 @Configuration
-@EnableConfigurationProperties(ApplicationProperties.class)
+@EnableConfigurationProperties({ KafkaProperties.class, ApplicationProperties.class })
 public class ApplicationConfiguration
 {
   @Bean
-  public AdderRecordHandler sumRecordHandler()
+  public ApplicationRecordHandler recordHandler(
+      AdderResults adderResults,
+      KafkaProperties kafkaProperties,
+      ApplicationProperties applicationProperties)
   {
-    return new AdderRecordHandler();
+    return new ApplicationRecordHandler(
+        adderResults,
+        Optional.ofNullable(applicationProperties.getThrottle()),
+        kafkaProperties.getClientId());
   }
 
   @Bean
-  public AdderRebalanceListener sumRebalanceListener(
-      AdderRecordHandler adderRecordHandler,
-      PartitionStatisticsRepository repository,
-      Consumer<String, String> consumer,
-      ApplicationProperties properties)
+  public AdderResults adderResults()
   {
-    return new AdderRebalanceListener(
-        adderRecordHandler,
-        repository,
-        properties.getClientId(),
-        properties.getTopic(),
-        Clock.systemDefaultZone(),
-        properties.getCommitInterval(),
-        consumer);
+    return new AdderResults();
   }
 
   @Bean
-  public EndlessConsumer<String, String> endlessConsumer(
-      KafkaConsumer<String, String> kafkaConsumer,
+  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(
+      KafkaConsumer<String, Message> kafkaConsumer,
       ExecutorService executor,
-      AdderRebalanceListener adderRebalanceListener,
-      AdderRecordHandler adderRecordHandler,
-      ApplicationProperties properties)
+      ApplicationRebalanceListener rebalanceListener,
+      ApplicationRecordHandler recordHandler,
+      KafkaProperties kafkaProperties,
+      ApplicationProperties applicationProperties)
   {
     return
         new EndlessConsumer<>(
             executor,
-            properties.getClientId(),
-            properties.getTopic(),
+            kafkaProperties.getClientId(),
+            applicationProperties.getTopic(),
             kafkaConsumer,
-            adderRebalanceListener,
-            adderRecordHandler);
+            rebalanceListener,
+            recordHandler);
   }
 
   @Bean
@@ -65,19 +77,23 @@ public class ApplicationConfiguration
   }
 
   @Bean(destroyMethod = "close")
-  public KafkaConsumer<String, String> kafkaConsumer(ApplicationProperties properties)
+  public KafkaConsumer<String, Message> kafkaConsumer(KafkaProperties kafkaProperties)
   {
     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("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", 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);
   }