Skift mapper til Jackson for å parse dato til LocalDate

Co-authored-by: kristoiv <[email protected]>
Co-authored-by: gustavli <[email protected]>

Author: 3 people

build.gradle.kts

@@ -10,7 +10,6 @@ val brukernotifikasjon_schemas_version: String by project
 val kafka_version: String by project
 val kafka_avro_version: String by project
 val influxdb_version: String by project
-val klaxon_version: String by project
 
 group = "no.nav.hjelpemidler"
 version = "1.0-SNAPSHOT"
@@ -30,7 +29,6 @@ dependencies {
     implementation("org.apache.kafka:kafka-clients:$kafka_version")
     implementation("io.confluent:kafka-avro-serializer:$kafka_avro_version")
     implementation("org.influxdb:influxdb-java:$influxdb_version")
-    implementation("com.beust:klaxon:$klaxon_version")
 }
 
 tasks.withType<KotlinCompile>() {

gradle.properties

@@ -6,5 +6,4 @@ konfig_version=1.6.10.0
 brukernotifikasjon_schemas_version=1.2021.01.18-11.12-b9c8c40b98d1
 kafka_version=2.6.0
 kafka_avro_version=6.0.1
-influxdb_version=2.21
-klaxon_version=5.0.1
+influxdb_version=2.21

src/main/kotlin/no/nav/hjelpemidler/Application.kt

@@ -1,7 +1,8 @@
 package no.nav.hjelpemidler
 
-import com.beust.klaxon.Json
-import com.beust.klaxon.Klaxon
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.module.kotlin.readValue
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.request.header
@@ -15,14 +16,19 @@ import no.nav.helse.rapids_rivers.RapidApplication
 import no.nav.helse.rapids_rivers.RapidsConnection
 import no.nav.hjelpemidler.configuration.Configuration
 import no.nav.hjelpemidler.metrics.SensuMetrics
+import no.nav.hjelpemidler.model.Statusinfo
 import java.net.InetAddress
 import java.time.LocalDateTime
 import java.util.UUID
 
 private val logg = KotlinLogging.logger {}
 private val sikkerlogg = KotlinLogging.logger("tjenestekall")
+private val mapper = ObjectMapper().registerModule(JavaTimeModule())
 
+// Unngå "inappropriate blocking method call" for objectmapper.writeValueAsString
+@Suppress("BlockingMethodInNonBlockingContext")
 fun main() {
+
     var rapidApp: RapidsConnection? = null
     rapidApp = RapidApplication.Builder(
         RapidApplication.RapidApplicationConfig(
@@ -65,8 +71,8 @@ fun main() {
                 // Check for valid json request
                 val ordrelinje: Statusinfo?
                 try {
-                    ordrelinje = Klaxon().parse<Statusinfo>(rawJson)
-                    sikkerlogg.info("Parsing incoming json request successful: ${Klaxon().toJsonString(ordrelinje)}")
+                    ordrelinje = mapper.readValue(rawJson)
+                    sikkerlogg.info("Parsing incoming json request successful: ${mapper.writeValueAsString(ordrelinje)}")
                     SensuMetrics().meldingFraOebs()
                 } catch (e: Exception) {
                     // Deal with invalid json in request
@@ -101,7 +107,7 @@ fun main() {
 
                 // Publish the received json to our rapid
                 try {
-                    rapidApp!!.publish(ordrelinje.fnrBruker, Klaxon().toJsonString(melding))
+                    rapidApp!!.publish(ordrelinje.fnrBruker, mapper.writeValueAsString(melding))
                     SensuMetrics().meldingTilRapidSuksess()
                 } catch (e: Exception) {
                     SensuMetrics().meldingTilRapidFeilet()
@@ -128,44 +134,3 @@ data class Message(
     val fnrBruker: String,
     val data: Statusinfo,
 )
-
-data class Statusinfo(
-    @Json(name = "System")
-    val mottakendeSystem: String,
-    @Json(name = "IncidentNummer")
-    val serviceforespørsel: Int,
-    @Json(name = "IncidentStatus")
-    val serviceforespørselstatus: String,
-    @Json(name = "IncidentType")
-    val serviceforespørseltype: String,
-    @Json(name = "IncidentSoknadType")
-    val søknadstype: String,
-    @Json(name = "IncidentVedtakDato")
-    val vedtaksdato: String,
-    @Json(name = "IncidentSoknad")
-    val søknad: String,
-    @Json(name = "IncidentResultat")
-    val resultat: String,
-    @Json(name = "IncidentRef")
-    val saksblokkOgSaksnummer: String,
-    @Json(name = "OrdreNumber")
-    val ordrenummer: Int,
-    @Json(name = "LineNumber")
-    val ordrelinjenummer: Int,
-    @Json(name = "ShipmentNumber")
-    val delordrelinjenummer: Int,
-    @Json(name = "Description")
-    val artikkelbeskrivelse: String,
-    @Json(name = "CategoryDescription")
-    val produktgruppe: String,
-    @Json(name = "OrderedItem")
-    val artikkel: Int,
-    @Json(name = "User_ItemType")
-    val hjelpemiddeltype: String,
-    @Json(name = "Quantity")
-    val antall: Int,
-    @Json(name = "AccountNumber")
-    val fnrBruker: String,
-    @Json(name = "LastUpdateDate")
-    val sistOppdatert: String,
-)

src/main/kotlin/no/nav/hjelpemidler/model/Statusinfo.kt

@@ -0,0 +1,63 @@
+package no.nav.hjelpemidler.model
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import java.time.LocalDate
+
+data class Statusinfo(
+    @JsonProperty("System")
+    val mottakendeSystem: String,
+
+    @JsonProperty("IncidentNummer")
+    val serviceforespørsel: Int,
+
+    @JsonProperty("IncidentStatus")
+    val serviceforespørselstatus: String,
+
+    @JsonProperty("IncidentType")
+    val serviceforespørseltype: String,
+
+    @JsonProperty("IncidentSoknadType")
+    val søknadstype: String,
+
+    @JsonProperty("IncidentVedtakDato")
+    val vedtaksdato: LocalDate,
+
+    @JsonProperty("IncidentSoknad")
+    val søknad: String,
+
+    @JsonProperty("IncidentResultat")
+    val resultat: String,
+
+    @JsonProperty("IncidentRef")
+    val saksblokkOgSaksnummer: String,
+
+    @JsonProperty("OrdreNumber")
+    val ordrenummer: Int,
+
+    @JsonProperty("LineNumber")
+    val ordrelinjenummer: Int,
+
+    @JsonProperty("ShipmentNumber")
+    val delordrelinjenummer: Int,
+
+    @JsonProperty("Description")
+    val artikkelbeskrivelse: String,
+
+    @JsonProperty("CategoryDescription")
+    val produktgruppe: String,
+
+    @JsonProperty("OrderedItem")
+    val artikkel: Int,
+
+    @JsonProperty("User_ItemType")
+    val hjelpemiddeltype: String,
+
+    @JsonProperty("Quantity")
+    val antall: Int,
+
+    @JsonProperty("AccountNumber")
+    val fnrBruker: String,
+
+    @JsonProperty("LastUpdateDate")
+    val sistOppdatert: LocalDate,
+)