X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationIT.java;h=0faa2de575731a96fea892f81a75c2a363605a3e;hb=refs%2Fheads%2Fcounter;hp=9995ce7f938fc4abedefc78b153e451afdc0cd35;hpb=8d0426539d69616900f4d6ef19e52d50b497f57f;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 9995ce7..ab395fd 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,6 @@
 package de.juplo.kafka.wordcount.counter;
 
+import de.juplo.kafka.wordcount.splitter.TestInputUser;
 import de.juplo.kafka.wordcount.splitter.TestInputWord;
 import de.juplo.kafka.wordcount.top10.TestOutputWord;
 import de.juplo.kafka.wordcount.top10.TestOutputWordCounter;
@@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.KafkaHeaders;
@@ -34,17 +34,19 @@ import static org.awaitility.Awaitility.await;
 
 @SpringBootTest(
 		properties = {
+				"spring.main.allow-bean-definition-overriding=true",
+				"spring.kafka.producer.key-serializer=org.springframework.kafka.support.serializer.JsonSerializer",
 				"spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer",
 				"spring.kafka.producer.properties.spring.json.add.type.headers=false",
 				"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.type.mapping=word:de.juplo.kafka.wordcount.top10.TestOutputWord,counter:de.juplo.kafka.wordcount.top10.TestOutputWordCounter",
+				"spring.kafka.consumer.properties.spring.json.type.mapping=key: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}",
-				"juplo.wordcount.counter.commit-interval=0",
-				"juplo.wordcount.counter.cacheMaxBytes=0",
+				"juplo.wordcount.counter.commit-interval=100",
+				"juplo.wordcount.counter.cache-max-bytes=0",
 				"juplo.wordcount.counter.input-topic=" + TOPIC_IN,
 				"juplo.wordcount.counter.output-topic=" + TOPIC_OUT })
 @EmbeddedKafka(topics = { TOPIC_IN, TOPIC_OUT })
@@ -62,7 +64,7 @@ public class CounterApplicationIT
 
 	@BeforeAll
 	public static void testSendMessage(
-			@Autowired KafkaTemplate<String, TestInputWord> kafkaTemplate)
+			@Autowired KafkaTemplate<TestInputUser, TestInputWord> kafkaTemplate)
 	{
 		TestData
 				.getInputMessages()
@@ -70,7 +72,7 @@ public class CounterApplicationIT
 				{
 					try
 					{
-						SendResult<String, TestInputWord> result = kafkaTemplate.send(TOPIC_IN, kv.key, kv.value).get();
+						SendResult<TestInputUser, TestInputWord> result = kafkaTemplate.send(TOPIC_IN, kv.key, kv.value).get();
 						log.info(
 								"Sent: {}={}, partition={}, offset={}",
 								result.getProducerRecord().key(),
@@ -154,9 +156,8 @@ public class CounterApplicationIT
 			return new Consumer();
 		}
 
-		@Primary
 		@Bean
-		KeyValueBytesStoreSupplier inMemoryStoreSupplier()
+		KeyValueBytesStoreSupplier storeSupplier()
 		{
 			return Stores.inMemoryKeyValueStore(STORE_NAME);
 		}