chore: upgrade to spring boot 4

pom.xml

@@ -19,13 +19,13 @@
         <maven.compiler.target>${java.release}</maven.compiler.target>
         <maven.exec.skip>false</maven.exec.skip>
 
-        <kotlin.version>2.1.21</kotlin.version>
+        <kotlin.version>2.3.20</kotlin.version>
     </properties>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.5</version>
+        <version>4.0.5</version>
         <relativePath/>
     </parent>
 
@@ -34,6 +34,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-http-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -46,13 +50,13 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>2.8.8</version>
+            <version>3.0.2</version>
         </dependency>
 
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>8.1</version>
+            <version>9.0</version>
         </dependency>
 
         <!-- Kotlin dependencies -->
@@ -65,7 +69,7 @@
             <artifactId>kotlin-reflect</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
+            <groupId>tools.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
 
@@ -75,6 +79,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
@@ -88,7 +97,7 @@
         <dependency>
             <groupId>org.wiremock.integrations</groupId>
             <artifactId>wiremock-spring-boot</artifactId>
-            <version>3.10.0</version>
+            <version>4.2.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -100,7 +109,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.19.0</version>
+            <version>2.21.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -139,7 +148,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <executions>
                     <execution>
                         <id>before-unit-test-execution</id>
@@ -197,7 +206,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.5.5</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                     <argLine>${surefire.jacoco.args}</argLine>
@@ -211,7 +220,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.5</version>
                 <configuration>
                     <argLine>${failsafe.jacoco.args}</argLine>
                     <groups>integration</groups>

src/main/kotlin/no/digdir/accessrequestapi/client/FdkClient.kt

@@ -4,7 +4,7 @@ import no.digdir.accessrequestapi.configuration.FdkProperties
 import no.digdir.accessrequestapi.model.DataResourceMetadata
 import org.slf4j.Logger
 import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder
-import org.springframework.boot.http.client.ClientHttpRequestFactorySettings
+import org.springframework.boot.http.client.HttpClientSettings
 import org.springframework.http.MediaType
 import org.springframework.http.client.ClientHttpRequestFactory
 import org.springframework.stereotype.Component
@@ -13,16 +13,16 @@ import java.time.Duration
 import java.util.*
 
 @Component
-class FdkClient(restClientBuilder: RestClient.Builder, private val fdkProperties: FdkProperties) {
+class FdkClient(private val fdkProperties: FdkProperties) {
     private val logger: Logger = org.slf4j.LoggerFactory.getLogger(this::class.java)
 
-    private val settings: ClientHttpRequestFactorySettings = ClientHttpRequestFactorySettings.defaults()
+    private val settings: HttpClientSettings = HttpClientSettings.defaults()
         .withReadTimeout(Duration.ofSeconds(fdkProperties.timeout))
 
     private val requestFactory: ClientHttpRequestFactory = ClientHttpRequestFactoryBuilder.detect()
         .build(settings)
 
-    private val restClient = restClientBuilder
+    private val restClient = RestClient.builder()
         .baseUrl(fdkProperties.api)
         .requestFactory(requestFactory)
         .build()

src/main/kotlin/no/digdir/accessrequestapi/client/KudafClient.kt

@@ -4,24 +4,24 @@ import no.digdir.accessrequestapi.configuration.KudafProperties
 import no.digdir.accessrequestapi.model.ShoppingCart
 import org.slf4j.Logger
 import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder
-import org.springframework.boot.http.client.ClientHttpRequestFactorySettings
+import org.springframework.boot.http.client.HttpClientSettings
 import org.springframework.http.MediaType
 import org.springframework.http.client.ClientHttpRequestFactory
 import org.springframework.stereotype.Component
 import org.springframework.web.client.RestClient
 import java.time.Duration
 
 @Component
-class KudafClient(restClientBuilder: RestClient.Builder, private val kudafProperties: KudafProperties) {
+class KudafClient(private val kudafProperties: KudafProperties) {
     private val logger: Logger = org.slf4j.LoggerFactory.getLogger(this::class.java)
 
-    private val settings: ClientHttpRequestFactorySettings = ClientHttpRequestFactorySettings.defaults()
+    private val settings: HttpClientSettings = HttpClientSettings.defaults()
         .withReadTimeout(Duration.ofSeconds(kudafProperties.timeout))
 
     private val requestFactory: ClientHttpRequestFactory = ClientHttpRequestFactoryBuilder.detect()
         .build(settings)
 
-    private val restClient = restClientBuilder
+    private val restClient = RestClient.builder()
         .baseUrl(kudafProperties.soknadApi)
         .requestFactory(requestFactory)
         .build()

src/test/kotlin/no/digdir/accessrequestapi/integration/AccessRequestTest.kt

@@ -1,6 +1,6 @@
 package no.digdir.accessrequestapi.integration
 
-import com.fasterxml.jackson.databind.ObjectMapper
+import tools.jackson.databind.json.JsonMapper
 import com.github.tomakehurst.wiremock.client.WireMock.*
 import no.digdir.accessrequestapi.client.KudafAccessRequestResponse
 import no.digdir.accessrequestapi.model.DataResourceMetadata
@@ -9,7 +9,7 @@ import no.digdir.accessrequestapi.model.DatasetLanguage
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.MediaType
 import org.springframework.test.context.ActiveProfiles
@@ -28,7 +28,7 @@ import java.util.*
 class AccessRequestTest {
 
     @Autowired
-    private lateinit var jacksonObjectMapper: ObjectMapper
+    private lateinit var jacksonObjectMapper: JsonMapper
 
     @Autowired
     private lateinit var mockMvc: MockMvc

src/test/kotlin/no/digdir/accessrequestapi/integration/KudafResolverTest.kt

@@ -1,6 +1,6 @@
 package no.digdir.accessrequestapi.integration
 
-import com.fasterxml.jackson.databind.ObjectMapper
+import tools.jackson.databind.json.JsonMapper
 import com.github.tomakehurst.wiremock.client.WireMock.*
 import no.digdir.accessrequestapi.model.DataResourceMetadata
 import no.digdir.accessrequestapi.model.DataResourceType
@@ -9,7 +9,7 @@ import no.digdir.accessrequestapi.model.ShoppingCart
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.MediaType
 import org.springframework.test.context.ActiveProfiles
@@ -28,7 +28,7 @@ import java.util.*
 class KudafResolverTest {
 
     @Autowired
-    private lateinit var jacksonObjectMapper: ObjectMapper
+    private lateinit var jacksonObjectMapper: JsonMapper
 
     @Autowired
     private lateinit var mockMvc: MockMvc

src/test/kotlin/no/digdir/accessrequestapi/integration/StatusTest.kt

@@ -3,7 +3,7 @@ package no.digdir.accessrequestapi.integration
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.servlet.MockMvc