X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FGenericApplicationTests.java;h=21c3f7f01c524eb64ad88d204b9b7a82e4a65e22;hb=7adff476ad862d30d668d75212d1ca1c7cf16b03;hp=0f40058b2e8ed93582e0456e9aa1be9c5b3f5d17;hpb=e11c6152c721440d4a599a6f5fe0fe46f2283f31;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 0f40058..21c3f7f 100644
--- a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@ -2,6 +2,7 @@ package de.juplo.kafka;
 
 import com.mongodb.client.MongoClient;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
@@ -13,6 +14,8 @@ 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.autoconfigure.kafka.KafkaAutoConfiguration;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.boot.autoconfigure.mongo.MongoProperties;
 import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
 import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
@@ -36,12 +39,16 @@ import static org.assertj.core.api.Assertions.*;
 import static org.awaitility.Awaitility.*;
 
 
-@SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
+@SpringJUnitConfig(
+  initializers = ConfigDataApplicationContextInitializer.class,
+  classes = {
+      KafkaAutoConfiguration.class,
+      ApplicationTests.Configuration.class })
 @TestPropertySource(
 		properties = {
-				"sumup.adder.bootstrap-server=${spring.embedded.kafka.brokers}",
+				"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
 				"sumup.adder.topic=" + TOPIC,
-				"sumup.adder.commit-interval=500ms",
+				"spring.kafka.consumer.auto-commit-interval=500ms",
 				"spring.mongodb.embedded.version=4.4.13" })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @EnableAutoConfiguration
@@ -54,21 +61,21 @@ abstract class GenericApplicationTests<K, V>
 
 
 	@Autowired
-	KafkaConsumer<K, V> kafkaConsumer;
+	org.apache.kafka.clients.consumer.Consumer<K, V> kafkaConsumer;
 	@Autowired
 	Consumer<ConsumerRecord<K, V>> consumer;
 	@Autowired
-	ApplicationProperties properties;
+	ApplicationProperties applicationProperties;
 	@Autowired
-	ExecutorService executor;
+	KafkaProperties kafkaProperties;
 	@Autowired
-	StateRepository stateRepository;
+	ExecutorService executor;
 	@Autowired
 	MongoClient mongoClient;
 	@Autowired
 	MongoProperties mongoProperties;
 	@Autowired
-	PollIntervalAwareConsumerRebalanceListener rebalanceListener;
+	ConsumerRebalanceListener rebalanceListener;
 	@Autowired
 	RecordHandler<K, V> recordHandler;
 
@@ -93,7 +100,7 @@ abstract class GenericApplicationTests<K, V>
 	/** Tests methods */
 
 	@Test
-	void commitsCurrentOffsetsOnSuccess()
+	void commitsCurrentOffsetsOnSuccess() throws Exception
 	{
 		int numberOfGeneratedMessages =
 				recordGenerator.generate(false, false, messageSender);
@@ -116,6 +123,7 @@ abstract class GenericApplicationTests<K, V>
 				.isThrownBy(() -> endlessConsumer.exitStatus())
 				.describedAs("Consumer should still be running");
 
+		endlessConsumer.stop();
 		recordGenerator.assertBusinessLogic();
 	}
 
@@ -213,7 +221,7 @@ abstract class GenericApplicationTests<K, V>
 			Long expected = offsetsToCheck.get(tp) + 1;
 			log.debug("Checking, if the offset {} for {} is at most {}", offset, tp, expected);
 			assertThat(offset)
-					.describedAs("Committed offset corresponds to the offset of the consumer")
+					.describedAs("Committed offset must be at most equal to the offset of the consumer")
 					.isLessThanOrEqualTo(expected);
 			isOffsetBehindSeen.add(offset < expected);
 		});
@@ -248,29 +256,23 @@ 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)
 	{
-		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));
-		});
+		offsetConsumer.assign(partitions());
+		partitions().forEach(tp -> consumer.accept(tp, offsetConsumer.position(tp)));
+		offsetConsumer.unsubscribe();
 	}
 
 	List<TopicPartition> partitions()
@@ -336,16 +338,16 @@ abstract class GenericApplicationTests<K, V>
 	{
 		Properties props;
 		props = new Properties();
-		props.put("bootstrap.servers", properties.getBootstrapServer());
+		props.put("bootstrap.servers", kafkaProperties.getBootstrapServers());
 		props.put("linger.ms", 100);
 		props.put("key.serializer", BytesSerializer.class.getName());
 		props.put("value.serializer", BytesSerializer.class.getName());
 		testRecordProducer = new KafkaProducer<>(props);
 
 		props = new Properties();
-		props.put("bootstrap.servers", properties.getBootstrapServer());
+		props.put("bootstrap.servers", kafkaProperties.getBootstrapServers());
 		props.put("client.id", "OFFSET-CONSUMER");
-		props.put("group.id", properties.getGroupId());
+		props.put("group.id", kafkaProperties.getConsumer().getGroupId());
 		props.put("key.deserializer", BytesDeserializer.class.getName());
 		props.put("value.deserializer", BytesDeserializer.class.getName());
 		offsetConsumer = new KafkaConsumer<>(props);
@@ -379,8 +381,8 @@ abstract class GenericApplicationTests<K, V>
 		endlessConsumer =
 				new EndlessConsumer<>(
 						executor,
-						properties.getClientId(),
-						properties.getTopic(),
+						kafkaProperties.getClientId(),
+						applicationProperties.getTopic(),
 						kafkaConsumer,
 						rebalanceListener,
 						captureOffsetAndExecuteTestHandler);
@@ -393,7 +395,6 @@ abstract class GenericApplicationTests<K, V>
 	{
 		try
 		{
-			endlessConsumer.stop();
 			testRecordProducer.close();
 			offsetConsumer.close();
 		}