Skip to content

Commit 058b816

Browse files
committed
bruker funksjon fra hotlibs/serialization jsonToValue
1 parent 5805eec commit 058b816

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ package no.nav.hjelpemidler.oebs.listener
22

33
import com.fasterxml.jackson.databind.MapperFeature
44
import com.fasterxml.jackson.databind.ObjectMapper
5-
import com.fasterxml.jackson.module.kotlin.readValue
65
import no.nav.hjelpemidler.serialization.jackson.JacksonObjectMapperProvider
76
import no.nav.hjelpemidler.serialization.jackson.defaultJsonMapper
8-
import no.nav.hjelpemidler.serialization.jackson.jsonMapper
97
import no.nav.hjelpemidler.service.LoadOrder
10-
import org.intellij.lang.annotations.Language
118

129
/**
1310
* Sikrer at vi bruker samme [ObjectMapper] i hotlibs og i hm-oebs-listener.
@@ -19,7 +16,3 @@ class ApplicationJacksonObjectMapperProvider : JacksonObjectMapperProvider {
1916
enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
2017
}
2118
}
22-
23-
inline fun <reified T> jsonToValue(
24-
@Language("JSON") content: String,
25-
) = jsonMapper.readValue<T>(content)

src/test/kotlin/no/nav/hjelpemidler/oebs/listener/api/OrdrelinjeAPITest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import io.ktor.client.request.setBody
77
import io.ktor.http.ContentType
88
import io.ktor.http.HttpStatusCode
99
import io.ktor.http.contentType
10-
import no.nav.hjelpemidler.oebs.listener.jsonToValue
1110
import no.nav.hjelpemidler.oebs.listener.model.OrdrelinjeOebs
1211
import no.nav.hjelpemidler.oebs.listener.test.Fixtures
1312
import no.nav.hjelpemidler.oebs.listener.test.OrdrelinjeOebsJsonBuilder
@@ -16,6 +15,7 @@ import no.nav.hjelpemidler.oebs.listener.test.runTest
1615
import no.nav.hjelpemidler.oebs.listener.test.shouldContainRecord
1716
import no.nav.hjelpemidler.oebs.listener.test.shouldNotContainRecord
1817
import no.nav.hjelpemidler.oebs.listener.test.validToken
18+
import no.nav.hjelpemidler.serialization.jackson.jsonToValue
1919
import java.time.LocalDate
2020
import kotlin.test.Test
2121

src/test/kotlin/no/nav/hjelpemidler/oebs/listener/model/OrdrelinjeOebsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package no.nav.hjelpemidler.oebs.listener.model
22

33
import io.kotest.matchers.shouldBe
4-
import no.nav.hjelpemidler.oebs.listener.jsonToValue
54
import no.nav.hjelpemidler.oebs.listener.test.Fixtures
65
import no.nav.hjelpemidler.oebs.listener.test.OrdrelinjeOebsJsonBuilder
6+
import no.nav.hjelpemidler.serialization.jackson.jsonToValue
77
import java.time.LocalDate
88
import kotlin.test.Test
99

src/test/kotlin/no/nav/hjelpemidler/oebs/listener/test/ProducerRecordExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import io.kotest.inspectors.shouldForOne
55
import io.kotest.matchers.collections.shouldNotContain
66
import io.kotest.matchers.should
77
import io.kotest.matchers.shouldBe
8-
import no.nav.hjelpemidler.oebs.listener.jsonToValue
8+
import no.nav.hjelpemidler.serialization.jackson.jsonToValue
99
import org.apache.kafka.clients.producer.ProducerRecord
1010

1111
fun List<ProducerRecord<String, String>>.shouldContainRecord(

0 commit comments

Comments
 (0)