Skip to content

Commit 99be9b8

Browse files
qtipsqtips
authored
Gjenninfore ktor 3 (#582)
* Gjeninnfører "Unngår å deploye til prod for ktor oppdatering"" This reverts commit 1bed6ee. * Gjeninnfører "Dependabot/gradle/gradle 4b984fda07 (#577)"" This reverts commit 5c658bc. * aktiverer deploy til prod fra master
1 parent 3a0bc14 commit 99be9b8

File tree

53 files changed

+109
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+109
-104
lines changed

‎.github/workflows/test-build-deploy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ jobs:
7575
with:
7676
image: ${{ needs.build.outputs.image }}
7777
environment: gcp
78-
deploy-prod: ${{ startsWith(github.ref, 'refs/heads/master') }}
78+
deploy-prod: ${{ startsWith(github.ref, 'refs/heads/master') }}

‎build.gradle.kts

+10-9
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

33
val junitJupiterVersion = "5.11.4"
44
val jsonassertVersion = "1.5.3"
5-
val k9rapidVersion = "1.20240510084839-e7ae05b"
5+
val k9rapidVersion = "1.20250225145424-cc27101"
66
val ulidVersion = "8.3.0"
7-
val ktorVersion = "2.3.13"
8-
val dusseldorfVersion = "5.0.19"
7+
val ktorVersion = "3.1.0"
8+
val dusseldorfVersion = "6.1.1"
99

1010
// Database
11-
val flywayVersion = "11.3.1"
11+
val flywayVersion = "11.3.3"
1212
val hikariVersion = "6.2.1"
1313
val kotliqueryVersion = "1.9.1"
1414
val postgresVersion = "42.7.5"
1515

1616
// Test
17-
val testcontainersVersion = "1.20.4"
17+
val testcontainersVersion = "1.20.5"
1818
val mockkVersion = "1.13.16"
19-
val schemaValidatorVersion = "1.5.5"
20-
val awaitilityVersion = "4.2.2"
19+
val schemaValidatorVersion = "1.5.6"
20+
val awaitilityVersion = "4.3.0"
2121
val assertjVersion = "3.27.3"
2222

2323
val mainClass = "no.nav.omsorgspenger.AppKt"
2424

2525
plugins {
26-
kotlin("jvm") version "2.0.21" //kan ikke gå for 2.1+ pga ktor som har avhengighet til kotlin-stdlib-common, og den er tilsynelatende ikke tilgjengelig i 2.1+
26+
kotlin("jvm") version "2.1.10"
2727
id("com.github.johnrengelman.shadow") version "8.1.1"
2828
id("org.sonarqube") version "6.0.1.5171"
2929
jacoco
@@ -55,7 +55,8 @@ dependencies {
5555
testImplementation("no.nav.k9.rapid:overfore-omsorgsdager:$k9rapidVersion")
5656
testImplementation("no.nav.k9.rapid:overfore-korona-omsorgsdager:$k9rapidVersion")
5757
testImplementation("no.nav.k9.rapid:fordele-omsorgsdager:$k9rapidVersion")
58-
58+
testImplementation("no.nav.k9.rapid:river-test:$k9rapidVersion")
59+
5960
testImplementation("de.huxhorn.sulky:de.huxhorn.sulky.ulid:$ulidVersion")
6061
testImplementation("no.nav.helse:dusseldorf-test-support:$dusseldorfVersion")
6162
testImplementation("com.networknt:json-schema-validator:$schemaValidatorVersion")

‎src/main/kotlin/no/nav/omsorgspenger/App.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ import io.ktor.serialization.jackson.*
88
import io.ktor.server.routing.*
99
import no.nav.helse.dusseldorf.ktor.health.HealthRoute
1010
import no.nav.helse.rapids_rivers.RapidApplication
11-
import no.nav.helse.rapids_rivers.RapidsConnection
1211
import no.nav.omsorgspenger.overføringer.apis.SpleisetOverføringerApi
1312
import no.nav.omsorgspenger.overføringer.rivers.PubliserOverføringAvOmsorgsdager
1413
import no.nav.omsorgspenger.overføringer.rivers.BehandleOverføringAvOmsorgsdager
1514
import no.nav.omsorgspenger.overføringer.rivers.InitierOverføringAvOmsorgsdager
1615
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
16+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
1717
import io.ktor.server.auth.*
1818
import io.ktor.http.*
1919
import io.ktor.server.plugins.callid.*
2020
import io.ktor.server.response.*
21-
import io.ktor.server.plugins.callloging.CallLogging
21+
import io.ktor.server.plugins.calllogging.CallLogging
2222
import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
2323
import io.ktor.server.plugins.statuspages.*
2424
import no.nav.helse.dusseldorf.ktor.auth.*
@@ -38,9 +38,10 @@ import java.time.LocalDate
3838

3939
fun main() {
4040
val applicationContext = ApplicationContext.Builder().build()
41-
RapidApplication.Builder(RapidApplication.RapidApplicationConfig.fromEnv(applicationContext.env))
42-
.withKtorModule { omsorgspengerRammemeldinger(applicationContext) }
43-
.build()
41+
RapidApplication.create(
42+
env = applicationContext.env,
43+
builder = { withKtorModule { omsorgspengerRammemeldinger(applicationContext) } }
44+
)
4445
.apply { registerApplicationContext(applicationContext) }
4546
.start()
4647
}

‎src/main/kotlin/no/nav/omsorgspenger/Typer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package no.nav.omsorgspenger
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
44
import no.nav.k9.rapid.behov.Behovsformat
55
import no.nav.omsorgspenger.behovssekvens.BehovssekvensId
66

‎src/main/kotlin/no/nav/omsorgspenger/behovssekvens/PersistentBehovssekvensPacketListener.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package no.nav.omsorgspenger.behovssekvens
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
44
import no.nav.k9.rapid.river.BehovssekvensPacketListener
55
import org.slf4j.Logger
66

‎src/main/kotlin/no/nav/omsorgspenger/fordelinger/meldinger/FordelingAvOmsorgsdagerMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.fordelinger.meldinger
22

33
import com.fasterxml.jackson.databind.node.ArrayNode
44
import com.fasterxml.jackson.databind.node.ObjectNode
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.omsorgspenger.Identitetsnummer
77
import no.nav.omsorgspenger.JournalpostId
88
import no.nav.omsorgspenger.rivers.HentBehov

‎src/main/kotlin/no/nav/omsorgspenger/fordelinger/meldinger/HentFordelingGirMeldingerMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.fordelinger.meldinger
22

33
import com.fasterxml.jackson.module.kotlin.convertValue
44
import com.fasterxml.jackson.module.kotlin.readValue
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.fordelinger.FordelingGirMelding
88
import no.nav.omsorgspenger.rivers.meldinger.SerDes.JacksonObjectMapper

‎src/main/kotlin/no/nav/omsorgspenger/fordelinger/rivers/InitierFordelingAvOmsorgsdager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.fordelinger.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.RapidsConnection
5-
import no.nav.helse.rapids_rivers.River
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
66
import no.nav.k9.rapid.river.leggTilBehovEtter
77
import no.nav.k9.rapid.river.skalLøseBehov
88
import no.nav.omsorgspenger.behovssekvens.BehovssekvensRepository

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/meldinger/HentKoronaOverføringGirMeldingerMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.koronaoverføringer.meldinger
22

33
import com.fasterxml.jackson.module.kotlin.convertValue
44
import com.fasterxml.jackson.module.kotlin.readValue
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.overføringer.apis.SpleisetOverføringGitt
88
import no.nav.omsorgspenger.rivers.BehovMedLøsning

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/meldinger/OpphøreKoronaOverføringerMelding.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package no.nav.omsorgspenger.koronaoverføringer.meldinger
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.asLocalDate
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
55
import no.nav.omsorgspenger.Saksnummer
66
import no.nav.omsorgspenger.overføringer.db.OpphørOverføringer
77
import no.nav.omsorgspenger.rivers.HentBehov

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/meldinger/OverføreKoronaOmsorgsdagerBehandlingMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode
44
import com.fasterxml.jackson.databind.node.ObjectNode
55
import com.fasterxml.jackson.module.kotlin.convertValue
66
import com.fasterxml.jackson.module.kotlin.readValue
7-
import no.nav.helse.rapids_rivers.JsonMessage
7+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
88
import no.nav.k9.rapid.behov.Behov
99
import no.nav.omsorgspenger.Identitetsnummer
1010
import no.nav.omsorgspenger.Periode

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/meldinger/OverføreKoronaOmsorgsdagerMelding.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.koronaoverføringer.meldinger
22

33
import com.fasterxml.jackson.databind.node.ArrayNode
4-
import no.nav.helse.rapids_rivers.JsonMessage
5-
import no.nav.helse.rapids_rivers.asLocalDate
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
66
import no.nav.omsorgspenger.Identitetsnummer
77
import no.nav.omsorgspenger.JournalpostId
88
import no.nav.omsorgspenger.Periode

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/rivers/BehandleOpphøreKoronaOverføringer.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.koronaoverføringer.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.RapidsConnection
5-
import no.nav.helse.rapids_rivers.River
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
66
import no.nav.k9.rapid.river.skalLøseBehov
77
import no.nav.omsorgspenger.behovssekvens.BehovssekvensRepository
88
import no.nav.omsorgspenger.behovssekvens.PersistentBehovssekvensPacketListener

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/rivers/BehandleOverføreKoronaOmsorgsdager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.koronaoverføringer.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.RapidsConnection
5-
import no.nav.helse.rapids_rivers.River
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
66
import no.nav.k9.rapid.river.*
77
import no.nav.omsorgspenger.behovssekvens.BehovssekvensRepository
88
import no.nav.omsorgspenger.behovssekvens.PersistentBehovssekvensPacketListener

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/rivers/InitierOverføreKoronaOmsorgsdager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package no.nav.omsorgspenger.koronaoverføringer.rivers
22

3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
36
import kotlinx.coroutines.runBlocking
4-
import no.nav.helse.rapids_rivers.JsonMessage
5-
import no.nav.helse.rapids_rivers.RapidsConnection
6-
import no.nav.helse.rapids_rivers.River
77
import no.nav.k9.rapid.river.*
88
import no.nav.omsorgspenger.behovssekvens.BehovssekvensRepository
99
import no.nav.omsorgspenger.behovssekvens.PersistentBehovssekvensPacketListener

‎src/main/kotlin/no/nav/omsorgspenger/koronaoverføringer/rivers/PubliserOverføreKoronaOmsorgsdager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.koronaoverføringer.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.RapidsConnection
5-
import no.nav.helse.rapids_rivers.River
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
66
import no.nav.k9.rapid.river.harLøsningPåBehov
77
import no.nav.k9.rapid.river.leggTilBehovEtter
88
import no.nav.k9.rapid.river.skalLøseBehov

‎src/main/kotlin/no/nav/omsorgspenger/midlertidigalene/meldinger/HentMidlertidigAleneVedtakMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.midlertidigalene.meldinger
22

33
import com.fasterxml.jackson.module.kotlin.convertValue
44
import com.fasterxml.jackson.module.kotlin.readValue
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.midlertidigalene.MidlertidigAleneVedtak
88
import no.nav.omsorgspenger.rivers.meldinger.SerDes.JacksonObjectMapper

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/meldinger/HentOverføringGirMeldingerMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.overføringer.meldinger
22

33
import com.fasterxml.jackson.module.kotlin.convertValue
44
import com.fasterxml.jackson.module.kotlin.readValue
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.overføringer.apis.SpleisetOverføringGitt
88
import no.nav.omsorgspenger.rivers.BehovMedLøsning

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/meldinger/OpphøreOverføringerMelding.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package no.nav.omsorgspenger.overføringer.meldinger
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.asLocalDate
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
55
import no.nav.omsorgspenger.Saksnummer
66
import no.nav.omsorgspenger.overføringer.db.OpphørOverføringer
77
import no.nav.omsorgspenger.rivers.HentBehov

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/meldinger/OverføreOmsorgsdagerBehandlingMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.overføringer.meldinger
22

33
import com.fasterxml.jackson.module.kotlin.convertValue
44
import com.fasterxml.jackson.module.kotlin.readValue
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.Identitetsnummer
88
import no.nav.omsorgspenger.Periode

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/meldinger/OverføreOmsorgsdagerMelding.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.overføringer.meldinger
22

33
import com.fasterxml.jackson.databind.node.ArrayNode
4-
import no.nav.helse.rapids_rivers.JsonMessage
5-
import no.nav.helse.rapids_rivers.asLocalDate
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
66
import no.nav.omsorgspenger.Identitetsnummer
77
import no.nav.omsorgspenger.Periode
88
import no.nav.omsorgspenger.Saksnummer

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/rivers/BehandleOpphøreOverføringer.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.overføringer.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.RapidsConnection
5-
import no.nav.helse.rapids_rivers.River
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
66
import no.nav.k9.rapid.river.skalLøseBehov
77
import no.nav.omsorgspenger.behovssekvens.BehovssekvensRepository
88
import no.nav.omsorgspenger.behovssekvens.PersistentBehovssekvensPacketListener

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/rivers/BehandleOverføringAvOmsorgsdager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.overføringer.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.RapidsConnection
5-
import no.nav.helse.rapids_rivers.River
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
66
import no.nav.k9.rapid.river.*
77
import no.nav.omsorgspenger.behovssekvens.BehovssekvensRepository
88
import no.nav.omsorgspenger.behovssekvens.PersistentBehovssekvensPacketListener

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/rivers/InitierOverføringAvOmsorgsdager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package no.nav.omsorgspenger.overføringer.rivers
22

3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
36
import kotlinx.coroutines.runBlocking
4-
import no.nav.helse.rapids_rivers.JsonMessage
5-
import no.nav.helse.rapids_rivers.RapidsConnection
6-
import no.nav.helse.rapids_rivers.River
77
import no.nav.k9.rapid.river.*
88
import no.nav.omsorgspenger.behovssekvens.BehovssekvensRepository
99
import no.nav.omsorgspenger.behovssekvens.PersistentBehovssekvensPacketListener

‎src/main/kotlin/no/nav/omsorgspenger/overføringer/rivers/PubliserOverføringAvOmsorgsdager.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.omsorgspenger.overføringer.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
4-
import no.nav.helse.rapids_rivers.RapidsConnection
5-
import no.nav.helse.rapids_rivers.River
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.River
5+
import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
66
import no.nav.k9.rapid.river.harLøsningPåBehov
77
import no.nav.k9.rapid.river.leggTilBehovEtter
88
import no.nav.k9.rapid.river.skalLøseBehov

‎src/main/kotlin/no/nav/omsorgspenger/personopplysninger/HentPersonopplysningerMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.personopplysninger
22

33
import com.fasterxml.jackson.databind.JsonNode
44
import com.fasterxml.jackson.databind.node.ObjectNode
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.Identitetsnummer
88
import no.nav.omsorgspenger.rivers.HentLøsning

‎src/main/kotlin/no/nav/omsorgspenger/personopplysninger/VurderRelasjonerMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.personopplysninger
22

33
import com.fasterxml.jackson.databind.node.ArrayNode
44
import com.fasterxml.jackson.databind.node.ObjectNode
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.Identitetsnummer
88
import no.nav.omsorgspenger.rivers.HentLøsning

‎src/main/kotlin/no/nav/omsorgspenger/rivers/Meldingsegenskaper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package no.nav.omsorgspenger.rivers
22

3-
import no.nav.helse.rapids_rivers.JsonMessage
3+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
44
import no.nav.k9.rapid.behov.Behov
55
import no.nav.k9.rapid.river.leggTilLøsning
66

‎src/main/kotlin/no/nav/omsorgspenger/rivers/meldinger/HentOmsorgspengerSaksnummerMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package no.nav.omsorgspenger.rivers.meldinger
22

33
import com.fasterxml.jackson.databind.node.ObjectNode
4-
import no.nav.helse.rapids_rivers.JsonMessage
4+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
55
import no.nav.k9.rapid.behov.Behov
66
import no.nav.omsorgspenger.Identitetsnummer
77
import no.nav.omsorgspenger.Saksnummer

‎src/main/kotlin/no/nav/omsorgspenger/utvidetrett/meldinger/HentUtvidetRettVedtakMelding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.omsorgspenger.utvidetrett.meldinger
22

33
import com.fasterxml.jackson.module.kotlin.convertValue
44
import com.fasterxml.jackson.module.kotlin.readValue
5-
import no.nav.helse.rapids_rivers.JsonMessage
5+
import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
66
import no.nav.k9.rapid.behov.Behov
77
import no.nav.omsorgspenger.rivers.meldinger.SerDes.JacksonObjectMapper
88
import no.nav.omsorgspenger.rivers.BehovMedLøsning

0 commit comments

Comments
 (0)