Fix after Moshi upgrade.

Author: gtcno

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/InntektApi.kt

@@ -127,7 +127,7 @@ fun main() = runBlocking {
     }.start()
     Runtime.getRuntime().addShutdownHook(Thread {
         subsumsjonBruktDataConsumer.stop()
-        application.stop(5, 60, TimeUnit.SECONDS)
+        application.stop(5000, 60000)
     })
 }
 

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/MoshiAdapters.kt

@@ -1,5 +1,8 @@
 package no.nav.dagpenger.inntekt
 
+import com.github.kittinunf.fuel.core.Request
+import com.github.kittinunf.fuel.core.ResponseDeserializable
+import com.github.kittinunf.fuel.core.response
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
@@ -92,3 +95,12 @@ class URIJsonAdapter {
         return URI.create(json)
     }
 }
+internal fun <T : Any> moshiDeserializerOf(clazz: Class<T>) = object : ResponseDeserializable<T> {
+    override fun deserialize(content: String): T? = Moshi.Builder()
+        .add(KotlinJsonAdapterFactory())
+        .build()
+        .adapter(clazz)
+        .fromJson(content)
+}
+
+internal inline fun <reified T : Any> Request.responseObject() = response(moshiDeserializerOf(T::class.java))

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/oppslag/OppslagClient.kt

@@ -3,11 +3,11 @@ package no.nav.dagpenger.inntekt.oppslag
 import com.github.kittinunf.fuel.core.extensions.authentication
 import com.github.kittinunf.fuel.httpGet
 import com.github.kittinunf.fuel.httpPost
-import com.github.kittinunf.fuel.moshi.responseObject
 import java.lang.RuntimeException
 import mu.KotlinLogging
 import no.bekk.bekkopen.org.OrganisasjonsnummerValidator
 import no.nav.dagpenger.inntekt.moshiInstance
+import no.nav.dagpenger.inntekt.responseObject
 import no.nav.dagpenger.oidc.OidcClient
 import no.nav.dagpenger.oidc.OidcToken
 

dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/JwtStub.kt

@@ -39,8 +39,8 @@ class JwtStub(private val issuer: String = "test issuer") {
     class StubbedJwkProvider(private val publicKey: RSAPublicKey) : JwkProvider {
         override fun get(keyId: String?): Jwk {
             return Jwk(keyId, "RSA", "RS256", "sig", listOf(), null, null, null, mapOf(
-                "e" to kotlinx.io.core.String(Base64.getEncoder().encode(publicKey.publicExponent.toByteArray())),
-                "n" to kotlinx.io.core.String(Base64.getEncoder().encode(publicKey.modulus.toByteArray()))
+                "e" to String(Base64.getEncoder().encode(publicKey.publicExponent.toByteArray())),
+                "n" to String(Base64.getEncoder().encode(publicKey.modulus.toByteArray()))
             ))
         }
     }

dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/oppslag/OppslagClientTest.kt

@@ -99,7 +99,7 @@ class OppslagClientTest {
     @Test
     fun `fetch person name on 200 ok`() {
 
-        val validJsonBody = """{"sammensattNavn" : "sammensattnavntest"}"""
+        val validJsonBody = """{"fornavn": "Ola", "mellomnavn": "S", "etternavn":"Nordman", "sammensattNavn" : "sammensattnavntest"}"""
         val testFnr = "12345678912"
 
         WireMock.stubFor(