fix(deps): update dependency org.springframework.boot:spring-boot-sta…

…rter-parent to v3.4.0-rc1 (#575)

* fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v3.4.0-rc1

* fix : issues with Integration Tests

* fix : rest

* fix : issue with connecting to kafka

* minor code refactor

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Raja Kolli <[email protected]>

kafka-dsl-integration/docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   broker:
-    image: apache/kafka:3.8.1
+    image: apache/kafka-native:3.8.1
     hostname: broker
     ports:
       - "9092:9092"

kafka-dsl-integration/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.0-M3</version>
+		<version>3.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example.integration</groupId>
@@ -84,7 +84,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.47.0</version>
+                            <version>2.50.0</version>
                         </palantirJavaFormat>
                         <importOrder />
                         <removeUnusedImports />

kafka-dsl-integration/src/test/java/com/example/integration/kafkadsl/ContainerConfiguration.java

@@ -0,0 +1,25 @@
+package com.example.integration.kafkadsl;
+
+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)
+class ContainerConfiguration {
+
+    @ServiceConnection
+    @Bean
+    KafkaContainer kafkaContainer() {
+        return new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.1"));
+    }
+
+    @Bean
+    DynamicPropertyRegistrar kafkaProperties(KafkaContainer kafkaContainer) {
+        return (properties) -> {
+            properties.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
+        };
+    }
+}

kafka-dsl-integration/src/test/java/com/example/integration/kafkadsl/KafkaDslApplicationTests.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestKafkaDslApplication.class)
+@SpringBootTest(classes = ContainerConfiguration.class)
 class KafkaDslApplicationTests {
 
     @Test

kafka-dsl-integration/src/test/java/com/example/integration/kafkadsl/TestKafkaDslApplication.java

@@ -1,29 +1,12 @@
 package com.example.integration.kafkadsl;
 
 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.kafka.KafkaContainer;
-import org.testcontainers.utility.DockerImageName;
 
-@TestConfiguration(proxyBeanMethods = false)
 public class TestKafkaDslApplication {
 
-    @Bean
-    @ServiceConnection
-    KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
-        KafkaContainer kafkaContainer =
-                new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.8.0"));
-        // Connect our Spring application to our Testcontainers Kafka instance
-        dynamicPropertyRegistry.add("spring.kafka.bootstrap-servers", kafkaContainer::getBootstrapServers);
-        return kafkaContainer;
-    }
-
     public static void main(String[] args) {
         SpringApplication.from(KafkaDslApplication::main)
-                .with(TestKafkaDslApplication.class)
+                .with(ContainerConfiguration.class)
                 .run(args);
     }
 }

kafka-reactor/boot-kafka-reactor-consumer/docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   broker:
-    image: apache/kafka:3.8.1
+    image: apache/kafka-native:3.8.1
     hostname: broker
     ports:
       - "9092:9092"

kafka-reactor/boot-kafka-reactor-consumer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.0-M3</version>
+        <version>3.4.0-RC1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.boot.kafka.reactor</groupId>
@@ -131,7 +131,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.47.0</version>
+                            <version>2.50.0</version>
                         </palantirJavaFormat>
                         <importOrder/>
                         <removeUnusedImports/>

kafka-reactor/boot-kafka-reactor-consumer/src/test/java/com/example/boot/kafka/reactor/BootKafkaReactorConsumerApplicationTests.java

@@ -1,5 +1,7 @@
 package com.example.boot.kafka.reactor;
 
+import com.example.boot.kafka.reactor.common.ContainerConfiguration;
+import com.example.boot.kafka.reactor.common.TestKafkaProducer;
 import com.example.boot.kafka.reactor.entity.MessageDTO;
 import com.example.boot.kafka.reactor.util.AppConstants;
 import java.security.SecureRandom;
@@ -21,7 +23,7 @@
 import reactor.kafka.sender.SenderRecord;
 import reactor.test.StepVerifier;
 
