X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationConfiguriation.java;h=3878dbacf9f8901e8f9432cdb1231aa8b1d677bd;hb=7efbc8c73e3f2bb1f553a61325b8576886bab254;hp=e2a55c0d74c9ee0ffae1fbca4ca70db19fe84e8b;hpb=e94a327bebf468e2bcb5b686346a18a1409ec254;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 e2a55c0..3878dba 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -25,19 +25,13 @@ import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.St
 public class CounterApplicationConfiguriation
 {
 	@Bean
-	public Properties streamProcessorProperties(CounterApplicationProperties counterProperties)
+	public Properties streamProcessorProperties(
+			CounterApplicationProperties counterProperties)
 	{
-		Properties propertyMap = new Properties();
+		Properties propertyMap = serializationConfig();
 
 		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(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.REMOVE_TYPE_INFO_HEADERS, Boolean.FALSE);
-		propertyMap.put(StreamsConfig.STATE_DIR_CONFIG, "target");
 		if (counterProperties.getCommitInterval() != null)
 			propertyMap.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, counterProperties.getCommitInterval());
 		if (counterProperties.getCacheMaxBytes() != null)
@@ -47,6 +41,22 @@ public class CounterApplicationConfiguriation
 		return propertyMap;
 	}
 
+	static Properties serializationConfig()
+	{
+		Properties propertyMap = new Properties();
+
+		propertyMap.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+		propertyMap.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+		propertyMap.put(JsonDeserializer.KEY_DEFAULT_TYPE, Word.class.getName());
+		propertyMap.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Word.class.getName());
+		propertyMap.put(
+				JsonDeserializer.TYPE_MAPPINGS,
+				"word:" + Word.class.getName() + "," +
+				"counter:" + WordCounter.class.getName());
+
+		return propertyMap;
+	}
+
 	@Bean(initMethod = "start", destroyMethod = "stop")
 	public CounterStreamProcessor streamProcessor(
 			CounterApplicationProperties applicationProperties,