feat : upgrade to spring boot 4 (#2113)

* feat : upgrade to spring boot 4

* fix : test failures

* implement code review comment

* implement code review

Author: rajadilipkolli

.github/workflows/reactive-mongodb-redis-integration.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21' ]
+        java: [ '25' ]
     name: Build on Java ${{ matrix.Java }}
     defaults:
       run:

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.8</version>
+		<version>4.0.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -19,8 +19,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>21</java.version>
-		<springdoc-open-ui.version>2.8.14</springdoc-open-ui.version>
+		<java.version>25</java.version>
+		<springdoc-open-ui.version>3.0.0</springdoc-open-ui.version>
 
 		<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
 		<spotless.version>3.1.0</spotless.version>
@@ -79,37 +79,38 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-webflux-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb-reactive-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-testcontainers</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>junit-jupiter</artifactId>
+			<artifactId>testcontainers-junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>mongodb</artifactId>
+			<artifactId>testcontainers-mongodb</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.21.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.redis.testcontainers</groupId>
             <artifactId>testcontainers-redis</artifactId>
@@ -129,14 +130,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-						</exclude>
-					</excludes>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -297,7 +290,7 @@
 				<configuration>
 					<java>
 						<googleJavaFormat>
-							<version>1.25.2</version>
+							<version>1.28.0</version>
 							<style>AOSP</style>
 						</googleJavaFormat>
 						<licenseHeader>

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/config/CustomCacheErrorHandler.java

@@ -1,13 +1,15 @@
 /* Licensed under Apache-2.0 2021-2023 */
 package com.mongodb.redis.integration.config;
 
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.cache.Cache;
 import org.springframework.cache.interceptor.CacheErrorHandler;
 
-@Slf4j
 class CustomCacheErrorHandler implements CacheErrorHandler {
 
+    private static final Logger log = LoggerFactory.getLogger(CustomCacheErrorHandler.class);
+
     @Override
     public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {
         log.error(

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/config/RedisCachingConfig.java

@@ -3,7 +3,6 @@
 
 import com.mongodb.redis.integration.request.BookDTO;
 import jakarta.annotation.PreDestroy;
-import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.interceptor.CacheErrorHandler;
@@ -12,17 +11,20 @@
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.ReactiveRedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration(proxyBeanMethods = false)
 @EnableCaching
-@RequiredArgsConstructor
 public class RedisCachingConfig implements CachingConfigurer {
 
     private final RedisConnectionFactory connectionFactory;
 
+    public RedisCachingConfig(RedisConnectionFactory connectionFactory) {
+        this.connectionFactory = connectionFactory;
+    }
+
     @Bean
     @Override
     public CacheErrorHandler errorHandler() {
@@ -33,8 +35,8 @@ public CacheErrorHandler errorHandler() {
     public ReactiveRedisTemplate<String, BookDTO> reactiveJsonBookRedisTemplate(
             ReactiveRedisConnectionFactory reactiveRedisConnectionFactory) {
 
-        Jackson2JsonRedisSerializer<BookDTO> serializer =
-                new Jackson2JsonRedisSerializer<>(BookDTO.class);
+        JacksonJsonRedisSerializer<BookDTO> serializer =
+                new JacksonJsonRedisSerializer<>(BookDTO.class);
 
         RedisSerializationContext<String, BookDTO> serializationContext =
                 RedisSerializationContext.<String, BookDTO>newSerializationContext(
@@ -48,6 +50,8 @@ public ReactiveRedisTemplate<String, BookDTO> reactiveJsonBookRedisTemplate(
 
     @PreDestroy
     public void flushTestDb() {
-        this.connectionFactory.getConnection().flushDb();
+        try (var connection = this.connectionFactory.getConnection()) {
+            connection.serverCommands().flushDb();
+        }
     }
 }

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/constants/BookConstants.java

@@ -1,9 +1,6 @@
 /* Licensed under Apache-2.0 2021-2022 */
 package com.mongodb.redis.integration.constants;
 
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
 public class BookConstants {
 
     public static final String BOOKS_END_POINT = "/api/book/";

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/constants/ItemConstants.java

@@ -1,9 +1,6 @@
 /* Licensed under Apache-2.0 2021-2022 */
 package com.mongodb.redis.integration.constants;
 
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
 public class ItemConstants {
 
     public static final String ITEM_END_POINT_V_1 = "/v1/items";

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/controller/v1/ItemController.java

@@ -4,21 +4,24 @@
 import com.mongodb.redis.integration.constants.ItemConstants;
 import com.mongodb.redis.integration.document.Item;
 import com.mongodb.redis.integration.repository.ReactiveItemRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @RestController
-@RequiredArgsConstructor
-@Slf4j
 public class ItemController {
 
+    private static final Logger log = LoggerFactory.getLogger(ItemController.class);
     private final ReactiveItemRepository reactiveItemRepository;
 
+    public ItemController(ReactiveItemRepository reactiveItemRepository) {
+        this.reactiveItemRepository = reactiveItemRepository;
+    }
+
     @GetMapping(ItemConstants.ITEM_END_POINT_V_1)
     public Flux<Item> getAllItems() {
         return reactiveItemRepository.findAll();

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/controller/v1/ItemStreamController.java

@@ -4,18 +4,20 @@
 import com.mongodb.redis.integration.constants.ItemConstants;
 import com.mongodb.redis.integration.document.ItemCapped;
 import com.mongodb.redis.integration.repository.ReactiveItemCappedRepository;
-import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 
 @RestController
-@RequiredArgsConstructor
 public class ItemStreamController {
 
     private final ReactiveItemCappedRepository reactiveItemCappedRepository;
 
+    public ItemStreamController(ReactiveItemCappedRepository reactiveItemCappedRepository) {
+        this.reactiveItemCappedRepository = reactiveItemCappedRepository;
+    }
+
     @GetMapping(
             value = ItemConstants.ITEM_STREAM_END_POINT_V_1,
             produces = MediaType.APPLICATION_NDJSON_VALUE)

poc-mongodb-redis-cache/reactive-mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/document/Book.java

@@ -3,22 +3,10 @@
 
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.mongodb.core.index.Indexed;
 
-@Setter
-@Getter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class Book implements Serializable {
 
     @Serial private static final long serialVersionUID = 1L;
@@ -30,7 +18,62 @@ public class Book implements Serializable {
 
     private String author;
 
+    public Book(String bookId, String title, String author, String text, Long version) {
+        this.bookId = bookId;
+        this.title = title;
+        this.author = author;
+        this.text = text;
+        this.version = version;
+    }
+
+    public Book() {}
+
     private String text;
 
     @Version private Long version;
+
+    public String getBookId() {
+        return bookId;
+    }
+
+    public Book setBookId(String bookId) {
+        this.bookId = bookId;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Book setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public Book setAuthor(String author) {
+        this.author = author;
+        return this;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public Book setText(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public Long getVersion() {
+        return version;
+    }
+
+    public Book setVersion(Long version) {
+        this.version = version;
+        return this;
+    }
 }