X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationIT.java;h=2f1e0c3a2b2b9a02577264c7dc43c311e904dba4;hb=44f1ad5dcd50851ef5d93b1be759481d5a38f63a;hp=57ac365add875bb294e68913a70c5720f395317b;hpb=34105430df56c86f6d18329feb5dedd45fe42e15;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 57ac365..2f1e0c3 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
@@ -1,5 +1,8 @@
 package de.juplo.kafka.wordcount.counter;
 
+import de.juplo.kafka.wordcount.splitter.TestInputWord;
+import de.juplo.kafka.wordcount.top10.TestOutputWord;
+import de.juplo.kafka.wordcount.top10.TestOutputWordCounter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
@@ -33,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.counter.Word",
-				"spring.kafka.consumer.properties.spring.json.value.default.type=de.juplo.kafka.wordcount.counter.WordCounter",
+				"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}",
@@ -51,7 +52,7 @@ public class CounterApplicationIT
 	public static final String TOPIC_OUT = "out";
 
 	@Autowired
-	KafkaTemplate<String, Word> kafkaTemplate;
+	KafkaTemplate<String, TestInputWord> kafkaTemplate;
 	@Autowired
 	Consumer consumer;
 
@@ -66,28 +67,30 @@ public class CounterApplicationIT
 	@Test
 	void testSendMessage()
 	{
-		TestData.writeInputData((key, value) -> kafkaTemplate.send(TOPIC_IN, key, value));
+		TestData
+				.getInputMessages()
+				.forEach(kv -> kafkaTemplate.send(TOPIC_IN, kv.key, kv.value));
 
-		await("Expexted converted data")
+		await("Expected messages")
 				.atMost(Duration.ofSeconds(10))
-				.untilAsserted(() -> TestData.assertExpectedResult(consumer.getReceivedMessages()));
+				.untilAsserted(() -> TestData.assertExpectedMessages(consumer.getReceivedMessages()));
 	}
 
 
 	static class Consumer
 	{
-		private final MultiValueMap<Word, WordCounter> received = new LinkedMultiValueMap<>();
+		private final MultiValueMap<TestOutputWord, TestOutputWordCounter> received = new LinkedMultiValueMap<>();
 
 		@KafkaListener(groupId = "TEST", topics = TOPIC_OUT)
 		public synchronized void receive(
-				@Header(KafkaHeaders.RECEIVED_KEY) Word word,
-				@Payload WordCounter counter)
+				@Header(KafkaHeaders.RECEIVED_KEY) TestOutputWord word,
+				@Payload TestOutputWordCounter counter)
 		{
 			log.debug("Received message: {} -> {}", word, counter);
 			received.add(word, counter);
 		}
 
-		synchronized MultiValueMap<Word, WordCounter> getReceivedMessages()
+		synchronized MultiValueMap<TestOutputWord, TestOutputWordCounter> getReceivedMessages()
 		{
 			return received;
 		}