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=7da171227a67dcd2472b6908435a2a8acb6bd976;hpb=278c7b8125c82120e1d80fa640bd16d375d4bf86;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 7da1712..440d5c4 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
@@ -2,7 +2,6 @@ package de.juplo.kafka.wordcount.query;
 
 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;
@@ -22,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;
 
 
@@ -69,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;
@@ -78,14 +85,12 @@ public class QueryApplicationConfiguration
 	{
 		Properties props = new Properties();
 
-		props.put(StreamsConfig.DEFAULT_KEY_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.VALUE_DEFAULT_TYPE, User.class.getName()); // << Does not work without this!
 		props.put(
 				JsonDeserializer.TYPE_MAPPINGS,
 				"user:" + Key.class.getName() + "," +
 				"ranking:" + Ranking.class.getName() + "," +
-				"userdata:" + User.class.getName() + "," +
 				"userranking:" + UserRanking.class.getName());
 
 		return props;
@@ -96,7 +101,8 @@ public class QueryApplicationConfiguration
 			Properties streamProcessorProperties,
 			HostInfo applicationServer,
 			QueryApplicationProperties applicationProperties,
-			KeyValueBytesStoreSupplier storeSupplier,
+			KeyValueBytesStoreSupplier userStoreSupplier,
+			KeyValueBytesStoreSupplier rankingStoreSupplier,
 			ConfigurableApplicationContext context)
 	{
 		QueryStreamProcessor streamProcessor = new QueryStreamProcessor(
@@ -104,7 +110,8 @@ public class QueryApplicationConfiguration
 				applicationServer,
 				applicationProperties.getUsersInputTopic(),
 				applicationProperties.getRankingInputTopic(),
-				storeSupplier);
+				userStoreSupplier,
+				rankingStoreSupplier);
 
 		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
 		{
@@ -121,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);
 	}
 }