X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationConfiguriation.java;h=409c035be1c78cc32117f432867d02296fb33ea2;hb=3ff17b238afc765fe944a20ef67a2f6288fd5df2;hp=f1da4078b24ac301072d8182975541cfed1fc21b;hpb=e1ec32bcc70e5f990ca2ddb5566f98cee7e4c2c2;p=demos%2Fkafka%2Fwordcount

diff --git a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
index f1da407..409c035 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -1,9 +1,7 @@
 package de.juplo.kafka.wordcount.counter;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.common.serialization.Serdes;
 import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
@@ -12,6 +10,9 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.support.serializer.JsonDeserializer;
+import org.springframework.kafka.support.serializer.JsonSerde;
+import org.springframework.kafka.support.serializer.JsonSerializer;
 
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
@@ -31,8 +32,13 @@ public class CounterApplicationConfiguriation
 
 		propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
 		propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
-		propertyMap.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.StringSerde.class.getName());
-		propertyMap.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.StringSerde.class.getName());
+		propertyMap.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+		propertyMap.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+		propertyMap.put(JsonSerializer.ADD_TYPE_INFO_HEADERS, false);
+		propertyMap.put(JsonDeserializer.TRUSTED_PACKAGES, CounterApplication.class.getPackageName());
+		propertyMap.put(JsonDeserializer.KEY_DEFAULT_TYPE, Word.class.getName());
+		propertyMap.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Word.class.getName());
+		propertyMap.put(JsonDeserializer.USE_TYPE_INFO_HEADERS, false);
 		propertyMap.put(StreamsConfig.STATE_DIR_CONFIG, "target");
 		if (properties.getCommitInterval() != null)
 			propertyMap.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, properties.getCommitInterval());
@@ -48,15 +54,13 @@ public class CounterApplicationConfiguriation
 			CounterApplicationProperties properties,
 			Properties propertyMap,
 			KeyValueBytesStoreSupplier storeSupplier,
-			ObjectMapper objectMapper,
 			ConfigurableApplicationContext context)
 	{
 		CounterStreamProcessor streamProcessor = new CounterStreamProcessor(
 				properties.getInputTopic(),
 				properties.getOutputTopic(),
 				propertyMap,
-				storeSupplier,
-				objectMapper);
+				storeSupplier);
 
 		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
 		{