X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=24d3a9e0c07649282d3107c999cf49cffd94f029;hb=c032639acf2861b9039dc08e98bb7d9d1f59b086;hp=62906b356a28ed38c826f8e8c1f9f68dbcb0047b;hpb=536c9c5320e52101bda5e1931bc84c5e0e0137f2;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 62906b3..24d3a9e 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -21,11 +21,11 @@ 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;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -41,7 +41,8 @@ import static org.awaitility.Awaitility.*;
 @TestPropertySource(
 		properties = {
 				"consumer.bootstrap-server=${spring.embedded.kafka.brokers}",
-				"consumer.topic=" + TOPIC })
+				"consumer.topic=" + TOPIC,
+				"consumer.commit-interval=1s" })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @Slf4j
 class ApplicationTests
@@ -57,7 +58,7 @@ class ApplicationTests
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
-	KafkaConsumer<String, ClientMessage> kafkaConsumer;
+	KafkaConsumer<String, ValidMessage> kafkaConsumer;
 	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
@@ -65,31 +66,44 @@ class ApplicationTests
 	@Autowired
 	ExecutorService executor;
 
-	Consumer<ConsumerRecord<String, ClientMessage>> testHandler;
-	EndlessConsumer<String, ClientMessage> endlessConsumer;
+	Consumer<ConsumerRecord<String, ValidMessage>> testHandler;
+	EndlessConsumer<String, ValidMessage> endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
-	Set<ConsumerRecord<String, ClientMessage>> receivedRecords;
+	Set<ConsumerRecord<String, ValidMessage>> receivedRecords;
 
 
 	/** Tests methods */
 
 	@Test
-	@Order(1) // << The poistion pill is not skipped. Hence, this test must run first
 	void commitsCurrentOffsetsOnSuccess() throws ExecutionException, InterruptedException
 	{
 		send100Messages((partition, key, counter) ->
 		{
-			Bytes value = serialize(key, 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();
@@ -102,19 +116,37 @@ class ApplicationTests
 	}
 
 	@Test
-	@Order(2)
-	void commitsOffsetOfErrorForReprocessingOnError()
+	void commitsOffsetOfErrorForReprocessingOnDeserializationError()
 	{
 		send100Messages((partition, key, counter) ->
 		{
-			Bytes value = counter == 77
-					? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-					: serialize(key, 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();
@@ -123,6 +155,7 @@ class ApplicationTests
 		endlessConsumer.start();
 		await("Consumer failed")
 				.atMost(Duration.ofSeconds(30))
+				.pollInterval(Duration.ofSeconds(1))
 				.until(() -> !endlessConsumer.running());
 
 		checkSeenOffsetsForProgress();
@@ -160,8 +193,8 @@ class ApplicationTests
 		Set<TopicPartition> withProgress = new HashSet<>();
 		partitions().forEach(tp ->
 		{
-			Long oldOffset = oldOffsets.get(tp);
-			Long newOffset = newOffsets.get(tp);
+			Long oldOffset = oldOffsets.get(tp) + 1;
+			Long newOffset = newOffsets.get(tp) + 1;
 			if (!oldOffset.equals(newOffset))
 			{
 				log.debug("Progress for {}: {} -> {}", tp, oldOffset, newOffset);
@@ -176,6 +209,21 @@ class ApplicationTests
 
 	/** Helper methods for setting up and running the tests */
 
+	void seekToEnd()
+	{
+		offsetConsumer.assign(partitions());
+		offsetConsumer.seekToEnd(partitions());
+		partitions().forEach(tp ->
+		{
+			// seekToEnd() works lazily: it only takes effect on poll()/position()
+			Long offset = offsetConsumer.position(tp);
+			log.info("New position for {}: {}", tp, offset);
+		});
+		// The new positions must be commited!
+		offsetConsumer.commitSync();
+		offsetConsumer.unsubscribe();
+	}
+
 	void doForCurrentOffsets(BiConsumer<TopicPartition, Long> consumer)
 	{
 		offsetConsumer.assign(partitions());
@@ -209,7 +257,6 @@ class ApplicationTests
 				ProducerRecord<String, Bytes> record =
 						recordGenerator.generate(partition, Integer.toString(partition*10+key%2), ++i);
 
-				record.headers().add("__TypeId__", "message".getBytes());
 				kafkaProducer.send(record, (metadata, e) ->
 				{
 					if (metadata != null)
@@ -234,20 +281,39 @@ class ApplicationTests
 		}
 	}
 
-	Bytes serialize(String key, Long value)
+	ProducerRecord<String, Bytes> toRecord(int partition, String key, Bytes value, String type)
 	{
-		ClientMessage message = new ClientMessage();
-		message.setClient(key);
-		message.setMessage(value.toString());
+		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()
 	{
 		testHandler = record -> {} ;
 
+		seekToEnd();
+
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
 		receivedRecords = new HashSet<>();
@@ -258,7 +324,7 @@ class ApplicationTests
 			newOffsets.put(tp, offset - 1);
 		});
 
-		Consumer<ConsumerRecord<String, ClientMessage>> captureOffsetAndExecuteTestHandler =
+		Consumer<ConsumerRecord<String, ValidMessage>> captureOffsetAndExecuteTestHandler =
 				record ->
 				{
 					newOffsets.put(
@@ -298,7 +364,7 @@ class ApplicationTests
 	public static class Configuration
 	{
 		@Bean
-		Serializer<ClientMessage> serializer()
+		Serializer<ValidMessage> serializer()
 		{
 			return new JsonSerializer<>();
 		}