Kotlin template strings fix (#846)

* Fixed template strings * typo
navikt · Feb 13, 2024 · 3675849 · 3675849
1 parent 9472c8f
commit 3675849
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...main/kotlin/no/nav/security/token/support/client/spring/oauth2/DefaultOAuth2HttpClient.kt b/...main/kotlin/no/nav/security/token/support/client/spring/oauth2/DefaultOAuth2HttpClient.kt
@@ -20,11 +20,11 @@ open class DefaultOAuth2HttpClient(val restClient: RestClient) : OAuth2HttpClien
                 setAll(req.formParameters)
             }).retrieve()
             .onStatus({ it.isError }) { _, response ->
-                throw OAuth2ClientException("Received $response.statusCode from $req.tokenEndpointUrl")
+                throw OAuth2ClientException("Received ${response.statusCode} from ${req.tokenEndpointUrl}")
             }
-            .body<OAuth2AccessTokenResponse>() ?: throw OAuth2ClientException("No body in response from $req.tokenEndpointUrl")
+            .body<OAuth2AccessTokenResponse>() ?: throw OAuth2ClientException("No body in response from ${req.tokenEndpointUrl}")
 
      private fun headers(req: OAuth2HttpRequest): HttpHeaders  = HttpHeaders().apply { putAll(req.oAuth2HttpHeaders.headers) }
 
-    override fun toString() = "$javaClass.simpleName  [restClient=$restClient]"
+    override fun toString() = "${javaClass.simpleName}  [restClient=$restClient]"
 }
diff --git a/...in/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientConfiguration.kt b/...in/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientConfiguration.kt
@@ -26,7 +26,7 @@ import no.nav.security.token.support.core.context.TokenValidationContextHolder
 class OAuth2ClientConfiguration : ImportAware {
     private var attrs: AnnotationAttributes? = null
     override fun setImportMetadata(meta: AnnotationMetadata) {
-        attrs = requireNotNull(fromMap(meta.getAnnotationAttributes(EnableOAuth2Client::class.java.name, false))) { "@EnableOAuth2Client is not present on importing class $meta.className" }
+        attrs = requireNotNull(fromMap(meta.getAnnotationAttributes(EnableOAuth2Client::class.java.name, false))) { "@EnableOAuth2Client is not present on importing class ${meta.className}" }
     }
 
     @Bean

diff --git a/...tlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientRequestInterceptor.kt b/...tlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientRequestInterceptor.kt
@@ -29,6 +29,6 @@ class OAuth2ClientRequestInterceptor(private val properties: ClientConfiguration
         return execution.execute(req, body)
     }
 
-    override fun toString() = "$javaClass.simpleName  [properties=$properties, service=$service, matcher=$matcher]"
+    override fun toString() = "${javaClass.simpleName}  [properties=$properties, service=$service, matcher=$matcher]"
 
 }
diff --git a/...core/src/main/kotlin/no/nav/security/token/support/core/configuration/IssuerProperties.kt b/...core/src/main/kotlin/no/nav/security/token/support/core/configuration/IssuerProperties.kt
@@ -20,7 +20,7 @@ class IssuerProperties @JvmOverloads constructor(val discoveryUrl : URL,
                                                  val usePlaintextForHttps: Boolean = false) {
 
     init {
-        cookieName?.let { throw IllegalArgumentException("Cookie-support is discontinued, please remove $it from ypur configuration now") }
+        cookieName?.let { throw IllegalArgumentException("Cookie-support is discontinued, please remove $it from your configuration now") }
     }
 
     override fun toString() = "IssuerProperties(discoveryUrl=$discoveryUrl, acceptedAudience=$acceptedAudience, headerName=$headerName, proxyUrl=$proxyUrl, usePlaintextForHttps=$usePlaintextForHttps, validation=$validation, jwksCache=$jwksCache)"

diff --git a/...main/kotlin/no/nav/security/token/support/spring/EnableJwtTokenValidationConfiguration.kt b/...main/kotlin/no/nav/security/token/support/spring/EnableJwtTokenValidationConfiguration.kt
@@ -48,7 +48,7 @@ class EnableJwtTokenValidationConfiguration (private val env: Environment) : Web
     }
 
     override fun setImportMetadata(meta: AnnotationMetadata) {
-        attrs = fromMap(meta.getAnnotationAttributes(EnableJwtTokenValidation::class.java.name, false)) ?: throw IllegalArgumentException("@EnableJwtTokenValidation is not present on importing class $meta.className")
+        attrs = fromMap(meta.getAnnotationAttributes(EnableJwtTokenValidation::class.java.name, false)) ?: throw IllegalArgumentException("@EnableJwtTokenValidation is not present on importing class ${meta.className}")
     }
 
     //TO-DO remove support for global proxy - should be set per issuer config