oppdatert til hotlibs med ktor 3.0

Author: di0nys1us

Dockerfile

@@ -1,5 +1,6 @@
 FROM gcr.io/distroless/java21-debian12:nonroot
-COPY build/libs/hm-oebs-listener-all.jar /app.jar
+WORKDIR /app
+COPY build/libs/hm-oebs-listener-all.jar app.jar
 ENV TZ="Europe/Oslo"
 EXPOSE 8080
-CMD ["/app.jar"]
+CMD ["./app.jar"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -15,7 +15,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("no.nav.hjelpemidler:katalog:24.316.142137")
+            from("no.nav.hjelpemidler:katalog:24.353.162413")
         }
     }
 }

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

@@ -6,7 +6,6 @@ import io.ktor.serialization.jackson.JacksonConverter
 import io.ktor.server.application.Application
 import io.ktor.server.application.ApplicationStarted
 import io.ktor.server.application.ApplicationStopped
-import io.ktor.server.application.call
 import io.ktor.server.application.install
 import io.ktor.server.auth.Authentication
 import io.ktor.server.auth.UserIdPrincipal
@@ -15,7 +14,7 @@ import io.ktor.server.auth.bearer
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.metrics.micrometer.MicrometerMetrics
 import io.ktor.server.netty.Netty
-import io.ktor.server.plugins.callloging.CallLogging
+import io.ktor.server.plugins.calllogging.CallLogging
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.path
 import io.ktor.server.response.respond
@@ -25,6 +24,7 @@ import no.nav.hjelpemidler.kafka.createKafkaProducer
 import no.nav.hjelpemidler.oebs.listener.api.ordreAPI
 import no.nav.hjelpemidler.oebs.listener.api.ordrelinjeAPI
 import no.nav.hjelpemidler.oebs.listener.api.serviceforespørselAPI
+import no.nav.hjelpemidler.serialization.jackson.jsonMapper
 import org.apache.kafka.clients.producer.Producer
 import org.slf4j.event.Level
 
