From 87012a552df81f34c22509ce2a293bf7fd2edc6d Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Fri, 19 Jul 2024 06:58:16 +0000 Subject: [PATCH] feat : using apachekafka container for tests --- kafka-spring-cloud-sample/pom.xml | 2 +- .../cloudkafkasample/TestCloudKafkaSampleApplication.java | 6 ++---- .../analytics-spring-cloud-streams-kafka-consumer/pom.xml | 2 +- .../analytics/TestAnalyticsConsumerApplication.java | 6 +++--- .../analytics-spring-cloud-streams-kafka-producer/pom.xml | 2 +- .../analytics/TestAnalyticsProducerApplication.java | 5 ++--- spring-modulith-outbox-pattern/pom.xml | 2 +- .../com/example/outboxpattern/common/ContainersConfig.java | 7 +++---- 8 files changed, 14 insertions(+), 18 deletions(-) diff --git a/kafka-spring-cloud-sample/pom.xml b/kafka-spring-cloud-sample/pom.xml index 1e4e6aab..1adceaf9 100644 --- a/kafka-spring-cloud-sample/pom.xml +++ b/kafka-spring-cloud-sample/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.2 + 3.4.0-M1 com.example diff --git a/kafka-spring-cloud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java b/kafka-spring-cloud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java index f0b04a1b..082b6cc7 100644 --- a/kafka-spring-cloud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java +++ b/kafka-spring-cloud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; import org.springframework.test.context.DynamicPropertyRegistry; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; @TestConfiguration(proxyBeanMethods = false) @@ -15,9 +15,7 @@ class TestCloudKafkaSampleApplication { @Bean @ServiceConnection KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) { - KafkaContainer kafkaContainer = new KafkaContainer( - DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2")) - .withKraft() + KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.1")) .withReuse(true); dynamicPropertyRegistry.add("spring.cloud.stream.kafka.binder.brokers", kafkaContainer::getBootstrapServers); return kafkaContainer; diff --git a/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/pom.xml b/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/pom.xml index 3f54697b..cd6a4699 100644 --- a/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/pom.xml +++ b/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.2 + 3.4.0-M1 com.example diff --git a/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java b/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java index 54bc1137..4413fa87 100644 --- a/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java +++ b/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java @@ -6,19 +6,19 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; import org.springframework.test.context.DynamicPropertyRegistry; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; @TestConfiguration(proxyBeanMethods = false) public class TestAnalyticsConsumerApplication { private static final DockerImageName KAFKA_IMAGE_NAME = - DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2"); + DockerImageName.parse("apache/kafka").withTag("3.7.1"); @Bean @ServiceConnection KafkaContainer kafkaContainer(DynamicPropertyRegistry registry) { - KafkaContainer kafkaContainer = new KafkaContainer(KAFKA_IMAGE_NAME).withKraft(); + KafkaContainer kafkaContainer = new KafkaContainer(KAFKA_IMAGE_NAME); registry.add("spring.kafka.bootstrap-servers", kafkaContainer::getBootstrapServers); return kafkaContainer; } diff --git a/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml b/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml index adbc8a18..1fb4337b 100644 --- a/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml +++ b/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.2 + 3.4.0-M1 diff --git a/kafka-streams/analytics-spring-cloud-streams-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java b/kafka-streams/analytics-spring-cloud-streams-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java index b2fc1544..aab73e79 100644 --- a/kafka-streams/analytics-spring-cloud-streams-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java +++ b/kafka-streams/analytics-spring-cloud-streams-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; import org.springframework.test.context.DynamicPropertyRegistry; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; @TestConfiguration(proxyBeanMethods = false) @@ -16,8 +16,7 @@ class TestAnalyticsProducerApplication { @ServiceConnection KafkaContainer kafkaContainer(DynamicPropertyRegistry propertyRegistry) { KafkaContainer kafkaContainer = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2")) - .withKraft(); + new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.1")); propertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers); return kafkaContainer; } diff --git a/spring-modulith-outbox-pattern/pom.xml b/spring-modulith-outbox-pattern/pom.xml index 0c9f02ad..add7cf84 100644 --- a/spring-modulith-outbox-pattern/pom.xml +++ b/spring-modulith-outbox-pattern/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.2 + 3.4.0-M1 com.example.outboxpattern diff --git a/spring-modulith-outbox-pattern/src/test/java/com/example/outboxpattern/common/ContainersConfig.java b/spring-modulith-outbox-pattern/src/test/java/com/example/outboxpattern/common/ContainersConfig.java index a9770b96..48eab4ff 100644 --- a/spring-modulith-outbox-pattern/src/test/java/com/example/outboxpattern/common/ContainersConfig.java +++ b/spring-modulith-outbox-pattern/src/test/java/com/example/outboxpattern/common/ContainersConfig.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.test.context.DynamicPropertyRegistry; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; @TestConfiguration(proxyBeanMethods = false) @@ -21,9 +21,8 @@ PostgreSQLContainer postgreSQLContainer() { @Bean @ServiceConnection KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) { - KafkaContainer kafkaContainer = new KafkaContainer( - DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2")) - .withKraft(); + KafkaContainer kafkaContainer = + new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.1")); // Connect our Spring application to our Testcontainers Kafka instance dynamicPropertyRegistry.add("spring.kafka.consumer.bootstrap-servers", kafkaContainer::getBootstrapServers); dynamicPropertyRegistry.add("spring.kafka.producer.bootstrap-servers", kafkaContainer::getBootstrapServers);