X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fcounter%2FCounterApplicationIT.java;h=fea89aba9b308f823571d798e2b798b29ec9c29c;hb=4e10b6e106409b2884fcef67f7a5ded0581bc35f;hp=c6eb0a65ccdff5f023dc048c16747bfdd5bee79f;hpb=4072a93fd94a847c86ea422d74b17b0913b7de2a;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 c6eb0a6..fea89ab 100644
--- a/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/counter/CounterApplicationIT.java
@@ -2,7 +2,10 @@ package de.juplo.kafka.wordcount.counter;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.streams.KeyValue;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
 import org.junit.jupiter.api.BeforeEach;
@@ -13,12 +16,18 @@ 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.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.core.*;
+import org.springframework.kafka.support.serializer.JsonDeserializer;
+import org.springframework.kafka.support.serializer.JsonSerializer;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 
 import java.time.Duration;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.stream.Collectors;
 
 import static de.juplo.kafka.wordcount.counter.CounterApplicationIT.*;
 import static org.awaitility.Awaitility.*;
@@ -41,7 +50,7 @@ public class CounterApplicationIT
 	static final int PARTITIONS = 2;
 
 	@Autowired
-	KafkaTemplate<String, String> kafkaTemplate;
+	KafkaTemplate<String, Word> kafkaTemplate;
 	@Autowired
 	Consumer consumer;
 
@@ -60,26 +69,84 @@ public class CounterApplicationIT
 
 		await("Expexted converted data")
 				.atMost(Duration.ofSeconds(10))
-				.untilAsserted(() -> TestData.assertExpectedResult(consumer.received));
+				.untilAsserted(() -> TestData.assertExpectedResult(consumer.getReceivedMessages()));
 	}
 
 
 	@RequiredArgsConstructor
 	static class Consumer
 	{
-		private final List<Message> received = new LinkedList<>();
+		private final List<KeyValue<Word, WordCount>> received = new LinkedList<>();
 
 		@KafkaListener(groupId = "TEST", topics = TOPIC_OUT)
-		public void receive(ConsumerRecord<String, String> record)
+		public synchronized void receive(ConsumerRecord<Word, WordCount> record)
 		{
 			log.debug("Received message: {}", record);
-			received.add(Message.of(record.key(),record.value()));
+			received.add(KeyValue.pair(record.key(),record.value()));
+		}
+
+		synchronized List<KeyValue<Word, WordCount>> getReceivedMessages()
+		{
+			return received;
 		}
 	}
 
 	@TestConfiguration
 	static class Configuration
 	{
+		@Bean
+		ProducerFactory<?, ?> producerFactory(Properties streamProcessorProperties)
+		{
+			Map<String, Object> propertyMap = streamProcessorProperties
+					.entrySet()
+					.stream()
+					.collect(
+							Collectors.toMap(
+									entry -> (String)entry.getKey(),
+									entry -> entry.getValue()
+							));
+
+			propertyMap.put(
+					ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
+					JsonSerializer.class.getName());
+			propertyMap.put(
+					ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
+					JsonSerializer.class.getName());
+
+			return new DefaultKafkaProducerFactory<>(propertyMap);
+		}
+
+		@Bean
+		ConcurrentKafkaListenerContainerFactory<?, ?> kafkaListenerContainerFactory(
+				Properties streamProcessorProperties)
+		{
+			Map<String, Object> propertyMap = streamProcessorProperties
+					.entrySet()
+					.stream()
+					.collect(
+							Collectors.toMap(
+									entry -> (String)entry.getKey(),
+									entry -> entry.getValue()
+							));
+
+			propertyMap.put(
+					ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
+					JsonDeserializer.class.getName());
+			propertyMap.put(
+					ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
+					JsonDeserializer.class.getName());
+
+			ConsumerFactory<? super Object, ? super Object> consumerFactory =
+					new DefaultKafkaConsumerFactory<>(propertyMap);
+
+			ConcurrentKafkaListenerContainerFactory<Object, Object> kafkaListenerContainerFactory =
+					new ConcurrentKafkaListenerContainerFactory<>();
+
+			kafkaListenerContainerFactory.setConsumerFactory(consumerFactory);
+
+			return kafkaListenerContainerFactory;
+		}
+
 		@Bean
 		Consumer consumer()
 		{