Upgrade to Java 21; upgrade Spring Boot version; various enhancements

Author: swa-ds

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>de.rwu.swen</groupId>
@@ -14,8 +14,7 @@
     <name>rwu-spring-boot-demo</name>
     <description>rwu-spring-boot-demo</description>
     <properties>
-        <java.version>17</java.version>
-        <testcontainers.version>1.20.3</testcontainers.version>
+        <java.version>21</java.version>
     </properties>
     <dependencies>
         <dependency>
@@ -34,7 +33,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.4</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -51,32 +50,29 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
-            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>spring-mock-mvc</artifactId>
-            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 

src/main/java/de/rwu/swen/demo/RwuSpringBootDemoApplication.java

@@ -7,12 +7,16 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.data.web.config.EnableSpringDataWebSupport;
+
+import static org.springframework.data.web.config.EnableSpringDataWebSupport.PageSerializationMode.VIA_DTO;
 
 @SpringBootApplication
 @EnableJpaRepositories
+@EnableSpringDataWebSupport(pageSerializationMode = VIA_DTO)
 public class RwuSpringBootDemoApplication {
 
-    Logger LOGGER = LoggerFactory.getLogger(RwuSpringBootDemoApplication.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RwuSpringBootDemoApplication.class);
 
     public static void main(String[] args) {
         SpringApplication.run(RwuSpringBootDemoApplication.class, args);

src/test/java/de/rwu/swen/demo/RwuSpringBootDemoApplicationTests.java

@@ -6,14 +6,12 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.jdbc.Sql;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -26,13 +24,10 @@ class RwuSpringBootDemoApplicationTests {
     public static final int HTTP_OK = HttpStatus.OK.value();
     private static final int HTTP_NOT_FOUND = HttpStatus.NOT_FOUND.value();
 
-    @Container
-    public static PostgreSQLContainer<?> container = new PostgreSQLContainer<>("postgres:16");
-
     /**
-     * Prevent InitDb to create DB entries in table student.
+     * Replace with mock, so that no entries are created in student DB table.
      */
-    @MockBean
+    @MockitoBean
     private InitDb initDb;
 
     @TestConfiguration
@@ -58,10 +53,6 @@ public void beforeEach() {
         RestAssured.baseURI = "http://localhost";
     }
 
-    @Test
-    void contextLoads() {
-    }
-
     @Test
     void testRepoChangedForTest() {
 

src/test/resources/application.properties

@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:tc:postgresql:16:///postgres
+spring.datasource.url=jdbc:tc:postgresql:17:///postgres
 spring.jpa.hibernate.ddl-auto=create
 
 paging.page-size=3