refactor: replace deprecated methods, remove unnecessary non-null safe calls

tronghn · tronghn · commit 1839faa69b96 · 2025-09-18T08:34:05.000+02:00
diff --git a/src/main/kotlin/no/nav/security/mock/oauth2/debugger/Client.kt b/src/main/kotlin/no/nav/security/mock/oauth2/debugger/Client.kt
@@ -99,7 +99,7 @@ internal fun OkHttpClient.post(tokenRequest: TokenRequest): String =
                 .build(),
         ).execute()
         .body
-        ?.string() ?: throw RuntimeException("could not get response body from url=${tokenRequest.url}")
+        .string()
 
 fun OkHttpClient.withSsl(
     ssl: Ssl,
diff --git a/src/main/kotlin/no/nav/security/mock/oauth2/grant/AuthorizationCodeHandler.kt b/src/main/kotlin/no/nav/security/mock/oauth2/grant/AuthorizationCodeHandler.kt
@@ -92,11 +92,11 @@ internal class AuthorizationCodeHandler(
 
     private fun getLoginTokenCallbackOrDefault(
         code: AuthorizationCode,
-        OAuth2TokenCallback: OAuth2TokenCallback,
+        oAuth2TokenCallback: OAuth2TokenCallback,
     ): OAuth2TokenCallback =
         takeLoginFromCache(code)?.let {
-            LoginOAuth2TokenCallback(it, OAuth2TokenCallback)
-        } ?: OAuth2TokenCallback
+            LoginOAuth2TokenCallback(it, oAuth2TokenCallback)
+        } ?: oAuth2TokenCallback
 
     private fun takeLoginFromCache(code: AuthorizationCode): Login? = codeToLoginCache.remove(code)
 
@@ -120,7 +120,7 @@ internal class AuthorizationCodeHandler(
                     try {
                         jsonMapper
                             .readTree(it)
-                            .fields()
+                            .properties()
                             .forEach { field ->
                                 put(field.key, jsonMapper.readValue(field.value.toString()))
                             }
diff --git a/src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpServer.kt b/src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpServer.kt
@@ -6,9 +6,10 @@ import io.netty.channel.ChannelFuture
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelInitializer
 import io.netty.channel.ChannelOption
+import io.netty.channel.MultiThreadIoEventLoopGroup
 import io.netty.channel.ServerChannel
 import io.netty.channel.SimpleChannelInboundHandler
-import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.nio.NioIoHandler
 import io.netty.channel.socket.SocketChannel
 import io.netty.channel.socket.nio.NioServerSocketChannel
 import io.netty.handler.codec.http.DefaultHttpResponse
@@ -71,8 +72,7 @@ interface OAuth2HttpServer : AutoCloseable {
     fun sslConfig(): Ssl?
 }
 
-class
-MockWebServerWrapper
+class MockWebServerWrapper
     @JvmOverloads
     constructor(
         val ssl: Ssl? = null,
@@ -139,8 +139,8 @@ class NettyWrapper
     constructor(
         val ssl: Ssl? = null,
     ) : OAuth2HttpServer {
-        private val masterGroup = NioEventLoopGroup()
-        private val workerGroup = NioEventLoopGroup()
+        private val masterGroup = MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
+        private val workerGroup = MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
         private var closeFuture: ChannelFuture? = null
         private lateinit var address: InetSocketAddress
         private var port by Delegates.notNull<Int>()
diff --git a/src/test/kotlin/examples/kotlin/ktor/client/OAuth2Client.kt b/src/test/kotlin/examples/kotlin/ktor/client/OAuth2Client.kt
@@ -29,7 +29,7 @@ val httpClient =
         install(ContentNegotiation) {
             jackson {
                 configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                setSerializationInclusion(JsonInclude.Include.NON_NULL)
+                setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)
             }
         }
     }
diff --git a/src/test/kotlin/examples/kotlin/ktor/login/OAuth2LoginApp.kt b/src/test/kotlin/examples/kotlin/ktor/login/OAuth2LoginApp.kt
@@ -134,7 +134,7 @@ internal val httpClient =
         install(ContentNegotiation) {
             jackson {
                 configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                setSerializationInclusion(JsonInclude.Include.NON_NULL)
+                setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)
             }
         }
     }
diff --git a/src/test/kotlin/examples/kotlin/ktor/resourceserver/OAuth2ResourceServerApp.kt b/src/test/kotlin/examples/kotlin/ktor/resourceserver/OAuth2ResourceServerApp.kt
@@ -106,7 +106,7 @@ class AuthConfig(
                 install(ContentNegotiation) {
                     jackson {
                         configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                        setSerializationInclusion(JsonInclude.Include.NON_NULL)
+                        setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)
                     }
                 }
             }
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/MockOAuth2ServerTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/MockOAuth2ServerTest.kt
@@ -16,7 +16,7 @@ class MockOAuth2ServerTest {
     @Test
     fun `server takeRequest() should return sent request`() {
         withMockOAuth2Server {
-            client.post(this.baseUrl(), mapOf("param1" to "value1")).body?.close()
+            client.post(this.baseUrl(), mapOf("param1" to "value1")).body.close()
 
             this.takeRequest().asClue {
                 it.requestUrl shouldBe this.baseUrl()
@@ -33,7 +33,7 @@ class MockOAuth2ServerTest {
                         "scope" to "scope1",
                     ),
                 ).body
-                ?.close()
+                .close()
 
             this.takeRequest().asClue {
                 it.requestUrl shouldBe this.tokenEndpointUrl("test")
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/e2e/InteractiveLoginIntegrationTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/e2e/InteractiveLoginIntegrationTest.kt
@@ -68,7 +68,7 @@ class InteractiveLoginIntegrationTest {
         val loginUrl = server.authorizationEndpointUrl(issuerId).authenticationRequest()
         client.get(loginUrl).asClue {
             it.code shouldBe 200
-            it.body?.string() shouldContain "<html"
+            it.body.string() shouldContain "<html"
         }
 
         return client
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/e2e/LoginPageIntegrationTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/e2e/LoginPageIntegrationTest.kt
@@ -18,7 +18,7 @@ class LoginPageIntegrationTest {
     @Test
     fun `authorization with interactive login should return built-in login page`() {
         val server = MockOAuth2Server(OAuth2Config(interactiveLogin = true)).apply { start() }
-        val body = client.get(server.authorizationEndpointUrl("default").authenticationRequest()).body?.string()
+        val body = client.get(server.authorizationEndpointUrl("default").authenticationRequest()).body.string()
 
         body shouldNotBe null
         body shouldContain "<h2 class=\"title\">Mock OAuth2 Server Sign-in</h2>"
@@ -33,7 +33,7 @@ class LoginPageIntegrationTest {
                     loginPagePath = "./src/test/resources/login.example.html",
                 ),
             ).apply { start() }
-        val body = client.get(server.authorizationEndpointUrl("default").authenticationRequest()).body?.string()
+        val body = client.get(server.authorizationEndpointUrl("default").authenticationRequest()).body.string()
 
         body shouldNotBe null
         body shouldContain "Mock OAuth2 Server Example"
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/e2e/MockOAuth2ServerIntegrationTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/e2e/MockOAuth2ServerIntegrationTest.kt
@@ -49,9 +49,9 @@ class MockOAuth2ServerIntegrationTest {
             ).apply {
                 start()
             }
-        client.get(s.wellKnownUrl("someissuer")).body?.string() shouldContain s.issuerUrl("someissuer").toString()
-        client.get(s.url("/custom")).body?.string() shouldBe "custom route"
-        client.get(s.url("/someissuer/custom")).body?.string() shouldBe "custom route"
+        client.get(s.wellKnownUrl("someissuer")).body.string() shouldContain s.issuerUrl("someissuer").toString()
+        client.get(s.url("/custom")).body.string() shouldBe "custom route"
+        client.get(s.url("/someissuer/custom")).body.string() shouldBe "custom route"
     }
 
     @Test
@@ -146,7 +146,7 @@ class MockOAuth2ServerIntegrationTest {
                     ),
                 )
             val wellKnown = client.get(this.wellKnownUrl("default")).parse<WellKnown>()
-            val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body?.let { JWKSet.parse(it.string()) }
+            val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body.let { JWKSet.parse(it.string()) }
 
             jwks.shouldNotBeNull()
 
@@ -176,7 +176,7 @@ class MockOAuth2ServerIntegrationTest {
                 )
 
             val wellKnown = client.get(this.wellKnownUrl("default")).parse<WellKnown>()
-            val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body?.let { JWKSet.parse(it.string()) }
+            val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body.let { JWKSet.parse(it.string()) }
 
             jwks.shouldNotBeNull()
 
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/e2e/OidcAuthorizationCodeGrantIntegrationTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/e2e/OidcAuthorizationCodeGrantIntegrationTest.kt
@@ -123,7 +123,7 @@ class OidcAuthorizationCodeGrantIntegrationTest {
 
         client.tokenRequest(code, pkce).asClue {
             it.code shouldBe 200
-            it.body?.string() shouldContain "id_token"
+            it.body.string() shouldContain "id_token"
         }
     }
 
@@ -143,7 +143,7 @@ class OidcAuthorizationCodeGrantIntegrationTest {
         val invalidPkce = Pkce()
         client.tokenRequest(code, invalidPkce).asClue {
             it.code shouldBe 400
-            it.body?.string() shouldContain "code_verifier does not compute to code_challenge from request"
+            it.body.string() shouldContain "code_verifier does not compute to code_challenge from request"
         }
     }
 
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/e2e/WellKnownIntegrationTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/e2e/WellKnownIntegrationTest.kt
@@ -18,10 +18,10 @@ class WellKnownIntegrationTest {
     fun `get to well-known url should return oauth2 server metadata`() {
         withMockOAuth2Server {
             val response = client.get(this.wellKnownUrl("default"))
-            val body = response.body?.string()
+            val body = response.body.string()
             response.code shouldBe 200
             body shouldNotBe null
-            jacksonObjectMapper().readValue<Map<String, Any>>(body!!).keys.asClue {
+            jacksonObjectMapper().readValue<Map<String, Any>>(body).keys.asClue {
                 it shouldContainExactlyInAnyOrder
                     listOf(
                         "issuer",
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/examples/AbstractExampleApp.kt b/src/test/kotlin/no/nav/security/mock/oauth2/examples/AbstractExampleApp.kt
@@ -78,8 +78,8 @@ abstract class AbstractExampleApp(
                     .build(),
             ).execute()
             .body
-            ?.string()
-            ?.let {
+            .string()
+            .let {
                 JWKSet.parse(it)
             } ?: throw RuntimeException("could not retrieve jwks")
 
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/examples/clientcredentials/ExampleAppWithClientCredentialsClient.kt b/src/test/kotlin/no/nav/security/mock/oauth2/examples/clientcredentials/ExampleAppWithClientCredentialsClient.kt
@@ -40,7 +40,7 @@ class ExampleAppWithClientCredentialsClient(
                                 .build(),
                         ).build(),
                 ).execute()
-        return tokenResponse.body?.string()?.let {
+        return tokenResponse.body.string().let {
             ObjectMapper().readValue<JsonNode>(it).get("access_token")?.textValue()
         }
     }
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/examples/clientcredentials/ExampleAppWithClientCredentialsClientTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/examples/clientcredentials/ExampleAppWithClientCredentialsClientTest.kt
@@ -47,10 +47,10 @@ internal class ExampleAppWithClientCredentialsClientTest {
 
         val token: SignedJWT? =
             response.body
-                ?.string()
-                ?.split("token=")
-                ?.let { it[1] }
-                ?.let { SignedJWT.parse(it) }
+                .string()
+                .split("token=")
+                .let { it[1] }
+                .let { SignedJWT.parse(it) }
 
         assertThat(token).isNotNull
         assertThat(token?.jwtClaimsSet?.subject).isEqualTo("ExampleAppWithClientCredentialsClient")
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/examples/openidconnect/ExampleAppWithOpenIdConnect.kt b/src/test/kotlin/no/nav/security/mock/oauth2/examples/openidconnect/ExampleAppWithOpenIdConnect.kt
@@ -43,7 +43,7 @@ class ExampleAppWithOpenIdConnect(
                                         .build(),
                                 ).build(),
                         ).execute()
-                val idToken: String = ObjectMapper().readValue<JsonNode>(tokenResponse.body!!.string()).get("id_token").textValue()
+                val idToken: String = ObjectMapper().readValue<JsonNode>(tokenResponse.body.string()).get("id_token").textValue()
                 val idTokenClaims: JWTClaimsSet = verifyJwt(idToken, metadata.issuer, retrieveJwks())
                 MockResponse()
                     .setResponseCode(200)
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/examples/openidconnect/ExampleAppWithOpenIdConnectTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/examples/openidconnect/ExampleAppWithOpenIdConnectTest.kt
@@ -57,7 +57,7 @@ class ExampleAppWithOpenIdConnectTest {
         assertThat(loginResponse.headers["Set-Cookie"]).contains("id_token=")
         val securedResponse = client.newCall(Request.Builder().url(exampleApp.url("/secured")).build()).execute()
         assertThat(securedResponse.code).isEqualTo(200)
-        val body = securedResponse.body?.string()
+        val body = securedResponse.body.string()
         assertThat(body).isEqualTo("welcome foo")
     }
 
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/examples/securedapi/ExampleAppWithSecuredApiTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/examples/securedapi/ExampleAppWithSecuredApiTest.kt
@@ -61,6 +61,6 @@ internal class ExampleAppWithSecuredApiTest {
                         .build(),
                 ).execute()
         assertThat(response.code).isEqualTo(200)
-        assertThat(response.body?.string()).contains(token.jwtClaimsSet.subject)
+        assertThat(response.body.string()).contains(token.jwtClaimsSet.subject)
     }
 }
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/extensions/HttpUrlExtensionsTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/extensions/HttpUrlExtensionsTest.kt
@@ -19,7 +19,7 @@ internal class HttpUrlExtensionsTest {
 
     private fun `verify oauth2 endpoint urls`(baseUrl: String) {
         val httpUrl = baseUrl.toHttpUrl()
-        httpUrl.toIssuerUrl() shouldBe "$baseUrl".toHttpUrl()
+        httpUrl.toIssuerUrl() shouldBe baseUrl.toHttpUrl()
         httpUrl.toWellKnownUrl() shouldBe "$baseUrl/.well-known/openid-configuration".toHttpUrl()
         httpUrl.toOAuth2AuthorizationServerMetadataUrl() shouldBe "$baseUrl/.well-known/oauth-authorization-server".toHttpUrl()
         httpUrl.toTokenEndpointUrl() shouldBe "$baseUrl/token".toHttpUrl()
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/server/OAuth2HttpServerTest.kt b/src/test/kotlin/no/nav/security/mock/oauth2/server/OAuth2HttpServerTest.kt
@@ -92,11 +92,11 @@ internal class OAuth2HttpServerTest {
                     this.url("/header"),
                     Headers.headersOf("header1", "headervalue1"),
                 ).body
-                ?.string() shouldBe "headermatch"
+                .string() shouldBe "headermatch"
 
-            client.get(this.url("/1/2")).body?.string() shouldBe "pathmatch"
-            client.get(this.url("path?param1=value1&param2=value2")).body?.string() shouldBe "querymatch"
-            client.post(this.url("/form"), mapOf("formparam" to "formvalue1")).body?.string() shouldBe "bodymatch"
+            client.get(this.url("/1/2")).body.string() shouldBe "pathmatch"
+            client.get(this.url("path?param1=value1&param2=value2")).body.string() shouldBe "querymatch"
+            client.post(this.url("/form"), mapOf("formparam" to "formvalue1")).body.string() shouldBe "bodymatch"
             client.get(this.url("/notfound")).code shouldBe 404
             client.get(this.url("/redirect")).apply {
                 this.code shouldBe 302
diff --git a/src/test/kotlin/no/nav/security/mock/oauth2/testutils/Http.kt b/src/test/kotlin/no/nav/security/mock/oauth2/testutils/Http.kt
@@ -22,7 +22,7 @@ fun Response.toTokenResponse(): ParsedTokenResponse =
         checkNotNull(this.body).string(),
     )
 
-inline fun <reified T> Response.parse(): T = jacksonObjectMapper().readValue(checkNotNull(body?.string()))
+inline fun <reified T> Response.parse(): T = jacksonObjectMapper().readValue(checkNotNull(body.string()))
 
 val Response.authorizationCode: String?
     get() =

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ val httpClient =`
`29`	`29`	`install(ContentNegotiation) {`
`30`	`30`	`jackson {`
`31`	`31`	`configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)`
`32`		`- setSerializationInclusion(JsonInclude.Include.NON_NULL)`
	`32`	`+ setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ internal val httpClient =`
`134`	`134`	`install(ContentNegotiation) {`
`135`	`135`	`jackson {`
`136`	`136`	`configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)`
`137`		`- setSerializationInclusion(JsonInclude.Include.NON_NULL)`
	`137`	`+ setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class AuthConfig(`
`106`	`106`	`install(ContentNegotiation) {`
`107`	`107`	`jackson {`
`108`	`108`	`configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)`
`109`		`- setSerializationInclusion(JsonInclude.Include.NON_NULL)`
	`109`	`+ setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class InteractiveLoginIntegrationTest {`
`68`	`68`	`val loginUrl = server.authorizationEndpointUrl(issuerId).authenticationRequest()`
`69`	`69`	`client.get(loginUrl).asClue {`
`70`	`70`	`it.code shouldBe 200`
`71`		`- it.body?.string() shouldContain "<html"`
	`71`	`+ it.body.string() shouldContain "<html"`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`return client`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ class MockOAuth2ServerIntegrationTest {`
`49`	`49`	`).apply {`
`50`	`50`	`start()`
`51`	`51`	`}`
`52`		`- client.get(s.wellKnownUrl("someissuer")).body?.string() shouldContain s.issuerUrl("someissuer").toString()`
`53`		`- client.get(s.url("/custom")).body?.string() shouldBe "custom route"`
`54`		`- client.get(s.url("/someissuer/custom")).body?.string() shouldBe "custom route"`
	`52`	`+ client.get(s.wellKnownUrl("someissuer")).body.string() shouldContain s.issuerUrl("someissuer").toString()`
	`53`	`+ client.get(s.url("/custom")).body.string() shouldBe "custom route"`
	`54`	`+ client.get(s.url("/someissuer/custom")).body.string() shouldBe "custom route"`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Test`
`@@ -146,7 +146,7 @@ class MockOAuth2ServerIntegrationTest {`
`146`	`146`	`),`
`147`	`147`	`)`
`148`	`148`	`val wellKnown = client.get(this.wellKnownUrl("default")).parse<WellKnown>()`
`149`		`- val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body?.let { JWKSet.parse(it.string()) }`
	`149`	`+ val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body.let { JWKSet.parse(it.string()) }`
`150`	`150`
`151`	`151`	`jwks.shouldNotBeNull()`
`152`	`152`
`@@ -176,7 +176,7 @@ class MockOAuth2ServerIntegrationTest {`
`176`	`176`	`)`
`177`	`177`
`178`	`178`	`val wellKnown = client.get(this.wellKnownUrl("default")).parse<WellKnown>()`
`179`		`- val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body?.let { JWKSet.parse(it.string()) }`
	`179`	`+ val jwks = client.get(wellKnown.jwksUri.toHttpUrl()).body.let { JWKSet.parse(it.string()) }`
`180`	`180`
`181`	`181`	`jwks.shouldNotBeNull()`
`182`	`182`