X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationTests.java;h=a185b7206c439ccdd9c0ac756542c71991302c03;hb=b69dc2b8e3f3dd656577be868ae3d6d7b647c498;hp=40dc149e519a7f95709d7a7966dddf5b8de722df;hpb=ac56a4e914c4a7d687c8c85b2608f0e397372d56;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 40dc149..a185b72 100644
--- a/src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/src/test/java/de/juplo/kafka/ApplicationTests.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.kafka.KafkaAutoConfiguration;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -35,11 +37,15 @@ 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 })
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestPropertySource(
 		properties = {
-				"consumer.bootstrap-server=${spring.embedded.kafka.brokers}",
+				"spring.kafka.consumer.bootstrap-servers=${spring.embedded.kafka.brokers}",
 				"consumer.topic=" + TOPIC })
 @EmbeddedKafka(topics = TOPIC, partitions = PARTITIONS)
 @Slf4j
@@ -56,11 +62,13 @@ class ApplicationTests
 	@Autowired
 	KafkaProducer<String, Bytes> kafkaProducer;
 	@Autowired
-	KafkaConsumer<String, Long> kafkaConsumer;
+	org.apache.kafka.clients.consumer.Consumer<String, Long> kafkaConsumer;
 	@Autowired
 	KafkaConsumer<Bytes, Bytes> offsetConsumer;
 	@Autowired
-	ApplicationProperties properties;
+	ApplicationProperties applicationProperties;
+	@Autowired
+	KafkaProperties kafkaProperties;
 	@Autowired
 	ExecutorService executor;
 
@@ -255,8 +263,8 @@ class ApplicationTests
 		endlessConsumer =
 				new EndlessConsumer<>(
 						executor,
-						properties.getClientId(),
-						properties.getTopic(),
+						kafkaProperties.getConsumer().getClientId(),
+						applicationProperties.getTopic(),
 						kafkaConsumer,
 						captureOffsetAndExecuteTestHandler);
 
@@ -288,10 +296,10 @@ class ApplicationTests
 		}
 
 		@Bean
-		KafkaProducer<String, Bytes> kafkaProducer(ApplicationProperties properties)
+		KafkaProducer<String, Bytes> kafkaProducer(KafkaProperties properties)
 		{
 			Properties props = new Properties();
-			props.put("bootstrap.servers", properties.getBootstrapServer());
+			props.put("bootstrap.servers", properties.getConsumer().getBootstrapServers());
 			props.put("linger.ms", 100);
 			props.put("key.serializer", StringSerializer.class.getName());
 			props.put("value.serializer", BytesSerializer.class.getName());
@@ -300,12 +308,12 @@ class ApplicationTests
 		}
 
 		@Bean
-		KafkaConsumer<Bytes, Bytes> offsetConsumer(ApplicationProperties properties)
+		KafkaConsumer<Bytes, Bytes> offsetConsumer(KafkaProperties properties)
 		{
 			Properties props = new Properties();
-			props.put("bootstrap.servers", properties.getBootstrapServer());
+			props.put("bootstrap.servers", properties.getConsumer().getBootstrapServers());
 			props.put("client.id", "OFFSET-CONSUMER");
-			props.put("group.id", properties.getGroupId());
+			props.put("group.id", properties.getConsumer().getGroupId());
 			props.put("key.deserializer", BytesDeserializer.class.getName());
 			props.put("value.deserializer", BytesDeserializer.class.getName());