deprecations

navikt · Jan 12, 2025 · 1deba6d · 1deba6d
1 parent a14e094
commit 1deba6d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/...n/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTest.kt b/...n/no/nav/security/token/support/client/spring/oauth2/ClientConfigurationPropertiesTest.kt
@@ -9,15 +9,15 @@ 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.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [OAuth2ClientConfiguration::class, RestClientAutoConfiguration::class])
 @ActiveProfiles("test")
 internal class ClientConfigurationPropertiesTest {
 
-    @MockBean
-   private lateinit var tokenValidationContextHolder: TokenValidationContextHolder
+    @MockitoBean
+    private lateinit var tokenValidationContextHolder: TokenValidationContextHolder
 
     @Autowired
     private lateinit var clientConfigurationProperties: ClientConfigurationProperties

diff --git a/...ty/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithResourceUrl.kt b/...ty/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithResourceUrl.kt
@@ -8,18 +8,18 @@ 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.RestTemplateAutoConfiguration
+import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
-@SpringBootTest(classes = [OAuth2ClientConfiguration::class, RestTemplateAutoConfiguration::class])
+@SpringBootTest(classes = [OAuth2ClientConfiguration::class, RestClientAutoConfiguration::class])
 @ExtendWith(MockitoExtension::class)
 @ActiveProfiles("test-withresourceurl")
 internal class ClientConfigurationPropertiesTestWithResourceUrl {
 
     private  val matcher = object: ClientConfigurationPropertiesMatcher {}
-    @MockBean
+    @MockitoBean
     private val tokenValidationContextHolder: TokenValidationContextHolder? = null
 
     @Autowired

diff --git a/...y/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithWellKnownUrl.kt b/...y/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithWellKnownUrl.kt
@@ -12,20 +12,20 @@ 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.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.ApplicationContextInitializer
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.context.support.GenericApplicationContext
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.context.support.TestPropertySourceUtils.addInlinedPropertiesToEnvironment
 
 @SpringBootTest(classes = [OAuth2ClientConfiguration::class, RestClientAutoConfiguration::class])
 @ContextConfiguration(initializers = [RandomPortInitializer::class])
 @ActiveProfiles("test-withwellknownurl")
 internal class ClientConfigurationPropertiesTestWithWellKnownUrl {
 
-   @MockBean
+   @MockitoBean
    private val tokenValidationContextHolder: TokenValidationContextHolder? = null
 
     @Autowired

diff --git a/...av/security/token/support/client/spring/oauth2/OAuth2AccessTokenServiceIntegrationTest.kt b/...av/security/token/support/client/spring/oauth2/OAuth2AccessTokenServiceIntegrationTest.kt
@@ -1,19 +1,19 @@
 package no.nav.security.token.support.client.spring.oauth2
 
-import com.nimbusds.common.contenttype.ContentType.*
 import com.nimbusds.jwt.JWT
 import com.nimbusds.jwt.JWTClaimNames.JWT_ID
 import com.nimbusds.jwt.JWTClaimsSet.Builder
 import com.nimbusds.jwt.PlainJWT
-import com.nimbusds.oauth2.sdk.GrantType.*
+import com.nimbusds.oauth2.sdk.GrantType.JWT_BEARER
+import com.nimbusds.oauth2.sdk.GrantType.TOKEN_EXCHANGE
 import java.io.IOException
 import java.net.URI
-import java.net.URLEncoder.*
-import java.nio.charset.StandardCharsets.*
-import java.time.LocalDateTime.*
-import java.time.ZoneId.*
+import java.net.URLEncoder.encode
+import java.nio.charset.StandardCharsets.UTF_8
+import java.time.LocalDateTime.now
+import java.time.ZoneId.systemDefault
 import java.util.*
-import java.util.Base64.*
+import java.util.Base64.getDecoder
 import no.nav.security.token.support.client.core.context.JwtBearerTokenResolver
 import no.nav.security.token.support.client.core.oauth2.OAuth2AccessTokenService
 import no.nav.security.token.support.client.spring.ClientConfigurationProperties
@@ -24,24 +24,24 @@ import no.nav.security.token.support.core.context.TokenValidationContextHolder
 import no.nav.security.token.support.core.jwt.JwtToken
 import okhttp3.Headers
 import okhttp3.mockwebserver.MockWebServer
-import org.assertj.core.api.Assertions.*
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.fail
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.mockito.Mockito.*
 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.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
-import org.springframework.http.MediaType.*
+import org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE
 import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [ConfigurationWithCacheEnabledTrue::class, RestClientAutoConfiguration::class])
 @ActiveProfiles("test")
 internal class OAuth2AccessTokenServiceIntegrationTest {
-    @MockBean
+    @MockitoBean
     private val tokenValidationContextHolder: TokenValidationContextHolder? = null
 
     @Autowired

diff --git a/...nav/security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithCacheTest.kt b/...nav/security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithCacheTest.kt
@@ -7,15 +7,15 @@ 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.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [ConfigurationWithCacheEnabledTrue::class, RestClientAutoConfiguration::class])
 @ActiveProfiles("test")
 internal class OAuth2ClientConfigurationWithCacheTest {
 
-    @MockBean
+    @MockitoBean
     private val tokenValidationContextHolder: TokenValidationContextHolder? = null
 
     @Autowired

diff --git a/.../security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithoutCacheTest.kt b/.../security/token/support/client/spring/oauth2/OAuth2ClientConfigurationWithoutCacheTest.kt
@@ -7,14 +7,14 @@ 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.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [ConfigurationWithCacheEnabledFalse::class, RestClientAutoConfiguration::class])
 @ActiveProfiles("test")
 internal class OAuth2ClientConfigurationWithoutCacheTest {
-    @MockBean
+    @MockitoBean
     private val tokenValidationContextHolder: TokenValidationContextHolder? = null
 
     @Autowired