X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=f13fdde2b78a91d0baacf0aa74906da27c12a4ca;hb=295373025f1d167e31704d8474c332c9441c9b1b;hp=7ec73f353278aa29f8f76ddf7b1f3eeac7896422;hpb=7819bf5f7f5b875d14a2cbb2d435a6652e46b4ae;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 7ec73f3..f13fdde 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -1,7 +1,6 @@
 package de.juplo.kafka;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -17,6 +16,7 @@ import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
+import org.springframework.kafka.listener.adapter.ConsumerRecordMetadata;
 import org.springframework.kafka.support.serializer.JsonSerializer;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.test.context.TestPropertySource;
@@ -27,7 +27,6 @@ import java.util.*;
 import java.util.concurrent.ExecutionException;
 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;
 
@@ -63,8 +62,6 @@ class ApplicationTests
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
-	org.apache.kafka.clients.consumer.Consumer<String, ClientMessage> kafkaConsumer;
-	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
 	ApplicationProperties applicationProperties;
@@ -73,11 +70,11 @@ class ApplicationTests
 	@Autowired
 	EndlessConsumer endlessConsumer;
 	@Autowired
-	RecordHandler recordHandler;
+	ClientMessageHandler clientMessageHandler;
 
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
-	Set<ConsumerRecord<String, ClientMessage>> receivedRecords;
+	Set<ClientMessage> received;
 
 
 	/** Tests methods */
@@ -89,7 +86,7 @@ class ApplicationTests
 
 		await("100 records received")
 				.atMost(Duration.ofSeconds(30))
-				.until(() -> receivedRecords.size() == 100);
+				.until(() -> received.size() == 100);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
@@ -114,7 +111,7 @@ class ApplicationTests
 
 		await("99 records received")
 				.atMost(Duration.ofSeconds(30))
-				.until(() -> receivedRecords.size() == 99);
+				.until(() -> received.size() == 99);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
@@ -139,17 +136,17 @@ class ApplicationTests
 	@Test
 	void commitsOffsetOnProgramLogicErrorFoo()
 	{
-		recordHandler.testHandler = (record) ->
+		clientMessageHandler.testHandler = (clientMessage, metadata) ->
 		{
-			if (Integer.parseInt(record.value().message)%10 ==0)
-				throw new RuntimeException("BOOM: " + record.value().message + "%10 == 0");
+			if (Integer.parseInt(clientMessage.message)%10 ==0)
+				throw new RuntimeException("BOOM: " + clientMessage.message + "%10 == 0");
 		};
 
 		send100Messages((key, counter) -> serialize(key, counter));
 
 		await("80 records received")
 				.atMost(Duration.ofSeconds(30))
-				.until(() -> receivedRecords.size() == 100);
+				.until(() -> received.size() == 100);
 
 		await("Offsets committed")
 				.atMost(Duration.ofSeconds(10))
@@ -274,11 +271,11 @@ class ApplicationTests
 	@BeforeEach
 	public void init()
 	{
-		recordHandler.testHandler = (record) -> {};
+		clientMessageHandler.testHandler = (clientMessage, metadata) -> {};
 
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
-		receivedRecords = new HashSet<>();
+		received = new HashSet<>();
 
 		doForCurrentOffsets((tp, offset) ->
 		{
@@ -286,14 +283,13 @@ class ApplicationTests
 			newOffsets.put(tp, offset - 1);
 		});
 
-		recordHandler.captureOffsets =
-				record ->
+		clientMessageHandler.captureOffsets =
+				(clientMessage, metadata) ->
 				{
-					receivedRecords.add(record);
-					log.debug("TEST: Processing record #{}: {}", receivedRecords.size(), record.value());
+					received.add(clientMessage);
+					log.debug("TEST: Processing record #{}: {}", received.size(), clientMessage);
 					newOffsets.put(
-							new TopicPartition(record.topic(), record.partition()),
-							record.offset());
+							new TopicPartition(metadata.topic(), metadata.partition()), metadata.offset());
 				};
 
 		endlessConsumer.start();
@@ -312,18 +308,18 @@ class ApplicationTests
 		}
 	}
 
-	public static class RecordHandler implements Consumer<ConsumerRecord<String, ClientMessage>>
+	public static class ClientMessageHandler implements BiConsumer<ClientMessage, ConsumerRecordMetadata>
 	{
-		Consumer<ConsumerRecord<String, ClientMessage>> captureOffsets;
-		Consumer<ConsumerRecord<String, ClientMessage>> testHandler;
+		BiConsumer<ClientMessage, ConsumerRecordMetadata> captureOffsets;
+		BiConsumer<ClientMessage, ConsumerRecordMetadata> testHandler;
 
 
 		@Override
-		public void accept(ConsumerRecord<String, ClientMessage> record)
+		public void accept(ClientMessage clientMessage, ConsumerRecordMetadata metadata)
 		{
 			captureOffsets
 					.andThen(testHandler)
-					.accept(record);
+					.accept(clientMessage, metadata);
 		}
 	}
 
@@ -333,9 +329,9 @@ class ApplicationTests
 	{
 		@Primary
 		@Bean
-		public Consumer<ConsumerRecord<String, ClientMessage>> testHandler()
+		public BiConsumer<ClientMessage, ConsumerRecordMetadata> testHandler()
 		{
-			return new RecordHandler();
+			return new ClientMessageHandler();
 		}
 
 		@Bean