boot 4

janolaveide · janolaveide · commit f9058d614785 · 2025-11-15T09:31:18.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
         <maven.compiler.target>21</maven.compiler.target>
         <java.version>21</java.version>
         <okhttp3.version>4.12.0</okhttp3.version>
-        <spring-boot.version>3.5.7</spring-boot.version>
+        <spring-boot.version>4.0.0-RC2</spring-boot.version>
         <oauth2-oidc-sdk.version>11.30</oauth2-oidc-sdk.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <mockwebserver.version>5.3.0</mockwebserver.version>
diff --git a/token-client-spring-demo/src/main/kotlin/no/nav/security/token/support/demo/spring/config/DemoConfiguration.kt b/token-client-spring-demo/src/main/kotlin/no/nav/security/token/support/demo/spring/config/DemoConfiguration.kt
@@ -4,9 +4,9 @@ import no.nav.security.token.support.client.core.oauth2.OAuth2AccessTokenService
 import no.nav.security.token.support.client.spring.ClientConfigurationProperties
 import no.nav.security.token.support.client.spring.oauth2.ClientConfigurationPropertiesMatcher
 import no.nav.security.token.support.client.spring.oauth2.EnableOAuth2Client
+import org.springframework.boot.restclient.RestClientCustomizer
 import no.nav.security.token.support.client.spring.oauth2.OAuth2ClientRequestInterceptor
 import no.nav.security.token.support.spring.api.EnableJwtTokenValidation
-import org.springframework.boot.web.client.RestClientCustomizer
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
diff --git a/token-client-spring/pom.xml b/token-client-spring/pom.xml
@@ -37,6 +37,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-restclient</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTest.kt b/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTest.kt
@@ -7,7 +7,7 @@ import no.nav.security.token.support.core.context.TokenValidationContextHolder
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
+import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.context.bean.override.mockito.MockitoBean
diff --git a/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithResourceUrl.kt b/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithResourceUrl.kt
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.junit.jupiter.MockitoExtension
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
+import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.context.bean.override.mockito.MockitoBean
diff --git a/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithWellKnownUrl.kt b/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithWellKnownUrl.kt
@@ -10,7 +10,7 @@ import okhttp3.mockwebserver.MockWebServer
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
+import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContextInitializer
 import org.springframework.context.ConfigurableApplicationContext
diff --git a/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2AccessTokenServiceIntegrationTest.kt b/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2AccessTokenServiceIntegrationTest.kt
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test
 import org.mockito.kotlin.whenever
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
+import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE
 import org.springframework.test.context.ActiveProfiles
diff --git a/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithCacheTest.kt b/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithCacheTest.kt
@@ -5,7 +5,7 @@ import no.nav.security.token.support.core.context.TokenValidationContextHolder
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
+import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ActiveProfiles
diff --git a/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithoutCacheTest.kt b/token-client-spring/src/test/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithoutCacheTest.kt
@@ -5,7 +5,7 @@ import no.nav.security.token.support.core.context.TokenValidationContextHolder
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
+import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ActiveProfiles
diff --git a/token-validation-jaxrs/src/test/kotlin/no/nav/security/token/support/jaxrs/Config.kt b/token-validation-jaxrs/src/test/kotlin/no/nav/security/token/support/jaxrs/Config.kt
@@ -17,7 +17,7 @@ import org.glassfish.jersey.servlet.ServletProperties.JAXRS_APPLICATION_CLASS
 import org.springframework.boot.SpringBootConfiguration
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.EnableConfigurationProperties
-import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory
+import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory
 import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.boot.web.servlet.ServletRegistrationBean
 import org.springframework.context.annotation.Bean
diff --git a/token-validation-spring-demo/pom.xml b/token-validation-spring-demo/pom.xml
@@ -40,6 +40,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-restclient</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/token-validation-spring-test/src/main/kotlin/no/nav/security/token/support/spring/test/EnableMockOAuth2Server.kt b/token-validation-spring-test/src/main/kotlin/no/nav/security/token/support/spring/test/EnableMockOAuth2Server.kt
@@ -1,7 +1,7 @@
 package no.nav.security.token.support.spring.test
 
+import org.springframework.boot.test.context.PropertyMapping
 import java.lang.annotation.Inherited
-import org.springframework.boot.test.autoconfigure.properties.PropertyMapping
 import org.springframework.context.annotation.Import
 import kotlin.annotation.AnnotationRetention.RUNTIME
 import kotlin.annotation.AnnotationTarget.CLASS
diff --git a/token-validation-spring/pom.xml b/token-validation-spring/pom.xml
@@ -80,6 +80,15 @@
             </exclusions>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-restclient</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
diff --git a/token-validation-spring/src/main/kotlin/no/nav/security/token/support/spring/validation/interceptor/JwtTokenHandlerInterceptor.kt b/token-validation-spring/src/main/kotlin/no/nav/security/token/support/spring/validation/interceptor/JwtTokenHandlerInterceptor.kt
@@ -15,7 +15,7 @@ import org.springframework.web.servlet.HandlerInterceptor
 class JwtTokenHandlerInterceptor(attrs: AnnotationAttributes?, private val h: JwtTokenAnnotationHandler) : HandlerInterceptor {
     private val log = LoggerFactory.getLogger(JwtTokenHandlerInterceptor::class.java)
     private val handlerFlags: MutableMap<Any, Boolean> = ConcurrentHashMap()
-    private val ignoreConfig = attrs?.getStringArray("ignore") ?: arrayOfNulls(0) ?: arrayOfNulls(0)
+    private val ignoreConfig = attrs?.getStringArray("ignore") ?: emptyArray()?: emptyArray()
 
     override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
         if (handler is HandlerMethod) {
diff --git a/token-validation-spring/src/test/kotlin/no/nav/security/token/support/spring/integrationtest/ProtectedRestControllerIntegrationTest.kt b/token-validation-spring/src/test/kotlin/no/nav/security/token/support/spring/integrationtest/ProtectedRestControllerIntegrationTest.kt
@@ -28,7 +28,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.DisplayName
 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.webmvc.test.autoconfigure.WebMvcTest
 import org.springframework.http.HttpStatus
 import org.springframework.http.HttpStatus.FORBIDDEN
 import org.springframework.http.HttpStatus.OK
diff --git a/token-validation-spring/src/test/kotlin/no/nav/security/token/support/spring/validation/interceptor/JwtTokenHandlerInterceptorTest.kt b/token-validation-spring/src/test/kotlin/no/nav/security/token/support/spring/validation/interceptor/JwtTokenHandlerInterceptorTest.kt
@@ -24,7 +24,7 @@ import org.springframework.web.server.ResponseStatusException
 
 internal class JwtTokenHandlerInterceptorTest {
     private val contextHolder  = createContextHolder()
-    private  var interceptor = JwtTokenHandlerInterceptor(fromMap(HashMap<String, Any>().apply {
+    private var interceptor = JwtTokenHandlerInterceptor(fromMap(HashMap<String, Any?>().apply {
         put("ignore", arrayOf("org.springframework", IgnoreClass::class.java.name))
     }), SpringJwtTokenAnnotationHandler(contextHolder))
     private val request: MockHttpServletRequest = MockHttpServletRequest()
