X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationConfiguration.java;h=ddeb9d50797628dcab743e7ac72342a48f839222;hb=a8aed63e92d58731176dde8b7cec4f5a022ac813;hp=6e0445337aea5c641bc46495f4ccaaa66bd2bbf7;hpb=f9890a95d6672e1847e1d9f53a76c95ade877a9b;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 6e04453..ddeb9d5 100644
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -1,14 +1,17 @@
 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;
 import java.util.concurrent.Executors;
+import java.util.function.Consumer;
 
 
 @Configuration
@@ -16,24 +19,38 @@ import java.util.concurrent.Executors;
 public class ApplicationConfiguration
 {
   @Bean
-  public EndlessConsumer endlessConsumer(
-      KafkaConsumer<String, String> kafkaConsumer,
+  public Consumer<ConsumerRecord<String, ValidMessage>> consumer()
+  {
+    return (record) ->
+    {
+      // Handle record
+    };
+  }
+
+  @Bean
+  public EndlessConsumer<String, ValidMessage> endlessConsumer(
+      KafkaConsumer<String, ValidMessage> kafkaConsumer,
+      ExecutorService executor,
+      Consumer<ConsumerRecord<String, ValidMessage>> handler,
       ApplicationProperties properties)
   {
-    EndlessConsumer consumer =
-        new EndlessConsumer(
-            Executors.newFixedThreadPool(1),
+    return
+        new EndlessConsumer<>(
+            executor,
             properties.getClientId(),
             properties.getTopic(),
-            kafkaConsumer);
-
-    consumer.start();
+            kafkaConsumer,
+            handler);
+  }
 
-    return consumer;
+  @Bean
+  public ExecutorService executor()
+  {
+    return Executors.newSingleThreadExecutor();
   }
 
   @Bean(destroyMethod = "close")
-  public KafkaConsumer<String, String> kafkaConsumer(ApplicationProperties properties)
+  public KafkaConsumer<String, ValidMessage> kafkaConsumer(ApplicationProperties properties)
   {
     Properties props = new Properties();
 
@@ -43,7 +60,11 @@ public class ApplicationConfiguration
     props.put("auto.offset.reset", properties.getAutoOffsetReset());
     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);
   }