X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=24d3a9e0c07649282d3107c999cf49cffd94f029;hb=c032639acf2861b9039dc08e98bb7d9d1f59b086;hp=26a34e406639f652c53878dcd8db12d7174598fd;hpb=c446512ec3bfa29e5e8482074cb6daf7e2ee1b2f;p=demos%2Fkafka%2Ftraining

diff --git a/src/test/java/de/juplo/kafka/ApplicationTests.java b/src/test/java/de/juplo/kafka/ApplicationTests.java
index 26a34e4..24d3a9e 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -15,11 +15,13 @@ import org.springframework.boot.test.context.ConfigDataApplicationContextInitial
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.kafka.support.serializer.JsonSerializer;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -40,7 +42,7 @@ import static org.awaitility.Awaitility.*;
 		properties = {
 				"consumer.bootstrap-server=${spring.embedded.kafka.brokers}",
 				"consumer.topic=" + TOPIC,
-				"consumer.commit-interval=100ms" })
+				"consumer.commit-interval=1s" })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @Slf4j
 class ApplicationTests
@@ -56,7 +58,7 @@ class ApplicationTests
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
-	KafkaConsumer<String, Long> kafkaConsumer;
+	KafkaConsumer<String, ValidMessage> kafkaConsumer;
 	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
@@ -64,11 +66,11 @@ class ApplicationTests
 	@Autowired
 	ExecutorService executor;
 
-	Consumer<ConsumerRecord<String, Long>> testHandler;
-	EndlessConsumer<String, Long> endlessConsumer;
+	Consumer<ConsumerRecord<String, ValidMessage>> testHandler;
+	EndlessConsumer<String, ValidMessage> endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
-	Set<ConsumerRecord<String, Long>> receivedRecords;
+	Set<ConsumerRecord<String, ValidMessage>> receivedRecords;
 
 
 	/** Tests methods */
@@ -78,16 +80,30 @@ class ApplicationTests
 	{
 		send100Messages((partition, key, counter) ->
 		{
-			Bytes value = new Bytes(valueSerializer.serialize(TOPIC, counter));
-			return new ProducerRecord<>(TOPIC, partition, key, value);
+			Bytes value;
+			String type;
+
+			if (counter%3 != 0)
+			{
+				value = serializeClientMessage(key, counter);
+				type = "message";
+			}
+			else {
+				value = serializeGreeting(key, counter);
+				type = "greeting";
+			}
+
+			return toRecord(partition, key, value, type);
 		});
 
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
+				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> receivedRecords.size() >= 100);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
+				.pollInterval(Duration.ofSeconds(1))
 				.untilAsserted(() ->
 				{
 					checkSeenOffsetsForProgress();
@@ -104,14 +120,33 @@ class ApplicationTests
 	{
 		send100Messages((partition, key, counter) ->
 		{
-			Bytes value = counter == 77
-					? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-					: new Bytes(valueSerializer.serialize(TOPIC, counter));
-			return new ProducerRecord<>(TOPIC, partition, key, value);
+			Bytes value;
+			String type;
+
+			if (counter == 77)
+			{
+				value = serializeFooMessage(key, counter);
+				type = "foo";
+			}
+			else
+			{
+				if (counter%3 != 0)
+				{
+					value = serializeClientMessage(key, counter);
+					type = "message";
+				}
+				else {
+					value = serializeGreeting(key, counter);
+					type = "greeting";
+				}
+			}
+
+			return toRecord(partition, key, value, type);
 		});
 
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
+				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
@@ -120,6 +155,7 @@ class ApplicationTests
 		endlessConsumer.start();
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
+				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
@@ -245,6 +281,31 @@ class ApplicationTests
 		}
 	}
 
+	ProducerRecord<String, Bytes> toRecord(int partition, String key, Bytes value, String type)
+	{
+		ProducerRecord<String, Bytes> record =
+				new ProducerRecord<>(TOPIC, partition, key, value);
+		record.headers().add("__TypeId__", type.getBytes());
+		return record;
+	}
+
+	Bytes serializeClientMessage(String key, Long value)
+	{
+		TestClientMessage message = new TestClientMessage(key, value.toString());
+		return new Bytes(valueSerializer.serialize(TOPIC, message));
+	}
+
+	Bytes serializeGreeting(String key, Long value)
+	{
+		TestGreeting message = new TestGreeting(key, LocalDateTime.now());
+		return new Bytes(valueSerializer.serialize(TOPIC, message));
+	}
+
+	Bytes serializeFooMessage(String key, Long value)
+	{
+		TestFooMessage message = new TestFooMessage(key, value);
+		return new Bytes(valueSerializer.serialize(TOPIC, message));
+	}
 
 	@BeforeEach
 	public void init()
@@ -263,7 +324,7 @@ class ApplicationTests
 			newOffsets.put(tp, offset - 1);
 		});
 
-		Consumer<ConsumerRecord<String, Long>> captureOffsetAndExecuteTestHandler =
+		Consumer<ConsumerRecord<String, ValidMessage>> captureOffsetAndExecuteTestHandler =
 				record ->
 				{
 					newOffsets.put(
@@ -303,9 +364,9 @@ class ApplicationTests
 	public static class Configuration
 	{
 		@Bean
-		Serializer<Long> serializer()
+		Serializer<ValidMessage> serializer()
 		{
-			return new LongSerializer();
+			return new JsonSerializer<>();
 		}
 
 		@Bean