feat: spring boot 4

Author: Angular2Guy

event-to-file/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.0</version>
+		<version>4.0.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>de.xxx</groupId>
@@ -27,32 +27,48 @@
 		<url/>
 	</scm>
 	<properties>
-		<java.version>21</java.version>
+		<java.version>24</java.version>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-kafka-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+<!--
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		-->
 	</dependencies>
 
 	<build>

event-to-file/src/main/java/de/xxx/eventtofile/kafka/KafkaConsumer.java

@@ -12,15 +12,14 @@
  */
 package de.xxx.eventtofile.kafka;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import de.xxx.eventtofile.model.FlightDto;
 import de.xxx.eventtofile.model.FlightSourceDto;
 import de.xxx.eventtofile.model.KafkaEventDto;
 import de.xxx.eventtofile.sink.FlightSinkService;
 import de.xxx.eventtofile.source.FlightSourceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.kafka.annotation.BackOff;
 import org.springframework.kafka.annotation.DltHandler;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.annotation.RetryableTopic;
@@ -29,8 +28,8 @@
 import org.springframework.kafka.support.KafkaHeaders;
 import org.springframework.kafka.support.SendResult;
 import org.springframework.messaging.handler.annotation.Header;
-import org.springframework.retry.annotation.Backoff;
 import org.springframework.stereotype.Component;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -41,20 +40,20 @@
 @Component
 public class KafkaConsumer {
     private static final Logger LOGGER = LoggerFactory.getLogger(KafkaConsumer.class);
-    private final ObjectMapper objectMapper;
+    private final JsonMapper objectMapper;
     private final KafkaTemplate<String,String> kafkaTemplate;
     private final FlightSourceService flightSourceService;
     private final FlightSinkService flightSinkService;
 
-    public KafkaConsumer(ObjectMapper objectMapper, KafkaTemplate<String,String> kafkaTemplate,
+    public KafkaConsumer(JsonMapper objectMapper, KafkaTemplate<String,String> kafkaTemplate,
                          FlightSourceService flightSourceService, FlightSinkService flightSinkService) {
         this.objectMapper = objectMapper;
         this.kafkaTemplate = kafkaTemplate;
         this.flightSourceService = flightSourceService;
         this.flightSinkService = flightSinkService;
     }
 
-    @RetryableTopic(kafkaTemplate = "kafkaRetryTemplate", attempts = "3", backoff = @Backoff(delay = 1000, multiplier = 2.0),
+    @RetryableTopic(kafkaTemplate = "kafkaRetryTemplate", attempts = "3", backOff = @BackOff(delay = 1000, multiplier = 2.0),
             autoCreateTopics = "true", topicSuffixingStrategy = TopicSuffixingStrategy.SUFFIX_WITH_INDEX_VALUE)
     @KafkaListener(topics = KafkaConfig.FLIGHT_TOPIC)
     public void consumerForFlightTopic(String message) {
@@ -68,7 +67,7 @@ public void consumerForFlightTopic(String message) {
         }
     }
 
-    @RetryableTopic(kafkaTemplate = "kafkaRetryTemplate", attempts = "3", backoff = @Backoff(delay = 1000, multiplier = 2.0),
+    @RetryableTopic(kafkaTemplate = "kafkaRetryTemplate", attempts = "3", backOff = @BackOff(delay = 1000, multiplier = 2.0),
             autoCreateTopics = "true", topicSuffixingStrategy = TopicSuffixingStrategy.SUFFIX_WITH_INDEX_VALUE)
     @KafkaListener(topics = KafkaConfig.FLIGHT_SOURCE_TOPIC)
     public void consumerForFlightSourceTopic(String message) {
@@ -92,7 +91,7 @@ private boolean sendToDefaultDlt(KafkaEventDto dto) {
             CompletableFuture<SendResult<String, String>> listenableFuture = this.kafkaTemplate
                     .send(KafkaConfig.DEFAULT_DLT_TOPIC, UUID.randomUUID().toString(), this.objectMapper.writeValueAsString(dto));
             listenableFuture.get(3, TimeUnit.SECONDS);
-        } catch (InterruptedException | ExecutionException | TimeoutException | JsonProcessingException e) {
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
             throw new RuntimeException(e);
         }
         LOGGER.info("Message send to {}. {}", KafkaConfig.DEFAULT_DLT_TOPIC, dto.toString());

event-to-file/src/main/java/de/xxx/eventtofile/kafka/KafkaProducer.java

@@ -12,14 +12,14 @@
  */
 package de.xxx.eventtofile.kafka;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import de.xxx.eventtofile.model.FlightDto;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.SendResult;
 import org.springframework.stereotype.Component;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -28,10 +28,10 @@
 public class KafkaProducer {
     private static final Logger LOGGER = LoggerFactory.getLogger(KafkaProducer.class);
     private final KafkaTemplate<String, String> kafkaTemplate;
-    private final ObjectMapper objectMapper;
+    private final JsonMapper objectMapper;
     private final AdminClient adminClient;
 
-    public KafkaProducer(KafkaTemplate<String, String> kafkaTemplate, AdminClient adminClient, ObjectMapper objectMapper) {
+    public KafkaProducer(KafkaTemplate<String, String> kafkaTemplate, AdminClient adminClient, JsonMapper objectMapper) {
         this.adminClient = adminClient;
         this.kafkaTemplate = kafkaTemplate;
         this.objectMapper = objectMapper;

event-to-file/src/main/java/de/xxx/eventtofile/sink/FlightSinkService.java

@@ -12,13 +12,13 @@
  */
 package de.xxx.eventtofile.sink;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import de.xxx.eventtofile.model.FlightDto;
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -30,9 +30,9 @@
 @Service
 public class FlightSinkService {
     private static final Logger log = LoggerFactory.getLogger(FlightSinkService.class);
-    private final ObjectMapper objectMapper;
+    private final JsonMapper objectMapper;
 
-    public FlightSinkService(ObjectMapper objectMapper) {
+    public FlightSinkService(JsonMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
 

event-to-file/src/main/java/de/xxx/eventtofile/source/FlightSourceService.java

@@ -12,24 +12,23 @@
  */
 package de.xxx.eventtofile.source;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import de.xxx.eventtofile.kafka.KafkaProducer;
 import de.xxx.eventtofile.model.FlightDto;
 import de.xxx.eventtofile.model.FlightSourceDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tools.jackson.databind.json.JsonMapper;
 
 @Transactional
 @Service
 public class FlightSourceService {
     private static final Logger log = LoggerFactory.getLogger(FlightSourceService.class);
     private final KafkaProducer kafkaProducer;
-    private final ObjectMapper objectMapper;
+    private final JsonMapper objectMapper;
 
-    public FlightSourceService(KafkaProducer kafkaProducer, ObjectMapper objectMapper) {
+    public FlightSourceService(KafkaProducer kafkaProducer, JsonMapper objectMapper) {
         this.kafkaProducer = kafkaProducer;
         this.objectMapper = objectMapper;
     }
@@ -44,10 +43,6 @@ private FlightDto map(FlightSourceDto dto) {
     }
 
     private void logDto(FlightSourceDto flightSourceDto) {
-        try {
-            log.info(this.objectMapper.writeValueAsString(flightSourceDto));
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+       log.info(this.objectMapper.writeValueAsString(flightSourceDto));
     }
 }