X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationIT.java;h=cb0a5b78ce7a8d00b7320e9d89f7b93531caba51;hb=236aa3a7521bf44e2e397fa7b90373cc3cf59341;hp=025a1601298e0e4061fe757de7860a206fc480b5;hpb=3c23bfd42005211ac9812fba698ab74c8a6b7aa0;p=demos%2Fkafka%2Fwordcount

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..cb0a5b7 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}",
@@ -71,11 +69,11 @@ public class CounterApplicationIT
 	{
 		TestData
 				.getInputMessages()
-				.forEach(word -> kafkaTemplate.send(TOPIC_IN, word.getUser(), word));
+				.forEach(kv -> kafkaTemplate.send(TOPIC_IN, kv.key, kv.value));
 
 		await("Expected messages")
 				.atMost(Duration.ofSeconds(10))
-				.untilAsserted(() -> TestData.assertExpectedMessages(consumer.getReceivedMessages()));
+				.untilAsserted(() -> consumer.enforceAssertion(TestData.expectedMessagesAssertion()));
 	}
 
 
@@ -92,9 +90,10 @@ public class CounterApplicationIT
 			received.add(word, counter);
 		}
 
-		synchronized MultiValueMap<TestOutputWord, TestOutputWordCounter> getReceivedMessages()
+		synchronized void enforceAssertion(
+				java.util.function.Consumer<MultiValueMap<TestOutputWord, TestOutputWordCounter>> assertion)
 		{
-			return received;
+			assertion.accept(received);
 		}
 	}