bump to Java 21 and Spring Boot 3.5 (#15)

Author: rieckpil

.github/workflows/broken-links.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   broken-link-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Check for broken links in README.md
     steps:
       - name: Checkout code

.github/workflows/maven.yml

@@ -5,17 +5,17 @@ on:
     - cron: '0 15 * * *' # daily at 3pm
 jobs:
   build-and-test:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     name: Build Application
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup for JDK 17
+      - name: Setup for JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           java-package: jdk
           cache: maven
 

.java-version

@@ -1 +1 @@
-17.0
+21.0

.sdkmanrc

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=21.0.6-tem

README.md

@@ -2,8 +2,8 @@
 
 # TDD with Spring Boot Done Right Online Course
 
-[![](https://img.shields.io/badge/Spring%20Boot%20Version-3.1.X-orange)](/pom.xml)
-[![](https://img.shields.io/badge/Java%20Version-17-orange)](/pom.xml)
+[![](https://img.shields.io/badge/Spring%20Boot%20Version-3.5.X-orange)](/pom.xml)
+[![](https://img.shields.io/badge/Java%20Version-21-orange)](/pom.xml)
 [![](https://img.shields.io/badge/Enroll-Now-orange)](https://rieckpil.de/tdd-with-spring-boot-done-right/)
 
 - `main` branch: [![Build & Test Maven Project](https://github.com/rieckpil/tdd-with-spring-boot-done-right/actions/workflows/maven.yml/badge.svg?branch=main)](https://github.com/rieckpil/tdd-with-spring-boot-done-right/actions/workflows/maven.yml)
@@ -39,13 +39,13 @@ If you're new to testing with Java and Spring Boot, we highly recommend to first
 
 Mandatory requirements:
 
-* Java 17 (JDK flavour (OpenJDK/Azul/Oracle) does not matter). For the correct Java version setup I can recommend [JEnv](https://www.youtube.com/watch?v=9FVZyeFDXo0) (Mac/Linux) and the [Maven Toolchains Plugin](https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html) (Windows)
+* Java 21 (JDK flavour (OpenJDK/Azul/Oracle) does not matter). For the correct Java version setup I can recommend [JEnv](https://www.youtube.com/watch?v=9FVZyeFDXo0) (Mac/Linux) and the [Maven Toolchains Plugin](https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html) (Windows)
 
 ```
 $ java -version
-openjdk version "17" 2021-09-14 LTS
-OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
-OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)
+openjdk version "21.0.6" 2025-01-21 LTS
+OpenJDK Runtime Environment Temurin-21.0.6+7 (build 21.0.6+7-LTS)
+OpenJDK 64-Bit Server VM Temurin-21.0.6+7 (build 21.0.6+7-LTS, mixed mode, sharing)
 ```
 
 * Docker Engine (Community Edition is enough):

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.5</version>
+    <version>3.5.0</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -17,8 +17,8 @@
   <description>TDD with Spring Boot Done Right Online Course</description>
 
   <properties>
-    <java.version>17</java.version>
-    <wiremock.version>2.33.2</wiremock.version>
+    <java.version>21</java.version>
+    <wiremock.version>3.13.0</wiremock.version>
   </properties>
 
   <dependencies>
@@ -50,8 +50,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8-standalone</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock-standalone</artifactId>
       <version>${wiremock.version}</version>
       <scope>test</scope>
     </dependency>
@@ -86,7 +86,7 @@
         <configuration>
           <java>
             <googleJavaFormat>
-              <version>1.16.0</version>
+              <version>1.17.0</version>
               <style>GOOGLE</style>
             </googleJavaFormat>
             <importOrder>

src/main/java/de/rieckpil/CommentApiController.java

@@ -6,7 +6,11 @@
 import jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 

src/test/java/de/rieckpil/CommentApiControllerTest.java

@@ -8,28 +8,31 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpHeaders.ACCEPT;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @Import(WebSecurityConfiguration.class)
 @WebMvcTest(CommentApiController.class)
 class CommentApiControllerTest {
 
   @Autowired private MockMvc mockMvc;
 
-  @MockBean private CommentService commentService;
+  @MockitoBean private CommentService commentService;
 
   @Test
   void shouldAllowAnonymousUsersToGetAllComments() throws Exception {
@@ -60,10 +63,10 @@ void shouldRejectAnonymousUsersWhenCreatingComments() throws Exception {
                 .contentType(APPLICATION_JSON)
                 .content(
                     """
-           {
-              "content": "Lorem Ipsum"
-           }
-          """))
+               {
+                  "content": "Lorem Ipsum"
+               }
+              """))
         .andExpect(status().isUnauthorized());
   }
 
@@ -78,10 +81,10 @@ void shouldRejectAuthenticatedUserWithoutAdminRoleWhenCreatingComments() throws
                 .contentType(APPLICATION_JSON)
                 .content(
                     """
-           {
-              "content": "Lorem Ipsum"
-           }
-          """))
+               {
+                  "content": "Lorem Ipsum"
+               }
+              """))
         .andExpect(status().isForbidden());
   }
 
@@ -94,11 +97,12 @@ void shouldFailOnInvalidCommentData() throws Exception {
         .perform(
             post("/api/comments")
                 .contentType(APPLICATION_JSON)
-                .content("""
-           {
-              "content": ""
-           }
-          """))
+                .content(
+                    """
+             {
+                "content": ""
+             }
+            """))
         .andExpect(status().isBadRequest());
   }
 
@@ -118,10 +122,10 @@ void shouldCreateCommentWhenUserIsAuthenticatedAndAdmin() throws Exception {
                 .contentType(APPLICATION_JSON)
                 .content(
                     """
-           {
-              "content": "Lorem Ipsum"
-           }
-          """))
+               {
+                  "content": "Lorem Ipsum"
+               }
+              """))
         .andExpect(status().isCreated())
         .andExpect(header().exists("Location"))
         .andExpect(

src/test/java/de/rieckpil/PostClientTest.java

@@ -8,7 +8,9 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +24,7 @@ class PostClientTest {
       new PostClient(WebClient.builder().baseUrl(mockServer.baseUrl()).build());
 
   @Test
-  void shouldReturnAllPosts() throws Exception {
+  void shouldReturnAllPosts() {
 
     mockServer.stubFor(
         WireMock.get(urlPathEqualTo("/posts"))

src/test/java/de/rieckpil/SampleTest.java

@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-
 class SampleTest {
 
   @Test