oppgraderer r-and-r som gir oss ktor 2.0

Author: di0nys1us

Dockerfile

@@ -1,2 +1,2 @@
 FROM navikt/java:17
-COPY /build/libs/hm-oebs-listener-fat-1.0-SNAPSHOT.jar app.jar
+COPY build/libs/hm-oebs-listener-1.0-SNAPSHOT.jar app.jar

build.gradle.kts

@@ -1,60 +1,55 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val rapids_and_rivers_version: String by project
-val kotlin_logging_version: String by project
-val konfig_version: String by project
-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 jackson_version: String by project
-
 plugins {
-    kotlin("jvm") version "1.6.10"
+    kotlin("jvm") version "1.6.21"
 }
 
 group = "no.nav.hjelpemidler"
 version = "1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
-    maven("https://jitpack.io") // Rapids and Rivers
-    maven("https://packages.confluent.io/maven/") // Kafka Avro
+    maven("https://jitpack.io") // rapids-and-rivers
 }
 
-fun ktor(name: String) = "io.ktor:ktor-$name:1.6.7"
-
 dependencies {
-    testImplementation(kotlin("test-junit"))
-
-    implementation("com.github.navikt:rapids-and-rivers:$rapids_and_rivers_version")
-    implementation("io.github.microutils:kotlin-logging:$kotlin_logging_version")
-    implementation("com.natpryce:konfig:$konfig_version")
-    implementation("com.github.navikt:brukernotifikasjon-schemas:$brukernotifikasjon_schemas_version")
-    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.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version")
-    implementation(ktor("jackson"))
+    implementation("com.natpryce:konfig:1.6.10.0")
+    implementation("org.influxdb:influxdb-java:2.22")
+    implementation("com.github.navikt:rapids-and-rivers:2022.05.11-08.56.814d601f572e") {
+        exclude(group = "ch.qos.logback")
+    }
+
+    // Logging
+    implementation("io.github.microutils:kotlin-logging:2.1.21")
+    runtimeOnly("ch.qos.logback:logback-classic:1.2.11")
+    runtimeOnly("net.logstash.logback:logstash-logback-encoder:7.1.1")
+
+    // Jackson
+    val jacksonVersion = "2.13.3"
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
+
+    // Ktor
+    val ktorVersion = "2.0.1"
+    implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
+    implementation("io.ktor:ktor-serialization-jackson:$ktorVersion")
+
+    // Testing
+    testImplementation(kotlin("test"))
 }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = "17"
 }
 
-val fatJar = task("fatJar", type = org.gradle.jvm.tasks.Jar::class) {
-    archiveBaseName.set("${project.name}-fat")
+tasks.withType<Jar> {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes["Main-Class"] = "no.nav.hjelpemidler.ApplicationKt"
     }
-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
-    with(tasks.jar.get() as CopySpec)
-}
-
-tasks {
-    "build" {
-        dependsOn(fatJar)
-    }
+    from(
+        configurations.runtimeClasspath.get().map {
+            if (it.isDirectory) it else zipTree(it)
+        }
+    )
 }

gradle.properties

@@ -1,11 +1 @@
-kotlin.code.style=official
-
-rapids_and_rivers_version=2022.04.05-09.40.11a466d7ac70
-kotlin_logging_version=2.1.21
-konfig_version=1.6.10.0
-brukernotifikasjon_schemas_version=1.2021.01.18-11.12-b9c8c40b98d1
-kafka_version=2.8.1
-kafka_avro_version=6.2.2
-influxdb_version=2.22
-# version matches R&R version of Jackson
-jackson_version=2.13.0
+kotlin.code.style = official

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,11 +1,10 @@
 package no.nav.hjelpemidler
 
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
-import io.ktor.application.install
-import io.ktor.features.ContentNegotiation
-import io.ktor.jackson.jackson
-import io.ktor.routing.routing
+import io.ktor.serialization.jackson.jackson
+import io.ktor.server.application.install
+import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.routing.routing
 import mu.KotlinLogging
 import no.nav.helse.rapids_rivers.KafkaConfig
 import no.nav.helse.rapids_rivers.RapidApplication