-@SpringBootTest(classes = TestBootKafkaReactorConsumerApplication.class)
+@SpringBootTest(classes = {ContainerConfiguration.class, TestKafkaProducer.class})
 @ActiveProfiles("test")
 @AutoConfigureWebTestClient
 class BootKafkaReactorConsumerApplicationTests {

kafka-reactor/boot-kafka-reactor-consumer/src/test/java/com/example/boot/kafka/reactor/TestBootKafkaReactorConsumerApplication.java

@@ -1,51 +1,14 @@
 package com.example.boot.kafka.reactor;
 
-import com.example.boot.kafka.reactor.entity.MessageDTO;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.example.boot.kafka.reactor.common.ContainerConfiguration;
+import com.example.boot.kafka.reactor.common.TestKafkaProducer;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-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.PostgreSQLContainer;
-import org.testcontainers.kafka.KafkaContainer;
-import org.testcontainers.utility.DockerImageName;
-import reactor.kafka.sender.KafkaSender;
-import reactor.kafka.sender.SenderOptions;
 
-@TestConfiguration(proxyBeanMethods = false)
 class TestBootKafkaReactorConsumerApplication {
 
-    private static final Logger log = LoggerFactory.getLogger(TestBootKafkaReactorConsumerApplication.class);
-
-    @Bean
-    @ServiceConnection
-    PostgreSQLContainer<?> postgresContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:17.0-alpine"));
-    }
-
-    @Bean
-    @ServiceConnection
-    KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
-        KafkaContainer kafkaContainer =
-                new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.8.0"));
-        dynamicPropertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
-        return kafkaContainer;
-    }
-
-    @Bean
-    KafkaSender<Integer, MessageDTO> reactiveKafkaSender(KafkaProperties properties) {
-        log.info("Creating Sender");
-        Map<String, Object> props = properties.buildProducerProperties(null);
-        return KafkaSender.create(SenderOptions.create(props));
-    }
-
     public static void main(String[] args) {
         SpringApplication.from(BootKafkaReactorConsumerApplication::main)
-                .with(TestBootKafkaReactorConsumerApplication.class)
+                .with(ContainerConfiguration.class, TestKafkaProducer.class)
                 .run(args);
     }
 }

kafka-reactor/boot-kafka-reactor-consumer/src/test/java/com/example/boot/kafka/reactor/common/ContainerConfiguration.java

@@ -0,0 +1,32 @@
+package com.example.boot.kafka.reactor.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.containers.PostgreSQLContainer;
+import org.testcontainers.kafka.KafkaContainer;
+import org.testcontainers.utility.DockerImageName;
+
+@TestConfiguration(proxyBeanMethods = false)
+public class ContainerConfiguration {
+
+    @Bean
+    @ServiceConnection
+    PostgreSQLContainer<?> postgresContainer() {
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.0-alpine"));
+    }
+
+    @ServiceConnection
+    @Bean
+    KafkaContainer kafkaContainer() {
+        return new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.1"));
+    }
+
+    @Bean
+    DynamicPropertyRegistrar kafkaProperties(KafkaContainer kafkaContainer) {
+        return (properties) -> {
+            properties.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
+        };
+    }
+}

kafka-reactor/boot-kafka-reactor-consumer/src/test/java/com/example/boot/kafka/reactor/common/TestKafkaProducer.java

@@ -0,0 +1,41 @@
+package com.example.boot.kafka.reactor.common;
+
+import com.example.boot.kafka.reactor.entity.MessageDTO;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import reactor.kafka.sender.KafkaSender;
+import reactor.kafka.sender.SenderOptions;
+
+/**
+ * Test configuration class that provides a reactive Kafka producer for integration testing.
+ * This configuration creates a KafkaSender bean that can be used to send messages
+ * in a reactive manner during tests.
+ */
+@TestConfiguration(proxyBeanMethods = false)
+public class TestKafkaProducer {
+
+    private static final Logger log = LoggerFactory.getLogger(TestKafkaProducer.class);
+
+    @Bean
+    KafkaSender<Integer, MessageDTO> reactiveKafkaSender(KafkaProperties properties) {
+        log.info("Creating reactive Kafka sender with properties: {}", properties.getProducer());
+        Map<String, Object> props = properties.buildProducerProperties(null);
+        SenderOptions<Integer, MessageDTO> senderOptions = SenderOptions.create(props);
+        senderOptions.maxInFlight(1024);
+        senderOptions.stopOnError(false);
+
+        KafkaSender<Integer, MessageDTO> sender = KafkaSender.create(senderOptions);
+
+        // Register shutdown hook
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            log.info("Closing Kafka sender");
+            sender.close();
+        }));
+
+        return sender;
+    }
+}

