X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationConfiguriation.java;h=926045c75c9e61227bac29f5a3b1cbae2e890aa9;hb=refs%2Fheads%2Fcounter;hp=3878dbacf9f8901e8f9432cdb1231aa8b1d677bd;hpb=7efbc8c73e3f2bb1f553a61325b8576886bab254;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 3878dba..174521f 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -16,6 +16,7 @@ import org.springframework.kafka.support.serializer.JsonSerde;
 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;
 
 
@@ -31,11 +32,13 @@ public class CounterApplicationConfiguriation
 		Properties propertyMap = serializationConfig();
 
 		propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, counterProperties.getApplicationId());
+
 		propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, counterProperties.getBootstrapServer());
 		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;
@@ -47,12 +50,7 @@ public class CounterApplicationConfiguriation
 
 		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());
+		propertyMap.put(JsonDeserializer.TRUSTED_PACKAGES, CounterApplication.class.getPackageName());
 
 		return propertyMap;
 	}
@@ -88,6 +86,6 @@ public class CounterApplicationConfiguriation
 	@Bean
 	public KeyValueBytesStoreSupplier storeSupplier()
 	{
-		return Stores.persistentKeyValueStore("counter");
+		return Stores.persistentKeyValueStore(STORE_NAME);
 	}
 }