BAEL-9364: Add samples for new features in Spring Boot 4 and Spring Framework 7

spring-boot-modules/spring-boot-4/pom.xml

@@ -14,7 +14,7 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-<dependencies>
+    <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
@@ -26,6 +26,18 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</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.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -37,9 +49,18 @@
             <version>${mapstruct.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -128,42 +149,9 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>repository.spring.milestone</id>
-            <name>Spring Snapshot Repository</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-        <repository>
-            <id>repository.spring.snapshot</id>
-            <name>Spring Snapshot Repository</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repository.spring.milestone.plugins</id>
-            <name>Spring Snapshot Repository</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>repository.spring.snapshot.plugins</id>
-            <name>Spring Snapshot Repository</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <spring-boot.version>4.0.0-SNAPSHOT</spring-boot.version>
+        <spring-boot.version>4.0.0-M2</spring-boot.version>
         <logback.version>1.5.18</logback.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
     </properties>

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/beanregistrar/SampleApplication.java → spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/SampleApplication.java

@@ -1,9 +1,13 @@
-package com.baeldung.spring.beanregistrar;
+package com.baeldung.spring;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.resilience.annotation.EnableResilientMethods;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
+@EnableResilientMethods
+@EnableAsync
 public class SampleApplication {
 
     public static void main(String[] args) {

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/ApiConfig.java

@@ -0,0 +1,24 @@
+package com.baeldung.spring.mvc;
+
+import org.jspecify.annotations.NonNull;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.method.HandlerTypePredicate;
+import org.springframework.web.servlet.config.annotation.ApiVersionConfigurer;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class ApiConfig implements WebMvcConfigurer {
+
+    @Override
+    public void configureApiVersioning(@NonNull ApiVersionConfigurer configurer) {
+        configurer.usePathSegment(1);
+    }
+
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+        configurer.addPathPrefix("/api/v{version}", HandlerTypePredicate.forAnnotation(RestController.class));
+    }
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/ChristmasJoyClient.java

@@ -0,0 +1,16 @@
+package com.baeldung.spring.mvc;
+
+import org.springframework.resilience.annotation.ConcurrencyLimit;
+import org.springframework.resilience.annotation.Retryable;
+import org.springframework.web.service.annotation.GetExchange;
+import org.springframework.web.service.registry.HttpServiceClient;
+
+@HttpServiceClient("christmasJoy")
+public interface ChristmasJoyClient {
+
+    @GetExchange("/greetings?random")
+    @Retryable(maxAttempts = 3, delay = 100, multiplier = 2, maxDelay = 1000)
+    @ConcurrencyLimit(3)
+    String getRandomGreeting();
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/HelloWorldController.java

@@ -0,0 +1,22 @@
+package com.baeldung.spring.mvc;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/hello")
+public class HelloWorldController {
+
+    @GetMapping(version = "1", produces = MediaType.TEXT_PLAIN_VALUE)
+    public String sayHelloV1() {
+        return "Hello World";
+    }
+
+    @GetMapping(version = "2", produces = MediaType.TEXT_PLAIN_VALUE)
+    public String sayHelloV2() {
+        return "Hi World";
+    }
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/HelloWorldEvent.java

@@ -0,0 +1,5 @@
+package com.baeldung.spring.mvc;
+
+public record HelloWorldEvent(String message) {
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/HelloWorldEventLogger.java

@@ -0,0 +1,19 @@
+package com.baeldung.spring.mvc;
+
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Component
+@Slf4j
+public class HelloWorldEventLogger {
+
+    @Async
+    @EventListener
+    void logHelloWorldEvent(HelloWorldEvent event) {
+        log.info("Hello World Event: {}", event.message());
+    }
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/HelloWorldV3Controller.java

@@ -0,0 +1,17 @@
+package com.baeldung.spring.mvc;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(path = "/hello", version = "3")
+public class HelloWorldV3Controller {
+
+    @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE)
+    public String sayHello() {
+        return "Hey World";
+    }
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/HelloWorldV4Controller.java

@@ -0,0 +1,26 @@
+package com.baeldung.spring.mvc;
+
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping(path = "/hello", version = "4")
+@RequiredArgsConstructor
+public class HelloWorldV4Controller {
+
+    private final ChristmasJoyClient christmasJoy;
+    private final ApplicationEventPublisher applicationEventPublisher;
+
+    @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE)
+    public String sayHello() {
+        final var result = this.christmasJoy.getRandomGreeting();
+        applicationEventPublisher.publishEvent(new HelloWorldEvent(result));
+        return result;
+    }
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/HttpClientConfig.java

@@ -0,0 +1,36 @@
+package com.baeldung.spring.mvc;
+
+import java.util.List;
+
+import org.jspecify.annotations.NonNull;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.web.client.support.RestClientHttpServiceGroupConfigurer;
+import org.springframework.web.service.registry.AbstractClientHttpServiceRegistrar;
+
+@Configuration
+@Import(HttpClientConfig.HelloWorldClientHttpServiceRegistrar.class)
+public class HttpClientConfig {
+
+    static class HelloWorldClientHttpServiceRegistrar extends AbstractClientHttpServiceRegistrar {
+
+        @Override
+        protected void registerHttpServices(@NonNull GroupRegistry registry, @NonNull AnnotationMetadata metadata) {
+            findAndRegisterHttpServiceClients(registry, List.of("com.baeldung.spring.mvc"));
+        }
+    }
+
+    @Bean
+    RestClientHttpServiceGroupConfigurer christmasJoyServiceGroupConfigurer(@Value("${application.rest.services.christmasJoy.baseUrl}") String baseUrl) {
+        return groups -> {
+            groups.filterByName("christmasJoy")
+                .forEachClient((group, clientBuilder) -> {
+                    clientBuilder.baseUrl(baseUrl);
+                });
+        };
+    }
+
+}

spring-boot-modules/spring-boot-4/src/main/java/com/baeldung/spring/mvc/TaskDecoratorConfiguration.java

@@ -0,0 +1,41 @@
+package com.baeldung.spring.mvc;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.task.TaskDecorator;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Configuration
+@Slf4j
+public class TaskDecoratorConfiguration {
+
+    @Bean
+    @Order(2)
+    TaskDecorator loggingTaskConfigurator() {
+        return runnable -> () -> {
+            log.info("Running Task: {}", runnable);
+            try {
+                runnable.run();
+            } finally {
+                log.info("Finished Task: {}", runnable);
+            }
+        };
+    }
+
+    @Bean
+    @Order(1)
+    TaskDecorator measuringTaskConfigurator() {
+        return runnable -> () -> {
+            final var ts1 = System.currentTimeMillis();
+            try {
+                runnable.run();
+            } finally {
+                final var ts2 = System.currentTimeMillis();
+                log.info("Finished within {}ms (Task: {})", ts2 - ts1, runnable);
+            }
+        };
+    }
+
+}

spring-boot-modules/spring-boot-4/src/main/resources/application.properties

@@ -0,0 +1 @@
+application.rest.services.christmasJoy.baseUrl=https://christmasjoy.dev/api

spring-boot-modules/spring-boot-4/src/test/java/com/baeldung/spring/mvc/HelloWorldApiIntegrationTest.java

@@ -0,0 +1,62 @@
+package com.baeldung.spring.mvc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.client.RestTestClient;
+import org.springframework.web.context.WebApplicationContext;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class HelloWorldApiIntegrationTest {
+
+    RestTestClient client;
+
+    @BeforeEach
+    void setUp(WebApplicationContext context) {
+        client = RestTestClient.bindToApplicationContext(context)
+            .build();
+    }
+
+    @Test
+    void shouldFetchHelloV1() {
+        client.get()
+            .uri("/api/v1/hello")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentTypeCompatibleWith(MediaType.TEXT_PLAIN)
+            .expectBody(String.class)
+            .consumeWith(message -> assertThat(message.getResponseBody()).containsIgnoringCase("hello"));
+    }
+
+    @Test
+    void shouldFetchHelloV2() {
+        client.get()
+            .uri("/api/v2/hello")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentTypeCompatibleWith(MediaType.TEXT_PLAIN)
+            .expectBody(String.class)
+            .consumeWith(message -> assertThat(message.getResponseBody()).containsIgnoringCase("hi"));
+    }
+
+    @Test
+    void shouldFetchHelloV3() {
+        client.get()
+            .uri("/api/v3/hello")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentTypeCompatibleWith(MediaType.TEXT_PLAIN)
+            .expectBody(String.class)
+            .consumeWith(message -> assertThat(message.getResponseBody()).containsIgnoringCase("hey"));
+    }
+
+}