kafka-reactor/boot-kafka-reactor-producer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.0-M3</version>
+        <version>3.4.0-RC1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.boot.kafka.reactor</groupId>

kafka-reactor/boot-kafka-reactor-producer/src/test/java/com/example/boot/kafka/reactor/BootKafkaReactorProducerApplicationTests.java

@@ -1,5 +1,7 @@
 package com.example.boot.kafka.reactor;
 
+import com.example.boot.kafka.reactor.common.ContainerConfiguration;
+import com.example.boot.kafka.reactor.common.TestKafkaConsumer;
 import com.example.boot.kafka.reactor.entity.MessageDTO;
 import java.time.LocalDateTime;
 import java.util.concurrent.TimeUnit;
@@ -18,7 +20,7 @@
 import reactor.kafka.receiver.ReceiverOffset;
 import reactor.test.StepVerifier;
 
-@SpringBootTest(classes = TestBootKafkaReactorProducerApplication.class)
+@SpringBootTest(classes = {ContainerConfiguration.class, TestKafkaConsumer.class})
 @ActiveProfiles("test")
 @AutoConfigureWebTestClient
 class BootKafkaReactorProducerApplicationTests {

kafka-reactor/boot-kafka-reactor-producer/src/test/java/com/example/boot/kafka/reactor/TestBootKafkaReactorProducerApplication.java

@@ -1,51 +1,13 @@
 package com.example.boot.kafka.reactor;
 
-import static com.example.boot.kafka.reactor.util.AppConstants.HELLO_TOPIC;
-
-import com.example.boot.kafka.reactor.entity.MessageDTO;
-import java.util.Collections;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.example.boot.kafka.reactor.common.ContainerConfiguration;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
-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.kafka.KafkaContainer;
-import org.testcontainers.utility.DockerImageName;
-import reactor.kafka.receiver.KafkaReceiver;
-import reactor.kafka.receiver.ReceiverOptions;
 
-@TestConfiguration(proxyBeanMethods = false)
 class TestBootKafkaReactorProducerApplication {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TestBootKafkaReactorProducerApplication.class);
-
-    @Bean
-    @ServiceConnection
-    KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
-        KafkaContainer kafkaContainer =
-                new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.0"));
-        dynamicPropertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
-        return kafkaContainer;
-    }
-
-    @Bean
-    KafkaReceiver<Integer, MessageDTO> receiver(KafkaProperties properties) {
-        LOGGER.info("Creating receiver");
-        ReceiverOptions<Integer, MessageDTO> receiverOptions = ReceiverOptions.<Integer, MessageDTO>create(
-                        properties.buildConsumerProperties(null))
-                .subscription(Collections.singleton(HELLO_TOPIC))
-                .addAssignListener(partitions -> LOGGER.debug("onPartitionsAssigned {}", partitions))
-                .addRevokeListener(partitions -> LOGGER.debug("onPartitionsRevoked {}", partitions));
-
-        return KafkaReceiver.create(receiverOptions);
-    }
-
     public static void main(String[] args) {
         SpringApplication.from(BootKafkaReactorProducerApplication::main)
-                .with(TestBootKafkaReactorProducerApplication.class)
+                .with(ContainerConfiguration.class)
                 .run(args);
     }
 }

kafka-reactor/boot-kafka-reactor-producer/src/test/java/com/example/boot/kafka/reactor/common/ContainerConfiguration.java

@@ -0,0 +1,25 @@
+package com.example.boot.kafka.reactor.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 ContainerConfiguration {
+
+    @ServiceConnection
+    @Bean
+    KafkaContainer kafkaContainer() {
+        return new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.1"));
+    }
+
+    @Bean
+    DynamicPropertyRegistrar kafkaProperties(KafkaContainer kafkaContainer) {
+        return (properties) -> {
+            properties.add("spring.kafka.bootstrap-servers", kafkaContainer::getBootstrapServers);
+        };
+    }
+}