feat : using apachekafka container for tests (#527)

* feat : using apachekafka container for tests * fix : spotless issue * Update TestCloudKafkaSampleApplication.java * Update pom.xml * fix : issues with dynamic properties * revert changes
rajadilipkolli · Oct 29, 2024 · e8497f4 · e8497f4
1 parent b0f4cca
commit e8497f4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/kafka-spring-cloud-sample/pom.xml b/kafka-spring-cloud-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0-RC1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>21</java.version>
-        <spring-cloud.version>2023.0.3</spring-cloud.version>
+        <spring-cloud.version>2024.0.0-M2</spring-cloud.version>
         <springdoc-openapi.version>2.6.0</springdoc-openapi.version>
         <spotless.version>2.43.0</spotless.version>
     </properties>
@@ -88,7 +88,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.38.0</version>
+                            <version>2.50.0</version>
                         </palantirJavaFormat>
                         <importOrder/>
                         <removeUnusedImports/>

diff --git a/...ud-sample/src/test/java/com/example/cloudkafkasample/CloudKafkaSampleApplicationTest.java b/...ud-sample/src/test/java/com/example/cloudkafkasample/CloudKafkaSampleApplicationTest.java
@@ -6,6 +6,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
+import com.example.cloudkafkasample.common.ContainersConfig;
 import com.example.cloudkafkasample.sink.Receiver;
 import java.time.Duration;
 import org.junit.jupiter.api.Test;
@@ -15,7 +16,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
-@SpringBootTest(classes = TestCloudKafkaSampleApplication.class)
+@SpringBootTest(classes = ContainersConfig.class)
 @AutoConfigureMockMvc
 class CloudKafkaSampleApplicationTest {
 

diff --git a/...ud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java b/...ud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java
@@ -1,31 +1,14 @@
 /* (C)2023 */
 package com.example.cloudkafkasample;
 
+import com.example.cloudkafkasample.common.ContainersConfig;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.test.context.TestConfiguration;
-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.utility.DockerImageName;
 
-@TestConfiguration(proxyBeanMethods = false)
 class TestCloudKafkaSampleApplication {
 
-    @Bean
-    @ServiceConnection
-    KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
-        KafkaContainer kafkaContainer = new KafkaContainer(
-                        DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2"))
-                .withKraft()
-                .withReuse(true);
-        dynamicPropertyRegistry.add("spring.cloud.stream.kafka.binder.brokers", kafkaContainer::getBootstrapServers);
-        return kafkaContainer;
-    }
-
     public static void main(String[] args) {
         SpringApplication.from(CloudKafkaSampleApplication::main)
-                .with(TestCloudKafkaSampleApplication.class)
+                .with(ContainersConfig.class)
                 .run(args);
     }
 }
diff --git a/...ring-cloud-sample/src/test/java/com/example/cloudkafkasample/common/ContainersConfig.java b/...ring-cloud-sample/src/test/java/com/example/cloudkafkasample/common/ContainersConfig.java
@@ -0,0 +1,27 @@
+/* (C)2024 */
+package com.example.cloudkafkasample.common;
+
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.DynamicPropertyRegistrar;
+import org.testcontainers.kafka.KafkaContainer;
+import org.testcontainers.utility.DockerImageName;
+
+@TestConfiguration(proxyBeanMethods = false)
+public class ContainersConfig {
+
+    @Bean
+    @ServiceConnection
+    KafkaContainer kafkaContainer() {
+        return new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.1")).withReuse(true);
+    }
+
+    @Bean
+    public DynamicPropertyRegistrar kafkaProperties(KafkaContainer kafkaContainer) {
+        return (properties) -> {
+            // Connect our Spring application to our Testcontainers Kafka instance
+            properties.add("spring.cloud.stream.kafka.binder.brokers", kafkaContainer::getBootstrapServers);
+        };
+    }
+}