Update Spring Boot to 3.4.0 (#378)

Author: albrechtflo-hg

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.hermesworld.ais</groupId>
@@ -24,8 +24,6 @@
         <sonar.sources>src/main/java</sonar.sources>
         <sonar.exclusions>src/main/resources/*</sonar.exclusions>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
-        <!-- Spring Framework Override to temporarily fix security issues -->
-        <spring-framework.version>6.1.14</spring-framework.version>
     </properties>
 
     <dependencies>
@@ -248,6 +246,12 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <proc>full</proc>
+                </configuration>
+            </plugin>
 
             <!-- this ensures consistent Java code formatting using Eclipse Formatter Settings.
                  Note that there are also Plugins e.g. for IntelliJ IDEA being able to consume and apply these Settings.

src/test/java/com/hermesworld/ais/galapagos/ContextStartupTest.java

@@ -6,9 +6,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import java.security.Security;
 
@@ -22,7 +22,7 @@ class ContextStartupTest {
     private ApplicationContext context;
 
     // mock the KafkaClusters implementation as we do not have a live Kafka server here
-    @MockBean
+    @MockitoBean
     private KafkaClusters kafkaClusters;
 
     @BeforeAll

src/test/java/com/hermesworld/ais/galapagos/GalapagosTestConfig.java

@@ -3,12 +3,17 @@
 import com.hermesworld.ais.galapagos.security.SecurityConfig;
 import com.hermesworld.ais.galapagos.security.impl.OAuthConfigController;
 import org.springframework.boot.test.mock.mockito.MockBean;
+
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 
+@SuppressWarnings("removal")
 @Configuration
 public class GalapagosTestConfig {
 
+    // we have to use MockBean because of https://github.com/spring-projects/spring-framework/issues/33934
+    // (Spring Boot team rejects to make MockitoBean work here)
+
     @MockBean
     private OAuthConfigController mockController;
 

src/test/java/com/hermesworld/ais/galapagos/certificates/reminders/impl/CertificateExpiryReminderRunnerIntegrationTest.java

@@ -20,7 +20,7 @@
 import org.springframework.boot.actuate.autoconfigure.mail.MailHealthContributorAutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.mail.javamail.JavaMailSender;
 
@@ -42,16 +42,16 @@
 @Import(GalapagosTestConfig.class)
 class CertificateExpiryReminderRunnerIntegrationTest {
 
-    @MockBean
+    @MockitoBean
     private KafkaClusters kafkaClusters;
 
-    @MockBean
+    @MockitoBean
     private CertificateExpiryReminderService reminderService;
 
-    @MockBean
+    @MockitoBean
     private ApplicationsService applicationsService;
 
-    @MockBean
+    @MockitoBean
     private JavaMailSender mailSender;
 
     @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")

src/test/java/com/hermesworld/ais/galapagos/graphql/GraphqlControllerTest.java

@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Import;
 import org.springframework.graphql.test.tester.HttpGraphQlTester;
@@ -35,16 +35,16 @@
 class GraphqlControllerTest {
 
     @SuppressWarnings("unused")
-    @MockBean
+    @MockitoBean
     private KafkaClusters kafkaClusters;
 
-    @MockBean
+    @MockitoBean
     private ValidatingTopicService topicService;
 
-    @MockBean
+    @MockitoBean
     private ApplicationsService applicationsService;
 
-    @MockBean
+    @MockitoBean
     private SubscriptionService subscriptionService;
 
     @Autowired

src/test/java/com/hermesworld/ais/galapagos/kafka/impl/KafkaSenderImplTest.java

@@ -1,6 +1,5 @@
 package com.hermesworld.ais.galapagos.kafka.impl;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -22,34 +21,26 @@
 
 class KafkaSenderImplTest {
 
-    private static ThreadFactory tfDecoupled = new ThreadFactory() {
-        @Override
-        public Thread newThread(Runnable r) {
-            return new Thread(r, "decoupled-" + System.currentTimeMillis());
-        }
-    };
+    private static final ThreadFactory tfDecoupled = r -> new Thread(r, "decoupled-" + System.currentTimeMillis());
 
-    private static KafkaExecutorFactory executorFactory = () -> {
-        return Executors.newSingleThreadExecutor(tfDecoupled);
-    };
+    private static final KafkaExecutorFactory executorFactory = () -> Executors.newSingleThreadExecutor(tfDecoupled);
 
     @Test
     void testSendDecoupling() throws Exception {
         KafkaFutureDecoupler decoupler = new KafkaFutureDecoupler(executorFactory);
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({ "unchecked", "resource" })
         Producer<String, String> producer = mock(Producer.class);
-        when(producer.send(any(), any())).then(inv -> {
-            return CompletableFuture.runAsync(() -> {
-                try {
-                    Thread.sleep(200);
-                }
-                catch (InterruptedException e) {
-                }
-                Callback cb = inv.getArgument(1);
-                cb.onCompletion(new RecordMetadata(new TopicPartition("a", 0), 0, 0, 0, null, 0, 0), null);
-            });
-        });
+        when(producer.send(any(), any())).then(inv -> CompletableFuture.runAsync(() -> {
+            try {
+                Thread.sleep(200);
+            }
+            catch (InterruptedException e) {
+                return;
+            }
+            Callback cb = inv.getArgument(1);
+            cb.onCompletion(new RecordMetadata(new TopicPartition("a", 0), 0, 0, 0, 0, 0), null);
+        }));
 
         ProducerFactory<String, String> factory = () -> {
             return producer;

src/test/java/com/hermesworld/ais/galapagos/naming/config/CaseStrategyConverterBindingIntegrationTest.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 
@@ -20,7 +20,7 @@ class CaseStrategyConverterBindingIntegrationTest {
     private NamingConfig config;
 
     @SuppressWarnings("unused")
-    @MockBean
+    @MockitoBean
     private KafkaClusters clusters;
 
     @Test

src/test/java/com/hermesworld/ais/galapagos/security/SecurityConfigIntegrationTest.java

@@ -11,7 +11,7 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.*;
@@ -39,18 +39,18 @@ class SecurityConfigIntegrationTest {
     private TestRestTemplate restTemplate;
 
     @SuppressWarnings("unused")
-    @MockBean
+    @MockitoBean
     private ApplicationsService applicationsService;
 
     @SuppressWarnings("unused")
-    @MockBean
+    @MockitoBean
     private StagingService stagingService;
 
     @SuppressWarnings("unused")
-    @MockBean
+    @MockitoBean
     private KafkaClusters kafkaClusters;
 
-    @MockBean
+    @MockitoBean
     private JwtDecoder jwtDecoder;
 
     @BeforeEach

src/test/java/com/hermesworld/ais/galapagos/security/impl/OAuthConfigControllerIntegrationTest.java

@@ -14,7 +14,7 @@
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
 import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpHeaders;
@@ -47,10 +47,10 @@ class OAuthConfigControllerIntegrationTest {
     @Autowired
     private TestRestTemplate restTemplate;
 
-    @MockBean
+    @MockitoBean
     private OAuth2ClientProperties oauthProperties;
 
-    @MockBean
+    @MockitoBean
     @SuppressWarnings("unused")
     private JwtDecoder jwtDecoder;
 

src/test/java/com/hermesworld/ais/galapagos/topics/controller/TopicControllerTest.java

@@ -17,7 +17,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -33,7 +33,7 @@
 
 class TopicControllerTest {
 
-    @MockBean
+    @MockitoBean
     private KafkaClusters kafkaClusters;
 
     private ApplicationsService applicationsService;