X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationConfiguriation.java;h=97ad0221918e82d1dbe830c603859e9c1802820a;hb=refs%2Fheads%2Fcounter;hp=1bcc8348153f96a57763e92d86ede47e0234f760;hpb=cb4a5de56f142603eb63e82f6769616bf5ff058a;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 1bcc834..174521f 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -1,6 +1,5 @@
 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.streams.StreamsConfig;
@@ -13,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;
 
 
@@ -27,45 +26,47 @@ 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 = 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.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.APPLICATION_ID_CONFIG, properties.getApplicationId());
-		propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.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, Word.class.getPackageName());
-		propertyMap.put(JsonDeserializer.KEY_DEFAULT_TYPE, Word.class.getName());
-		propertyMap.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Word.class.getName());
-		propertyMap.put(
-				JsonDeserializer.TYPE_MAPPINGS,
-				"W:" + Word.class.getName() + "," +
-				"C:" + WordCount.class.getName());
-		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());
-		propertyMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+		propertyMap.put(JsonDeserializer.TRUSTED_PACKAGES, CounterApplication.class.getPackageName());
 
 		return propertyMap;
 	}
 
 	@Bean(initMethod = "start", destroyMethod = "stop")
 	public CounterStreamProcessor streamProcessor(
-			CounterApplicationProperties properties,
-			Properties propertyMap,
+			CounterApplicationProperties applicationProperties,
+			Properties streamProcessorProperties,
 			KeyValueBytesStoreSupplier storeSupplier,
-			ObjectMapper objectMapper,
 			ConfigurableApplicationContext context)
 	{
 		CounterStreamProcessor streamProcessor = new CounterStreamProcessor(
-				properties.getInputTopic(),
-				properties.getOutputTopic(),
-				propertyMap,
-				storeSupplier,
-				objectMapper);
+				applicationProperties.getInputTopic(),
+				applicationProperties.getOutputTopic(),
+				streamProcessorProperties,
+				storeSupplier);
 
 		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
 		{
@@ -85,6 +86,6 @@ public class CounterApplicationConfiguriation
 	@Bean
 	public KeyValueBytesStoreSupplier storeSupplier()
 	{
-		return Stores.persistentKeyValueStore("counter");
+		return Stores.persistentKeyValueStore(STORE_NAME);
 	}
 }