X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=9169de009412bbac0c945ff6d552a4aa339393ab;hb=a8aed63e92d58731176dde8b7cec4f5a022ac813;hp=6c25bcd7808409744fc28b7e742c14d37c23efac;hpb=c4fd031abdae00bdbd934216579f0a38ddd46783;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 6c25bcd..9169de0 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;
@@ -57,7 +57,7 @@ class ApplicationTests
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
-	KafkaConsumer<String, ClientMessage> kafkaConsumer;
+	KafkaConsumer<String, ValidMessage> kafkaConsumer;
 	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
@@ -65,11 +65,11 @@ 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 */
@@ -78,7 +78,23 @@ class ApplicationTests
 	@Order(1) // << The poistion pill is not skipped. Hence, this test must run first
 	void commitsCurrentOffsetsOnSuccess() throws ExecutionException, InterruptedException
 	{
-		send100Messages((key, counter) -> serialize(key, counter));
+		send100Messages((partition, key, counter) ->
+		{
+			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))
@@ -101,10 +117,31 @@ class ApplicationTests
 	@Order(2)
 	void commitsOffsetOfErrorForReprocessingOnError()
 	{
-		send100Messages((key, counter) ->
-				counter == 77
-						? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
-						: serialize(key, counter));
+		send100Messages((partition, key, counter) ->
+		{
+			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))
@@ -186,7 +223,12 @@ class ApplicationTests
 	}
 
 
-	void send100Messages(BiFunction<Integer, Long, Bytes> messageGenerator)
+	public interface RecordGenerator<K, V>
+	{
+		public ProducerRecord<String, Bytes> generate(int partition, String key, long counter);
+	}
+
+	void send100Messages(RecordGenerator recordGenerator)
 	{
 		long i = 0;
 
@@ -194,16 +236,9 @@ class ApplicationTests
 		{
 			for (int key = 0; key < 10; key++)
 			{
-				Bytes value = messageGenerator.apply(key, ++i);
-
 				ProducerRecord<String, Bytes> record =
-						new ProducerRecord<>(
-								TOPIC,
-								partition,
-								Integer.toString(key%2),
-								value);
+						recordGenerator.generate(partition, Integer.toString(partition*10+key%2), ++i);
 
-				record.headers().add("__TypeId__", "message".getBytes());
 				kafkaProducer.send(record, (metadata, e) ->
 				{
 					if (metadata != null)
@@ -228,14 +263,31 @@ class ApplicationTests
 		}
 	}
 
-	Bytes serialize(Integer key, Long value)
+	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)
 	{
-		ClientMessage message = new ClientMessage();
-		message.setClient(key.toString());
-		message.setMessage(value.toString());
+		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()
@@ -252,7 +304,7 @@ class ApplicationTests
 			newOffsets.put(tp, offset - 1);
 		});
 
-		Consumer<ConsumerRecord<String, ClientMessage>> captureOffsetAndExecuteTestHandler =
+		Consumer<ConsumerRecord<String, ValidMessage>> captureOffsetAndExecuteTestHandler =
 				record ->
 				{
 					newOffsets.put(
@@ -292,7 +344,7 @@ class ApplicationTests
 	public static class Configuration
 	{
 		@Bean
-		Serializer<ClientMessage> serializer()
+		Serializer<ValidMessage> serializer()
 		{
 			return new JsonSerializer<>();
 		}