X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;fp=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=a632a89c41f936b88f1f23742e78183279138ef3;hb=b3777fba0ae679d9e2c9d36626fa208a952f83e8;hp=431431bbd605917ff4c960d646a45f28bcc39c10;hpb=ecd63311e0b6af698185bcf1e085f2b3237bd264;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 431431b..a632a89 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.java
@@ -21,13 +21,11 @@ import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import java.time.Clock;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -72,8 +70,11 @@ class ApplicationTests
 	ExecutorService executor;
 	@Autowired
 	PartitionStatisticsRepository repository;
+	@Autowired
+	KeyCountingRebalanceListener keyCountingRebalanceListener;
+	@Autowired
+	KeyCountingRecordHandler keyCountingRecordHandler;
 
-	Consumer<ConsumerRecord<String, Long>> testHandler;
 	EndlessConsumer<String, Long> endlessConsumer;
 	Map<TopicPartition, Long> oldOffsets;
 	Map<TopicPartition, Long> newOffsets;
@@ -185,7 +186,7 @@ class ApplicationTests
 			Optional<Long> offset = partitionStatisticsRepository.findById(partition).map(document -> document.offset);
 			consumer.accept(tp, offset.orElse(0l));
 		});
-	}
+		}
 
 	List<TopicPartition> partitions()
 	{
@@ -242,8 +243,6 @@ class ApplicationTests
 	@BeforeEach
 	public void init()
 	{
-		testHandler = record -> {} ;
-
 		oldOffsets = new HashMap<>();
 		newOffsets = new HashMap<>();
 		receivedRecords = new HashSet<>();
@@ -254,25 +253,25 @@ class ApplicationTests
 			newOffsets.put(tp, offset - 1);
 		});
 
-		Consumer<ConsumerRecord<String, Long>> captureOffsetAndExecuteTestHandler =
-				record ->
-				{
-					newOffsets.put(
-							new TopicPartition(record.topic(), record.partition()),
-							record.offset());
-					receivedRecords.add(record);
-					testHandler.accept(record);
+		TestRecordHandler<String, Long> captureOffsetAndExecuteTestHandler =
+				new TestRecordHandler<String, Long>(keyCountingRecordHandler) {
+					@Override
+					public void onNewRecord(ConsumerRecord<String, Long> record)
+					{
+						newOffsets.put(
+								new TopicPartition(record.topic(), record.partition()),
+								record.offset());
+						receivedRecords.add(record);
+					}
 				};
 
 		endlessConsumer =
 				new EndlessConsumer<>(
 						executor,
-						repository,
 						properties.getClientId(),
 						properties.getTopic(),
-						Clock.systemDefaultZone(),
-						properties.getCommitInterval(),
 						kafkaConsumer,
+						keyCountingRebalanceListener,
 						captureOffsetAndExecuteTestHandler);
 
 		endlessConsumer.start();