X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Ftop10%2FTop10ApplicationConfiguration.java;h=6e1f93ff2bb634ba01ca958b0bf437bc6b5fd821;hb=9e0ee342b531e7cfcddfe2e34390807802725a14;hp=3ea85b8af2283afea8aca9fa4ccbb8125ccd21dd;hpb=e3fc3fc028270a7faef487af51128771459aed20;p=demos%2Fkafka%2Fwordcount

diff --git a/src/main/java/de/juplo/kafka/wordcount/top10/Top10ApplicationConfiguration.java b/src/main/java/de/juplo/kafka/wordcount/top10/Top10ApplicationConfiguration.java
index 3ea85b8..6e1f93f 100644
--- a/src/main/java/de/juplo/kafka/wordcount/top10/Top10ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/top10/Top10ApplicationConfiguration.java
@@ -1,16 +1,18 @@
 package de.juplo.kafka.wordcount.top10;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.common.serialization.Serdes;
 import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
+import org.apache.kafka.streams.state.Stores;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ConfigurableApplicationContext;
 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;
@@ -30,8 +32,22 @@ public class Top10ApplicationConfiguration
 
 		props.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
 		props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
-		props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
-		props.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
+		props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+		props.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
+		props.put(JsonDeserializer.TRUSTED_PACKAGES, Top10Application.class.getPackageName());
+		props.put(JsonDeserializer.KEY_DEFAULT_TYPE, User.class.getName());
+		props.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Ranking.class.getName());
+		props.put(
+				JsonDeserializer.TYPE_MAPPINGS,
+				"word:" + Key.class.getName() + "," +
+				"counter:" + Entry.class.getName() + "," +
+				"user:" + User.class.getName() + "," +
+				"ranking:" + Ranking.class.getName());
+		props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+		if (properties.getCommitInterval() != null)
+			props.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, properties.getCommitInterval());
+		if (properties.getCacheMaxBytes() != null)
+			props.put(StreamsConfig.STATESTORE_CACHE_MAX_BYTES_CONFIG, properties.getCacheMaxBytes());
 		props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
 
 		return props;
@@ -40,15 +56,15 @@ public class Top10ApplicationConfiguration
 	@Bean(initMethod = "start", destroyMethod = "stop")
 	public Top10StreamProcessor streamProcessor(
 			Top10ApplicationProperties applicationProperties,
-			ObjectMapper objectMapper,
 			Properties streamProcessorProperties,
+			KeyValueBytesStoreSupplier storeSupplier,
 			ConfigurableApplicationContext context)
 	{
 		Top10StreamProcessor streamProcessor = new Top10StreamProcessor(
 				applicationProperties.getInputTopic(),
 				applicationProperties.getOutputTopic(),
-				objectMapper,
-				streamProcessorProperties);
+				streamProcessorProperties,
+				storeSupplier);
 
 		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
 		{
@@ -63,4 +79,10 @@ public class Top10ApplicationConfiguration
 
 		return streamProcessor;
 	}
+
+	@Bean
+	public KeyValueBytesStoreSupplier storeSupplier()
+	{
+		return Stores.persistentKeyValueStore("top10");
+	}
 }