From: Kai Moritz <kai@juplo.de>
Date: Wed, 5 Jun 2024 16:29:24 +0000 (+0200)
Subject: counter: 1.2.15 - Cleaned up the serialization configuration
X-Git-Tag: counter-1.2.15~10
X-Git-Url: https://juplo.de/gitweb/?a=commitdiff_plain;h=3a0dbf30eaee8aade255360217d7ab6049a95041;p=demos%2Fkafka%2Fwordcount

counter: 1.2.15 - Cleaned up the serialization configuration
---

diff --git a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
index 34217da..e38a0f8 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterApplicationConfiguriation.java
@@ -32,7 +32,6 @@ public class CounterApplicationConfiguriation
 
 		propertyMap.put(StreamsConfig.APPLICATION_ID_CONFIG, counterProperties.getApplicationId());
 		propertyMap.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, counterProperties.getBootstrapServer());
-		propertyMap.put(StreamsConfig.STATE_DIR_CONFIG, "target");
 		if (counterProperties.getCommitInterval() != null)
 			propertyMap.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, counterProperties.getCommitInterval());
 		if (counterProperties.getCacheMaxBytes() != null)
@@ -48,7 +47,6 @@ public class CounterApplicationConfiguriation
 
 		propertyMap.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
 		propertyMap.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, JsonSerde.class.getName());
-		propertyMap.put(JsonDeserializer.TRUSTED_PACKAGES, CounterApplication.class.getPackageName());
 		propertyMap.put(JsonDeserializer.KEY_DEFAULT_TYPE, Word.class.getName());
 		propertyMap.put(JsonDeserializer.VALUE_DEFAULT_TYPE, Word.class.getName());
 		propertyMap.put(
diff --git a/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java b/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
index 025a160..31bf6a6 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
@@ -36,9 +36,7 @@ import static org.awaitility.Awaitility.await;
 				"spring.kafka.consumer.auto-offset-reset=earliest",
 				"spring.kafka.consumer.key-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer",
 				"spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer",
-				"spring.kafka.consumer.properties.spring.json.use.type.headers=false",
-				"spring.kafka.consumer.properties.spring.json.key.default.type=de.juplo.kafka.wordcount.top10.TestOutputWord",
-				"spring.kafka.consumer.properties.spring.json.value.default.type=de.juplo.kafka.wordcount.top10.TestOutputWordCounter",
+				"spring.kafka.consumer.properties.spring.json.type.mapping=word:de.juplo.kafka.wordcount.top10.TestOutputWord,counter:de.juplo.kafka.wordcount.top10.TestOutputWordCounter",
 				"logging.level.root=WARN",
 				"logging.level.de.juplo=DEBUG",
 				"juplo.wordcount.counter.bootstrap-server=${spring.embedded.kafka.brokers}",