X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationConfiguriation.java;h=174521f4183b67c65b186973965d4e21e01ca22f;hb=419be8ac0668ecb0e34b3a432cf2dcca1c3642dc;hp=9785f69edd8558b48c9059d3eeac53995d546590;hpb=0de33af47b76eaad1a2218dc88ae8a53b0235979;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 9785f69..174521f 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -12,11 +12,11 @@ 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;
 
+import static de.juplo.kafka.wordcount.counter.CounterStreamProcessor.STORE_NAME;
 import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
@@ -26,29 +26,35 @@ 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(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 (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(StreamsConfig.STATESTORE_CACHE_MAX_BYTES_CONFIG, counterProperties.getCacheMaxBytes());
+
 		propertyMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
 
 		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.TRUSTED_PACKAGES, CounterApplication.class.getPackageName());
+
+		return propertyMap;
+	}
+
 	@Bean(initMethod = "start", destroyMethod = "stop")
 	public CounterStreamProcessor streamProcessor(
 			CounterApplicationProperties applicationProperties,
@@ -80,6 +86,6 @@ public class CounterApplicationConfiguriation
 	@Bean
 	public KeyValueBytesStoreSupplier storeSupplier()
 	{
-		return Stores.persistentKeyValueStore("counter");
+		return Stores.persistentKeyValueStore(STORE_NAME);
 	}
 }