@@ -49,9 +48,7 @@ fun main() {
     ).withKtorModule {
         install(ContentNegotiation) {
             jackson {
-                jacksonMapperBuilder()
-                    .addModule(JavaTimeModule())
-                    .build()
+                registerModule(JavaTimeModule())
             }
         }
         val context = Context(rapidApp)

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

@@ -4,14 +4,14 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
-import io.ktor.request.header
-import io.ktor.request.receiveText
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.routing.post
+import io.ktor.server.application.ApplicationCall
+import io.ktor.server.application.call
+import io.ktor.server.request.header
+import io.ktor.server.request.receiveText
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.post
 import mu.KotlinLogging
 import no.nav.hjelpemidler.Context
 import no.nav.hjelpemidler.configuration.Configuration
@@ -116,12 +116,16 @@ private suspend fun parseOrdrelinje(context: Context, call: ApplicationCall): Or
 private fun sendUvalidertOrdrelinjeTilRapid(context: Context, ordrelinje: RåOrdrelinje) {
     try {
         logg.info("Publiserer uvalidert ordrelinje med OebsId ${ordrelinje.oebsId} til rapid i miljø ${Configuration.application["APP_PROFILE"]}")
-        context.publish(ordrelinje.fnrBruker, mapperJson.writeValueAsString(UvalidertOrdrelinjeMessage(
-            eventId = UUID.randomUUID(),
-            eventName = "hm-uvalidert-ordrelinje",
-            eventCreated = LocalDateTime.now(),
-            orderLine = ordrelinje,
-        )))
+        context.publish(
+            ordrelinje.fnrBruker, mapperJson.writeValueAsString(
+                UvalidertOrdrelinjeMessage(
+                    eventId = UUID.randomUUID(),
+                    eventName = "hm-uvalidert-ordrelinje",
+                    eventCreated = LocalDateTime.now(),
+                    orderLine = ordrelinje,
+                )
+            )
+        )
         context.metrics.meldingTilRapidSuksess()
     } catch (e: Exception) {
         context.metrics.meldingTilRapidFeilet()

src/main/kotlin/no/nav/hjelpemidler/api/OrdrelinjeAPI.kt

@@ -3,14 +3,14 @@ package no.nav.hjelpemidler.api
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import io.ktor.application.call
+import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
 import io.ktor.http.HttpStatusCode
-import io.ktor.request.header
-import io.ktor.request.receive
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.routing.post
+import io.ktor.server.application.call
+import io.ktor.server.request.header
+import io.ktor.server.request.receive
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.post
 import mu.KotlinLogging
 import no.nav.hjelpemidler.Context
 import no.nav.hjelpemidler.configuration.Configuration
@@ -20,7 +20,7 @@ import java.util.UUID
 
 private val logg = KotlinLogging.logger {}
 private val sikkerlogg = KotlinLogging.logger("tjenestekall")
-private val mapperJson = jacksonObjectMapper().registerModule(JavaTimeModule())
+private val mapperJson = jacksonMapperBuilder().addModule(JavaTimeModule()).build()
 
 internal fun Route.serviceforespørselAPI(context: Context) {
     post("/sf") {
@@ -84,8 +84,8 @@ private fun publiserMelding(
     try {
         logg.info(
             "Publiserer oppdatering for SF fra OEBS med id ${serviceForespørselEndring.id}, " +
-                "sfNummer: ${serviceForespørselEndring.sfnummer}, saknr: ${serviceForespørselEndring.saknummer}" +
-                "status: ${serviceForespørselEndring.status}, ordre: ${serviceForespørselEndring.ordre}"
+                    "sfNummer: ${serviceForespørselEndring.sfnummer}, saknr: ${serviceForespørselEndring.saknummer}" +
+                    "status: ${serviceForespørselEndring.status}, ordre: ${serviceForespørselEndring.ordre}"
         )
         context.publish(
             serviceForespørselEndring.saknummer,