X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fquery%2FQueryApplicationConfiguration.java;h=440d5c4649b0fdb328a7c51e2df8ea8c6e461cf5;hb=700f80444d14b201f7b696fb5b7bcab0d767f007;hp=50a53645ceb860b9cdb1a8f555b2ac1fba48c623;hpb=030c0db664cea0ec3e4307065054c449dbca6be2;p=demos%2Fkafka%2Fwordcount

diff --git a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
index 50a5364..440d5c4 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
@@ -1,9 +1,7 @@
 package de.juplo.kafka.wordcount.query;
 
-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.HostInfo;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
@@ -14,6 +12,8 @@ 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 java.io.IOException;
 import java.net.InetSocketAddress;
@@ -21,7 +21,8 @@ import java.net.Socket;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 
-import static de.juplo.kafka.wordcount.query.QueryStreamProcessor.STORE_NAME;
+import static de.juplo.kafka.wordcount.query.QueryStreamProcessor.RANKING_STORE_NAME;
+import static de.juplo.kafka.wordcount.query.QueryStreamProcessor.USER_STORE_NAME;
 import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
@@ -68,6 +69,13 @@ public class QueryApplicationConfiguration
 		props.put(StreamsConfig.APPLICATION_ID_CONFIG, applicationId);
 		props.put(StreamsConfig.APPLICATION_SERVER_CONFIG, applicationServer.host() + ":" + applicationServer.port());
 		props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServer);
+
+		props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, applicationProperties.getBootstrapServer());
+		if (applicationProperties.getCommitInterval() != null)
+			props.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, applicationProperties.getCommitInterval());
+		if (applicationProperties.getCacheMaxBytes() != null)
+			props.put(StreamsConfig.STATESTORE_CACHE_MAX_BYTES_CONFIG, applicationProperties.getCacheMaxBytes());
+
 		props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
 
 		return props;
@@ -77,8 +85,13 @@ public class QueryApplicationConfiguration
 	{
 		Properties props = new Properties();
 
-		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.TYPE_MAPPINGS,
+				"user:" + Key.class.getName() + "," +
+				"ranking:" + Ranking.class.getName() + "," +
+				"userranking:" + UserRanking.class.getName());
 
 		return props;
 	}
@@ -88,8 +101,8 @@ public class QueryApplicationConfiguration
 			Properties streamProcessorProperties,
 			HostInfo applicationServer,
 			QueryApplicationProperties applicationProperties,
-			KeyValueBytesStoreSupplier storeSupplier,
-			ObjectMapper mapper,
+			KeyValueBytesStoreSupplier userStoreSupplier,
+			KeyValueBytesStoreSupplier rankingStoreSupplier,
 			ConfigurableApplicationContext context)
 	{
 		QueryStreamProcessor streamProcessor = new QueryStreamProcessor(
@@ -97,8 +110,8 @@ public class QueryApplicationConfiguration
 				applicationServer,
 				applicationProperties.getUsersInputTopic(),
 				applicationProperties.getRankingInputTopic(),
-				storeSupplier,
-				mapper);
+				userStoreSupplier,
+				rankingStoreSupplier);
 
 		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
 		{
@@ -115,8 +128,14 @@ public class QueryApplicationConfiguration
 	}
 
 	@Bean
-	public KeyValueBytesStoreSupplier storeSupplier()
+	public KeyValueBytesStoreSupplier userStoreSupplier()
+	{
+		return Stores.persistentKeyValueStore(USER_STORE_NAME);
+	}
+
+	@Bean
+	public KeyValueBytesStoreSupplier rankingStoreSupplier()
 	{
-		return Stores.persistentKeyValueStore(STORE_NAME);
+		return Stores.persistentKeyValueStore(RANKING_STORE_NAME);
 	}
 }