JsonNullable asOptional etc.

Author: di0nys1us

core/src/jacksonTest/kotlin/no/nav/hjelpemidler/domain/serialization/JsonNullableJacksonTest.kt

@@ -5,6 +5,12 @@ import io.kotest.assertions.assertSoftly
 import io.kotest.matchers.shouldBe
 import no.nav.hjelpemidler.domain.enhet.Enhet
 import no.nav.hjelpemidler.domain.enhet.Enhetsnummer
+import no.nav.hjelpemidler.domain.id.numberId
+import no.nav.hjelpemidler.domain.id.numberIdJsonString
+import no.nav.hjelpemidler.domain.id.stringId
+import no.nav.hjelpemidler.domain.id.stringIdJsonString
+import no.nav.hjelpemidler.domain.id.uuidId
+import no.nav.hjelpemidler.domain.id.uuidIdJsonString
 import no.nav.hjelpemidler.domain.person.Fødselsnummer
 import no.nav.hjelpemidler.domain.person.år
 import no.nav.hjelpemidler.serialization.jackson.jsonToValue
@@ -62,6 +68,10 @@ class JsonNullableJacksonTest {
         valueToJson(JsonNullable.Undefined) shouldBe "null"
         valueToJson(JsonNullable.Null) shouldBe "null"
         valueToJson(JsonNullable.of("test")) shouldBe "test".doubleQuoted()
+
+        valueToJson(JsonNullable.of(numberId)) shouldBe numberIdJsonString
+        valueToJson(JsonNullable.of(stringId)) shouldBe stringIdJsonString
+        valueToJson(JsonNullable.of(uuidId)) shouldBe uuidIdJsonString
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

core/src/main/kotlin/no/nav/hjelpemidler/domain/serialization/JsonNullable.kt

@@ -1,5 +1,7 @@
 package no.nav.hjelpemidler.domain.serialization
 
+import java.util.Optional
+
 sealed interface JsonNullable<out T> {
     data object Undefined : JsonNullable<Nothing>
 
@@ -13,3 +15,9 @@ sealed interface JsonNullable<out T> {
         fun <T> of(value: T?): JsonNullable<T> = Present(value)
     }
 }
+
+fun <T> JsonNullable<T>?.asOptional(): Optional<T & Any> = if (this is JsonNullable.Present) {
+    Optional.ofNullable<T>(value)
+} else {
+    Optional.empty<T>()
+}

core/src/main/kotlin/no/nav/hjelpemidler/domain/serialization/JsonNullableJackson.kt

@@ -1,5 +1,6 @@
 package no.nav.hjelpemidler.domain.serialization
 
+import no.nav.hjelpemidler.domain.id.Id
 import tools.jackson.core.JsonGenerator
 import tools.jackson.core.JsonParser
 import tools.jackson.databind.BeanProperty
@@ -43,19 +44,21 @@ internal class JsonNullableSerializer : StdSerializer<JsonNullable<*>> {
         if (value !is JsonNullable.Present || value.value == null) {
             generator.writeNull()
         } else if (childSerializer == null) {
-            when (value.value) {
-                is Boolean -> generator.writeBoolean(value.value)
+            when (val v = value.value) {
+                is Boolean -> generator.writeBoolean(v)
 
-                is String -> generator.writeString(value.value)
+                is String -> generator.writeString(v)
 
-                is Int -> generator.writeNumber(value.value)
-                is Long -> generator.writeNumber(value.value)
-                is Float -> generator.writeNumber(value.value)
-                is Double -> generator.writeNumber(value.value)
-                is BigInteger -> generator.writeNumber(value.value)
-                is BigDecimal -> generator.writeNumber(value.value)
+                is Int -> generator.writeNumber(v)
+                is Long -> generator.writeNumber(v)
+                is Float -> generator.writeNumber(v)
+                is Double -> generator.writeNumber(v)
+                is BigInteger -> generator.writeNumber(v)
+                is BigDecimal -> generator.writeNumber(v)
 
-                else -> generator.writePOJO(value.value)
+                is Id<*> -> generator.writeString(v.toString())
+
+                else -> generator.writePOJO(v)
             }
         } else {
             childSerializer.serialize(value.value, generator, context)

database/src/main/kotlin/no/nav/hjelpemidler/database/QueryParameters.kt

@@ -1,6 +1,11 @@
 package no.nav.hjelpemidler.database
 
 import no.nav.hjelpemidler.domain.ValueType
+import no.nav.hjelpemidler.domain.kodeverk.Kodeverk
+import no.nav.hjelpemidler.domain.serialization.JsonNullable
+import no.nav.hjelpemidler.domain.serialization.asOptional
+import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 interface QueryParameter<out T> {
     val queryParameter: T
@@ -32,9 +37,12 @@ internal fun QueryParameters.prepare(): QueryParameters = mapValues { (_, value)
     when (value) {
         is String -> value // String er også CharSequence
         is CharSequence -> value.toString()
-        is Enum<*> -> value.name
+        is JsonNullable<*> -> value.asOptional().getOrNull()
+        is Optional<*> -> value.getOrNull()
         is QueryParameter<*> -> value.queryParameter
         is ValueType<*> -> value.value
+        is Kodeverk<*> -> value.name
+        is Enum<*> -> value.name
         else -> value
     }
 }