X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationConfiguriation.java;h=926045c75c9e61227bac29f5a3b1cbae2e890aa9;hb=1b1ac5bca62f07dae4188a5797a36b0fbe72058d;hp=409c035be1c78cc32117f432867d02296fb33ea2;hpb=3ff17b238afc765fe944a20ef67a2f6288fd5df2;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 409c035..926045c 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -12,7 +12,6 @@ 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;
@@ -26,24 +25,27 @@ import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.St
 public class CounterApplicationConfiguriation
 {
 	@Bean
-	public Properties propertyMap(CounterApplicationProperties properties)
+	public Properties streamProcessorProperties(CounterApplicationProperties counterProperties)
 	{
 		Properties propertyMap = new Properties();
 
-		propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
-		propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
+		propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, counterProperties.getApplicationId());
+		propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, counterProperties.getBootstrapServer());
 		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(
+				JsonDeserializer.TYPE_MAPPINGS,
+				"word:" + Word.class.getName() + "," +
+				"counter:" + WordCounter.class.getName());
+		propertyMap.put(JsonDeserializer.REMOVE_TYPE_INFO_HEADERS, Boolean.FALSE);
 		propertyMap.put(StreamsConfig.STATE_DIR_CONFIG, "target");
-		if (properties.getCommitInterval() != null)
-			propertyMap.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, properties.getCommitInterval());
-		if (properties.getCacheMaxBytes() != null)
-			propertyMap.put(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, properties.getCacheMaxBytes());
+		if (counterProperties.getCommitInterval() != null)
+			propertyMap.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, counterProperties.getCommitInterval());
+		if (counterProperties.getCacheMaxBytes() != null)
+			propertyMap.put(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, counterProperties.getCacheMaxBytes());
 		propertyMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
 
 		return propertyMap;
@@ -51,15 +53,15 @@ public class CounterApplicationConfiguriation
 
 	@Bean(initMethod = "start", destroyMethod = "stop")
 	public CounterStreamProcessor streamProcessor(
-			CounterApplicationProperties properties,
-			Properties propertyMap,
+			CounterApplicationProperties applicationProperties,
+			Properties streamProcessorProperties,
 			KeyValueBytesStoreSupplier storeSupplier,
 			ConfigurableApplicationContext context)
 	{
 		CounterStreamProcessor streamProcessor = new CounterStreamProcessor(
-				properties.getInputTopic(),
-				properties.getOutputTopic(),
-				propertyMap,
+				applicationProperties.getInputTopic(),
+				applicationProperties.getOutputTopic(),
+				streamProcessorProperties,
 				storeSupplier);
 
 		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->