use kotlin map

navikt · Feb 28, 2022 · 4f93da8 · 4f93da8
1 parent dcde030
commit 4f93da8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 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
@@ -12,7 +12,6 @@ import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfigu
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.ActiveProfiles
-import java.util.Map
 
 @SpringBootTest(classes = [OAuth2ClientConfiguration::class, RestTemplateAutoConfiguration::class])
 @ActiveProfiles("test")
@@ -28,7 +27,7 @@ internal class ClientConfigurationPropertiesTest {
     fun testClientConfigIsValid() {
         assertThat(clientConfigurationProperties).isNotNull
         assertThat(clientConfigurationProperties.registration).isNotNull
-        val clientProperties = clientConfigurationProperties.registration.values().stream().findFirst().orElse(null)
+        val clientProperties = clientConfigurationProperties.registration.values.stream().findFirst().orElse(null)
         assertThat(clientProperties).isNotNull
         val auth = clientProperties.authentication
         assertThat(auth).isNotNull
@@ -46,7 +45,7 @@ internal class ClientConfigurationPropertiesTest {
         assertThat(clientConfigurationProperties.registration).isNotNull
         val clientProperties = clientConfigurationProperties.registration["example1-token-exchange1"]
         assertThat(clientProperties).isNotNull
-        assertThat(clientProperties.tokenExchange.audience).isNotBlank
+        assertThat(clientProperties!!.tokenExchange.audience).isNotBlank
     }
 
     @Test
@@ -55,7 +54,7 @@ internal class ClientConfigurationPropertiesTest {
         assertThat(clientConfigurationProperties.registration).isNotNull
         val clientProperties = clientConfigurationProperties.registration["example1-clientcredentials3"]
         assertThat(clientProperties).isNotNull
-        val auth = clientProperties.authentication
+        val auth = clientProperties!!.authentication
         assertThat(auth).isNotNull
         assertThat(auth.clientAuthMethod).isEqualTo(ClientAuthenticationMethod.PRIVATE_KEY_JWT)
         assertThat(auth.clientId).isNotNull
@@ -67,8 +66,8 @@ internal class ClientConfigurationPropertiesTest {
 
     @Test
     fun testDifferentClientPropsShouldNOTBeEqualAndShouldMakeSurroundingRequestsUnequalToo() {
-        val props: Map<String, ClientProperties>? = clientConfigurationProperties.registration
-        assertThat(props!!.size()).isGreaterThan(1)
+        val props = clientConfigurationProperties.registration
+        assertThat(props.size).isGreaterThan(1)
         val p1 = props.get("example1-onbehalfof")
         val p2 = props.get("example1-onbehalfof2")
         assertThat(p1 == p2).isFalse

diff --git a/...ty/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithResourceUrl.kt b/...ty/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithResourceUrl.kt
@@ -31,7 +31,7 @@ internal class ClientConfigurationPropertiesTestWithResourceUrl {
     fun testClientConfigIsValid() {
         assertThat(clientConfigurationProperties).isNotNull
         assertThat(clientConfigurationProperties.registration).isNotNull
-        val clientProperties = clientConfigurationProperties.registration.values().stream().findFirst().orElse(null)
+        val clientProperties = clientConfigurationProperties.registration.values.stream().findFirst().orElse(null)
         assertThat(clientProperties).isNotNull
         val auth = clientProperties.authentication
         assertThat(auth).isNotNull

diff --git a/...y/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithWellKnownUrl.kt b/...y/token/support/client/spring/oauth2/ClientConfigurationPropertiesTestWithWellKnownUrl.kt
@@ -34,7 +34,7 @@ internal class ClientConfigurationPropertiesTestWithWellKnownUrl {
     fun testClientConfigIsValid() {
         assertThat(clientConfigurationProperties).isNotNull
         assertThat(clientConfigurationProperties.registration).isNotNull
-        val clientProperties = clientConfigurationProperties.registration.values().stream().findFirst().orElse(null)
+        val clientProperties = clientConfigurationProperties.registration.values.stream().findFirst().orElse(null)
         assertThat(clientProperties).isNotNull
         val auth = clientProperties.authentication
         assertThat(auth).isNotNull

diff --git a/...av/security/token/support/client/spring/oauth2/OAuth2AccessTokenServiceIntegrationTest.kt b/...av/security/token/support/client/spring/oauth2/OAuth2AccessTokenServiceIntegrationTest.kt
@@ -67,7 +67,7 @@ internal class OAuth2AccessTokenServiceIntegrationTest {
         get() {
             var clientProperties = clientConfigurationProperties.registration["example1-onbehalfof"]
             Assertions.assertThat(clientProperties).isNotNull
-            clientProperties = clientProperties.toBuilder()
+            clientProperties = clientProperties!!.toBuilder()
                 .tokenEndpointUrl(tokenEndpointUrl)
                 .build()
             server!!.enqueue(TestUtils.jsonResponse(TOKEN_RESPONSE))
@@ -110,7 +110,7 @@ internal class OAuth2AccessTokenServiceIntegrationTest {
             var clientProperties = clientConfigurationProperties.registration["example1-token" +
                     "-exchange1"]
             Assertions.assertThat(clientProperties).isNotNull
-            clientProperties = clientProperties.toBuilder()
+            clientProperties = clientProperties!!.toBuilder()
                 .tokenEndpointUrl(tokenEndpointUrl)
                 .build()
             server!!.enqueue(TestUtils.jsonResponse(TOKEN_RESPONSE))
@@ -138,7 +138,7 @@ internal class OAuth2AccessTokenServiceIntegrationTest {
         get() {
             var clientProperties = clientConfigurationProperties.registration["example1-clientcredentials1"]
             Assertions.assertThat(clientProperties).isNotNull
-            clientProperties = clientProperties.toBuilder()
+            clientProperties = clientProperties!!.toBuilder()
                 .tokenEndpointUrl(tokenEndpointUrl)
                 .build()
             server!!.enqueue(TestUtils.jsonResponse(TOKEN_RESPONSE))