X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Ftop10%2FTop10ApplicationConfiguration.java;h=255f0e4b559d14a16f60d8b4e269fd64d7fa0594;hb=refs%2Fheads%2Ftop10;hp=6e1f93ff2bb634ba01ca958b0bf437bc6b5fd821;hpb=9e0ee342b531e7cfcddfe2e34390807802725a14;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 6e1f93f..aecd260 100644
--- a/src/main/java/de/juplo/kafka/wordcount/top10/Top10ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/top10/Top10ApplicationConfiguration.java
@@ -12,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.top10.Top10StreamProcessor.STORE_NAME;
 import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
@@ -30,25 +30,35 @@ public class Top10ApplicationConfiguration
 	{
 		Properties props = new Properties();
 
+		props.putAll(serializationConfig());
+
 		props.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
 		props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
+
+		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;
+	}
+
+	static Properties serializationConfig()
+	{
+		Properties props = new Properties();
+
 		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.KEY_DEFAULT_TYPE, Stats.class.getName());
 		props.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Ranking.class.getName());
 		props.put(
 				JsonDeserializer.TYPE_MAPPINGS,
-				"word:" + Key.class.getName() + "," +
+				"key:" + Key.class.getName() + "," +
 				"counter:" + Entry.class.getName() + "," +
-				"user:" + User.class.getName() + "," +
+				"stats:" + Stats.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;
 	}
@@ -83,6 +93,6 @@ public class Top10ApplicationConfiguration
 	@Bean
 	public KeyValueBytesStoreSupplier storeSupplier()
 	{
-		return Stores.persistentKeyValueStore("top10");
+		return Stores.persistentKeyValueStore(STORE_NAME);
 	}
 }