X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FGenericApplicationTests.java;h=9a6f8121382626bd21a41082289e8cd46c5ed4f3;hb=ecadcd52ab7fe117fef3450a27b9d6ecdf621716;hp=ebad5a80e950f239a63008ded28430468bc312b2;hpb=4b19a0061b88863c015424088f429b6998557dc8;p=demos%2Fkafka%2Ftraining

diff --git a/src/test/java/de/juplo/kafka/GenericApplicationTests.java b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
index ebad5a8..9a6f812 100644
--- a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@ -11,6 +11,8 @@ import org.apache.kafka.common.serialization.*;
 import org.apache.kafka.common.utils.Bytes;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
 import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Import;
@@ -35,10 +37,13 @@ import static org.awaitility.Awaitility.*;
 @SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
 @TestPropertySource(
 		properties = {
-				"consumer.bootstrap-server=${spring.embedded.kafka.brokers}",
-				"consumer.topic=" + TOPIC,
-				"consumer.commit-interval=1s" })
+				"sumup.adder.bootstrap-server=${spring.embedded.kafka.brokers}",
+				"sumup.adder.topic=" + TOPIC,
+				"sumup.adder.commit-interval=1s",
+				"spring.mongodb.embedded.version=4.4.13" })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
+@EnableAutoConfiguration
+@AutoConfigureDataMongo
 @Slf4j
 abstract class GenericApplicationTests<K, V>
 {
@@ -54,6 +59,12 @@ abstract class GenericApplicationTests<K, V>
 	ApplicationProperties properties;
 	@Autowired
 	ExecutorService executor;
+	@Autowired
+	StateRepository stateRepository;
+	@Autowired
+	PollIntervalAwareConsumerRebalanceListener rebalanceListener;
+	@Autowired
+	RecordHandler<K, V> recordHandler;
 
 	KafkaProducer<Bytes, Bytes> testRecordProducer;
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
@@ -216,23 +227,29 @@ abstract class GenericApplicationTests<K, V>
 	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);
+			Integer partition = tp.partition();
+			StateDocument document =
+					stateRepository
+							.findById(partition.toString())
+							.orElse(new StateDocument(partition));
+			document.offset = offset;
+			stateRepository.save(document);
 		});
-		// The new positions must be commited!
-		offsetConsumer.commitSync();
 		offsetConsumer.unsubscribe();
 	}
 
 	void doForCurrentOffsets(BiConsumer<TopicPartition, Long> consumer)
 	{
-		offsetConsumer.assign(partitions());
-		partitions().forEach(tp -> consumer.accept(tp, offsetConsumer.position(tp)));
-		offsetConsumer.unsubscribe();
+		partitions().forEach(tp ->
+		{
+			String partition = Integer.toString(tp.partition());
+			Optional<Long> offset = stateRepository.findById(partition).map(document -> document.offset);
+			consumer.accept(tp, offset.orElse(0l));
+		});
 	}
 
 	List<TopicPartition> partitions()
@@ -324,14 +341,17 @@ abstract class GenericApplicationTests<K, V>
 			newOffsets.put(tp, offset - 1);
 		});
 
-		Consumer<ConsumerRecord<K, V>> captureOffsetAndExecuteTestHandler =
-				record ->
+		TestRecordHandler<K, V> captureOffsetAndExecuteTestHandler =
+				new TestRecordHandler<K, V>(recordHandler)
 				{
-					newOffsets.put(
-							new TopicPartition(record.topic(), record.partition()),
-							record.offset());
-					receivedRecords.add(record);
-					consumer.accept(record);
+					@Override
+					public void onNewRecord(ConsumerRecord<K, V> record)
+					{
+						newOffsets.put(
+								new TopicPartition(record.topic(), record.partition()),
+								record.offset());
+						receivedRecords.add(record);
+					}
 				};
 
 		endlessConsumer =
@@ -340,6 +360,7 @@ abstract class GenericApplicationTests<K, V>
 						properties.getClientId(),
 						properties.getTopic(),
 						kafkaConsumer,
+						rebalanceListener,
 						captureOffsetAndExecuteTestHandler);
 
 		endlessConsumer.start();