feat : upgrade to spring boot 4 (#2105)

* feat : upgrade to spring boot 4

* fix : build issue

* remove lombok

* upgrade to java 25

Author: rajadilipkolli

.devcontainer/devcontainer.json

@@ -3,15 +3,17 @@
 {
 	"name": "Java",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/java:1-21-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/java:25",
 
 	"features": {
 		"ghcr.io/devcontainers/features/java:1": {
 			"version": "none",
 			"installMaven": "true",
 			"installGradle": "false"
 		},
-		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {
+			"moby": false
+		},
 		"ghcr.io/devcontainers/features/node:1": {
 			"version": "lts"
 		}

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

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21']
+        java: [ '25']
     defaults:
       run:
         working-directory: "poc-mongodb-redis-cache/mongodb-redis-integration"

poc-mongodb-redis-cache/mongodb-redis-integration/docker/docker-compose.yml

@@ -5,14 +5,14 @@ services:
     volumes:
       - mongo-data:/data/db/mongo
     ports:
-      - 27017:27017
+      - "27017:27017"
 
   redis:
     image: redis
     volumes:
       - redis-data:/data/db/redis
     ports:
-      - 6379:6379
+      - "6379:6379"
 
 volumes:
   mongo-data:

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

@@ -6,7 +6,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>17</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>
 
 		<spotless.version>3.1.0</spotless.version>
 		<sonar-maven-plugin.version>5.3.0.6276</sonar-maven-plugin.version>
@@ -61,7 +61,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
 		<dependency>
             <groupId>org.springdoc</groupId>
@@ -77,13 +77,18 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-data-mongodb-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-restclient-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -93,12 +98,12 @@
 		</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>
 	</dependencies>
@@ -108,14 +113,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>io.github.git-commit-id</groupId>
@@ -189,7 +186,7 @@
 				<configuration>
 					<java>
 						<googleJavaFormat>
-							<version>1.17.0</version>
+							<version>1.28.0</version>
 							<style>AOSP</style>
 						</googleJavaFormat>
 						<licenseHeader>

poc-mongodb-redis-cache/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);
+
     /** {@inheritDoc} */
     @Override
     public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {

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

@@ -2,7 +2,6 @@
 package com.mongodb.redis.integration.config;
 
 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,11 +11,14 @@
 
 @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() {

poc-mongodb-redis-cache/mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/controller/BookController.java

@@ -6,8 +6,8 @@
 import com.mongodb.redis.integration.service.BookService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
-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.DeleteMapping;
@@ -21,14 +21,18 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-@Slf4j
 @RestController
 @RequestMapping("/book")
-@RequiredArgsConstructor
 public class BookController {
 
+    private static final Logger log = LoggerFactory.getLogger(BookController.class);
+
     private final BookService bookService;
 
+    public BookController(BookService bookService) {
+        this.bookService = bookService;
+    }
+
     @GetMapping("/findByTitle/{title}")
     public Book findBookByTitle(@NotNull @PathVariable String title) throws BookNotFoundException {
         return this.bookService.findBookByTitle(title);

poc-mongodb-redis-cache/mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/data/TestData.java

@@ -1,25 +1,30 @@
-/* Licensed under Apache-2.0 2021-2023 */
+/* Licensed under Apache-2.0 2021-2025 */
 package com.mongodb.redis.integration.data;
 
 import com.mongodb.redis.integration.document.Book;
 import com.mongodb.redis.integration.repository.BookRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.context.event.EventListener;
 
 @Configuration
 @Profile({"local", "test"})
-@Slf4j
 public class TestData {
 
-    @Autowired BookRepository bookRepository;
+    private static final Logger log = LoggerFactory.getLogger(TestData.class);
+
+    private final BookRepository bookRepository;
+
+    public TestData(BookRepository bookRepository) {
+        this.bookRepository = bookRepository;
+    }
 
     @EventListener(ApplicationReadyEvent.class)
     void loadData() {
-        Book book = Book.builder().title("SB2").bookId("1").author("raja").build();
+        Book book = new Book().setTitle("SB2").setBookId("1").setAuthor("raja");
         log.info("saving dummy data");
         this.bookRepository.save(book);
     }

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

@@ -1,22 +1,14 @@
-/* Licensed under Apache-2.0 2021-2023 */
+/* Licensed under Apache-2.0 2021-2025 */
 package com.mongodb.redis.integration.document;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.Builder;
-import lombok.Getter;
-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
 public class Book implements Serializable {
 
     @Serial private static final long serialVersionUID = 1L;
@@ -33,4 +25,49 @@ public class Book implements Serializable {
     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;
+    }
 }

poc-mongodb-redis-cache/mongodb-redis-integration/src/main/java/com/mongodb/redis/integration/exception/BookNotFoundException.java

@@ -1,14 +1,17 @@
 /* Licensed under Apache-2.0 2021-2022 */
 package com.mongodb.redis.integration.exception;
 
-import lombok.Getter;
-
 public class BookNotFoundException extends Exception {
 
-    @Getter private final String message;
+    private final String message;
 
     public BookNotFoundException(String exceptionMessage) {
         super(exceptionMessage);
         this.message = exceptionMessage;
     }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
 }