query: 2.0.0 - (GREEN) Adjusted the implementation to the new expectations

[demos/kafka/wordcount] / src / main / java / de / juplo / kafka / wordcount / query / QueryApplicationConfiguration.java

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 07b78e4..6c7844d 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
@@ -22,7 +22,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 +70,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;
@@ -84,7 +92,6 @@ public class QueryApplicationConfiguration
                                JsonDeserializer.TYPE_MAPPINGS,
                                "user:" + Key.class.getName() + "," +
                                "ranking:" + Ranking.class.getName() + "," +
-                               "userdata:" + User.class.getName() + "," +
                                "userranking:" + UserRanking.class.getName());
 
                return props;
@@ -95,7 +102,8 @@ public class QueryApplicationConfiguration
                        Properties streamProcessorProperties,
                        HostInfo applicationServer,
                        QueryApplicationProperties applicationProperties,
-                       KeyValueBytesStoreSupplier storeSupplier,
+                       KeyValueBytesStoreSupplier userStoreSupplier,
+                       KeyValueBytesStoreSupplier rankingStoreSupplier,
                        ConfigurableApplicationContext context)
        {
                QueryStreamProcessor streamProcessor = new QueryStreamProcessor(
@@ -103,7 +111,8 @@ public class QueryApplicationConfiguration
                                applicationServer,
                                applicationProperties.getUsersInputTopic(),
                                applicationProperties.getRankingInputTopic(),
-                               storeSupplier);
+                               userStoreSupplier,
+                               rankingStoreSupplier);
 
                streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
                {
@@ -120,8 +129,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);
        }
 }