@@ -64,11 +64,11 @@ fun Application.module(producer: Producer<String, String> = createKafkaProducer(
     }
 
     val context = Context(producer)
-    environment.monitor.subscribe(ApplicationStopped) { application ->
+    monitor.subscribe(ApplicationStopped) { application ->
         context.close()
         application.environment.log.info("Applikasjonen har stoppet")
-        application.environment.monitor.unsubscribe(ApplicationStarted) {}
-        application.environment.monitor.unsubscribe(ApplicationStopped) {}
+        application.monitor.unsubscribe(ApplicationStarted) {}
+        application.monitor.unsubscribe(ApplicationStopped) {}
     }
 
     routing {

src/main/kotlin/no/nav/hjelpemidler/oebs/listener/Context.kt

@@ -3,6 +3,7 @@ package no.nav.hjelpemidler.oebs.listener
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import no.nav.hjelpemidler.kafka.sendAsync
+import no.nav.hjelpemidler.serialization.jackson.jsonMapper
 import org.apache.kafka.clients.producer.Producer
 import org.apache.kafka.clients.producer.ProducerRecord
 import java.io.Closeable

src/main/kotlin/no/nav/hjelpemidler/oebs/listener/Serialization.kt

@@ -1,12 +1,24 @@
 package no.nav.hjelpemidler.oebs.listener
 
 import com.fasterxml.jackson.databind.MapperFeature
-import com.fasterxml.jackson.databind.json.JsonMapper
+import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import no.nav.hjelpemidler.serialization.defaultJsonMapper
+import no.nav.hjelpemidler.serialization.jackson.JacksonObjectMapperProvider
+import no.nav.hjelpemidler.serialization.jackson.defaultJsonMapper
+import no.nav.hjelpemidler.serialization.jackson.jsonMapper
+import no.nav.hjelpemidler.service.LoadOrder
 import org.intellij.lang.annotations.Language
 
-val jsonMapper: JsonMapper = defaultJsonMapper { enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS) }
+/**
+ * Sikrer at vi bruker samme [ObjectMapper] i hotlibs og i hm-oebs-listener.
+ */
+@LoadOrder(0)
+class ApplicationJacksonObjectMapperProvider : JacksonObjectMapperProvider {
+    override fun invoke(): ObjectMapper =
+        defaultJsonMapper {
+            enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
+        }
+}
 
 inline fun <reified T> jsonToValue(
     @Language("JSON") content: String,

src/main/kotlin/no/nav/hjelpemidler/oebs/listener/api/OrdreAPI.kt

@@ -3,13 +3,11 @@ package no.nav.hjelpemidler.oebs.listener.api
 import com.fasterxml.jackson.annotation.JsonIgnore
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
 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 no.nav.hjelpemidler.configuration.Environment
-import no.nav.hjelpemidler.domain.id.UUID
 import no.nav.hjelpemidler.oebs.listener.Configuration
 import no.nav.hjelpemidler.oebs.listener.Context
 import no.nav.hjelpemidler.oebs.listener.Metrics
@@ -132,23 +130,23 @@ data class Ordrefeilmelding(
 
 class OrdrekvitteringMottatt(
     val kvittering: Ordrekvittering,
-    override val eventId: UUID = UUID(),
+    override val eventId: UUID = UUID.randomUUID(),
     override val opprettet: LocalDateTime = LocalDateTime.now(),
 ) : Message {
     override val eventName: String = "hm-ordrekvittering-mottatt"
 }
 
 class OrdrekvitteringDelbestillingMottatt(
     val kvittering: Ordrekvittering,
-    override val eventId: UUID = UUID(),
+    override val eventId: UUID = UUID.randomUUID(),
     override val opprettet: LocalDateTime = LocalDateTime.now(),
 ) : Message {
     override val eventName: String = "hm-ordrekvittering-delbestilling-mottatt"
 }
 
 class OrdrefeilmeldingMottatt(
     val feilmelding: Ordrefeilmelding,
-    override val eventId: UUID = UUID(),
+    override val eventId: UUID = UUID.randomUUID(),
     override val opprettet: LocalDateTime = LocalDateTime.now(),
 ) : Message {
     override val eventName: String = "hm-ordrefeilmelding-mottatt"

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

@@ -3,7 +3,6 @@ package no.nav.hjelpemidler.oebs.listener.api
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.oshai.kotlinlogging.withLoggingContext
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
 import io.ktor.server.routing.Route
@@ -12,13 +11,13 @@ import no.nav.hjelpemidler.configuration.Environment
 import no.nav.hjelpemidler.logging.secureLog
 import no.nav.hjelpemidler.oebs.listener.Context
 import no.nav.hjelpemidler.oebs.listener.Slack
-import no.nav.hjelpemidler.oebs.listener.jsonMapper
 import no.nav.hjelpemidler.oebs.listener.model.HotsakOrdrelinjeMessage
 import no.nav.hjelpemidler.oebs.listener.model.InfotrygdOrdrelinjeMessage
 import no.nav.hjelpemidler.oebs.listener.model.OrdrelinjeMessage
 import no.nav.hjelpemidler.oebs.listener.model.OrdrelinjeOebs
 import no.nav.hjelpemidler.oebs.listener.model.RåOrdrelinje
 import no.nav.hjelpemidler.oebs.listener.model.UvalidertOrdrelinjeMessage
+import no.nav.hjelpemidler.serialization.jackson.jsonMapper
 
 private val log = KotlinLogging.logger {}
 

src/main/kotlin/no/nav/hjelpemidler/oebs/listener/model/OrdrelinjeMessage.kt

@@ -1,7 +1,6 @@
 package no.nav.hjelpemidler.oebs.listener.model
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import no.nav.hjelpemidler.domain.id.UUID
 import java.time.LocalDateTime
 import java.util.UUID
 
@@ -13,7 +12,7 @@ interface OrdrelinjeMessage<T : Ordrelinje> : Message {
 data class HotsakOrdrelinjeMessage(
     override val fnrBruker: String,
     override val data: HotsakOrdrelinje,
-    override val eventId: UUID = UUID(),
+    override val eventId: UUID = UUID.randomUUID(),
     override val opprettet: LocalDateTime = LocalDateTime.now(),
 ) : OrdrelinjeMessage<HotsakOrdrelinje> {
     override val eventName: String = "hm-NyOrdrelinje-hotsak"
@@ -24,7 +23,7 @@ data class HotsakOrdrelinjeMessage(
 data class InfotrygdOrdrelinjeMessage(
     override val fnrBruker: String,
     override val data: InfotrygdOrdrelinje,
-    override val eventId: UUID = UUID(),
+    override val eventId: UUID = UUID.randomUUID(),
     override val opprettet: LocalDateTime = LocalDateTime.now(),
 ) : OrdrelinjeMessage<InfotrygdOrdrelinje> {
     override val eventName: String = "hm-NyOrdrelinje"
@@ -35,7 +34,7 @@ data class InfotrygdOrdrelinjeMessage(
 class UvalidertOrdrelinjeMessage(
     @JsonProperty("orderLine")
     val data: RåOrdrelinje,
-    override val eventId: UUID = UUID(),
+    override val eventId: UUID = UUID.randomUUID(),
     override val opprettet: LocalDateTime = LocalDateTime.now(),
 ) : Message {
     override val eventName: String = "hm-uvalidert-ordrelinje"

src/main/kotlin/no/nav/hjelpemidler/oebs/listener/model/ServiceforespørselEndringMessage.kt

@@ -1,13 +1,12 @@
 package no.nav.hjelpemidler.oebs.listener.model
 
-import no.nav.hjelpemidler.domain.id.UUID
 import no.nav.hjelpemidler.oebs.listener.api.ServiceforespørselEndring
 import java.time.LocalDateTime
 import java.util.UUID
 
 data class ServiceforespørselEndringMessage(
     val data: ServiceforespørselEndring,
-    override val eventId: UUID = UUID(),
+    override val eventId: UUID = UUID.randomUUID(),
     override val opprettet: LocalDateTime = LocalDateTime.now(),
 ) : Message {
     override val eventName: String = "hm-EndretSF-oebs-v2"