From af3a748f08dee303c9224b4c26378067d4c1e26a Mon Sep 17 00:00:00 2001
From: Mads Opheim <mads.opheim@nav.no>
Date: Tue, 25 Jul 2023 18:19:17 +0200
Subject: [PATCH] =?UTF-8?q?Httpclient=20bruker=20ein=20objectmapper=20som?=
 =?UTF-8?q?=20blir=20initialisert=20p=C3=A5=20ApplicationBuilder-niv=C3=A5?=
 =?UTF-8?q?,=20s=C3=A5=20m=C3=A5=20konfigurere=20der?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/kotlin/no/nav/etterlatte/ApplicationBuilder.kt   | 8 +++++++-
 .../no/nav/etterlatte/brev/brevbaker/BrevbakerKlient.kt   | 5 -----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/ApplicationBuilder.kt b/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/ApplicationBuilder.kt
index 0647b846992..616568aa796 100644
--- a/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/ApplicationBuilder.kt
+++ b/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/ApplicationBuilder.kt
@@ -20,6 +20,8 @@ import no.nav.etterlatte.brev.behandling.SakOgBehandlingService
 import no.nav.etterlatte.brev.behandlingklient.BehandlingKlient
 import no.nav.etterlatte.brev.beregning.BeregningKlient
 import no.nav.etterlatte.brev.brevRoute
+import no.nav.etterlatte.brev.brevbaker.BrevbakerJSONBlockMixIn
+import no.nav.etterlatte.brev.brevbaker.BrevbakerJSONParagraphMixIn
 import no.nav.etterlatte.brev.brevbaker.BrevbakerKlient
 import no.nav.etterlatte.brev.db.BrevRepository
 import no.nav.etterlatte.brev.distribusjon.DistribusjonKlient
@@ -46,6 +48,7 @@ import no.nav.etterlatte.rivers.VedtaksbrevUnderkjent
 import no.nav.etterlatte.security.ktor.clientCredential
 import no.nav.helse.rapids_rivers.RapidApplication
 import no.nav.helse.rapids_rivers.RapidsConnection
+import no.nav.pensjon.brevbaker.api.model.RenderedJsonLetter
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import rapidsandrivers.getRapidEnv
@@ -154,7 +157,10 @@ class ApplicationBuilder {
     private fun httpClient(scope: String? = null, forventStatusSuccess: Boolean = true) = HttpClient(OkHttp) {
         expectSuccess = forventStatusSuccess
         install(ContentNegotiation) {
-            jackson()
+            jackson() {
+                addMixIn(RenderedJsonLetter.Block::class.java, BrevbakerJSONBlockMixIn::class.java)
+                addMixIn(RenderedJsonLetter.ParagraphContent::class.java, BrevbakerJSONParagraphMixIn::class.java)
+            }
         }
         if (scope != null) {
             install(Auth) {
diff --git a/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/brev/brevbaker/BrevbakerKlient.kt b/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/brev/brevbaker/BrevbakerKlient.kt
index f4a6ee2c1b0..40cc8174576 100644
--- a/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/brev/brevbaker/BrevbakerKlient.kt
+++ b/apps/etterlatte-brev-api/src/main/kotlin/no/nav/etterlatte/brev/brevbaker/BrevbakerKlient.kt
@@ -21,11 +21,6 @@ import kotlin.time.measureTimedValue
 class BrevbakerKlient(private val client: HttpClient, private val apiUrl: String) {
     private val logger = LoggerFactory.getLogger(BrevbakerKlient::class.java)
 
-    init {
-        objectMapper.addMixIn(RenderedJsonLetter.Block::class.java, BrevbakerJSONBlockMixIn::class.java)
-        objectMapper.addMixIn(RenderedJsonLetter.ParagraphContent::class.java, BrevbakerJSONParagraphMixIn::class.java)
-    }
-
     @OptIn(ExperimentalTime::class)
     suspend fun genererPdf(brevRequest: BrevbakerRequest): BrevbakerPdfResponse = try {
         measureTimedValue {