X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=9fc0c70a680d5ef121fde7ab405d11e7cc3684b5;hb=c032639acf2861b9039dc08e98bb7d9d1f59b086;hp=c5fca912027d819873df23638a1f4084a23dcc6b;hpb=6a02ed79e96cdfe01e025b8c1ee54e5c649cf058;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 c5fca91..9fc0c70 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -2,11 +2,11 @@ package de.juplo.kafka;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.common.serialization.LongDeserializer;
 import org.apache.kafka.common.serialization.StringDeserializer;
 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.Properties;
 import java.util.concurrent.ExecutorService;
@@ -19,7 +19,7 @@ import java.util.function.Consumer;
 public class ApplicationConfiguration
 {
   @Bean
-  public Consumer<ConsumerRecord<String, String>> consumer()
+  public Consumer<ConsumerRecord<String, ValidMessage>> consumer()
   {
     return (record) ->
     {
@@ -28,10 +28,10 @@ public class ApplicationConfiguration
   }
 
   @Bean
-  public EndlessConsumer<String, String> endlessConsumer(
-      KafkaConsumer<String, String> kafkaConsumer,
+  public EndlessConsumer<String, ValidMessage> endlessConsumer(
+      KafkaConsumer<String, ValidMessage> kafkaConsumer,
       ExecutorService executor,
-      Consumer<ConsumerRecord<String, String>> handler,
+      Consumer<ConsumerRecord<String, ValidMessage>> handler,
       ApplicationProperties properties)
   {
     return
@@ -50,7 +50,7 @@ public class ApplicationConfiguration
   }
 
   @Bean(destroyMethod = "close")
-  public KafkaConsumer<String, String> kafkaConsumer(ApplicationProperties properties)
+  public KafkaConsumer<String, ValidMessage> kafkaConsumer(ApplicationProperties properties)
   {
     Properties props = new Properties();
 
@@ -58,9 +58,14 @@ public class ApplicationConfiguration
     props.put("group.id", properties.getGroupId());
     props.put("client.id", properties.getClientId());
     props.put("auto.offset.reset", properties.getAutoOffsetReset());
+    props.put("auto.commit.interval.ms", (int)properties.getCommitInterval().toMillis());
     props.put("metadata.max.age.ms", "1000");
     props.put("key.deserializer", StringDeserializer.class.getName());
-    props.put("value.deserializer", LongDeserializer.class.getName());
+    props.put("value.deserializer", JsonDeserializer.class.getName());
+    props.put(JsonDeserializer.TYPE_MAPPINGS,
+        "message:" + ClientMessage.class.getName() + "," +
+        "greeting:" + Greeting.class.getName());
+    props.put(JsonDeserializer.TRUSTED_PACKAGES, "de.juplo.kafka");
 
     return new KafkaConsumer<>(props);
   }