JsonNullableSerializer støtter nå root values

Author: di0nys1us

README.md

@@ -23,6 +23,13 @@ Samling av fellesbiblioteker for DigiHoT.
 
 Nye versjoner av alle biblioteker publiseres ved push til main.
 
+## Migrering fra Jackson 2 til 3
+
+1. Endre alle importer fra `com.fasterxml.jackson.*` til `tools.jackson.*`, bortsett fra
+   `com.fasterxml.jackson.annotation.*`.
+2. Fjern bruk av `JavaTimeModule`, den er nå med som default siden Jackson 3.0 krever JDK >= 17.
+3. TODO
+
 ## Oracle
 
 ```bash

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

@@ -9,6 +9,7 @@ import no.nav.hjelpemidler.domain.person.Fødselsnummer
 import no.nav.hjelpemidler.domain.person.år
 import no.nav.hjelpemidler.serialization.jackson.jsonToValue
 import no.nav.hjelpemidler.serialization.jackson.valueToJson
+import no.nav.hjelpemidler.text.doubleQuoted
 import java.util.UUID
 import kotlin.test.Test
 
@@ -56,6 +57,13 @@ class JsonNullableJacksonTest {
         valueToJson(request) shouldBe json
     }
 
+    @Test
+    fun `Root value`() {
+        valueToJson(JsonNullable.Undefined) shouldBe "null"
+        valueToJson(JsonNullable.Null) shouldBe "null"
+        valueToJson(JsonNullable.of("test")) shouldBe "test".doubleQuoted()
+    }
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     data class TestRequest(
         val id: JsonNullable<UUID>,

core/src/main/kotlin/no/nav/hjelpemidler/domain/kodeverk/KodeverkJackson.kt

@@ -10,35 +10,35 @@ import tools.jackson.databind.exc.InvalidFormatException
 import tools.jackson.databind.type.LogicalType
 
 internal class KodeverkDeserializer : StdScalarDeserializer<Kodeverk<*>> {
-    private val valueType: JavaType?
-    private val valueDeserializer: ValueDeserializer<*>?
+    private val enumType: JavaType?
+    private val enumDeserializer: ValueDeserializer<*>?
 
     constructor() : super(Kodeverk::class.java) {
-        this.valueType = null
-        this.valueDeserializer = null
+        this.enumType = null
+        this.enumDeserializer = null
     }
 
     constructor(
         source: KodeverkDeserializer,
-        valueType: JavaType,
-        valueDeserializer: ValueDeserializer<*>,
+        enumType: JavaType,
+        enumDeserializer: ValueDeserializer<*>,
     ) : super(source) {
-        this.valueType = valueType
-        this.valueDeserializer = valueDeserializer
+        this.enumType = enumType
+        this.enumDeserializer = enumDeserializer
     }
 
     override fun createContextual(context: DeserializationContext, property: BeanProperty?): ValueDeserializer<*> {
-        val type = property?.type ?: context.contextualType
-        val valueType = type.containedTypeOrUnknown(0)
-        val valueDeserializer = context.findContextualValueDeserializer(valueType, null)
-        if (valueType == this.valueType && valueDeserializer == this.valueDeserializer) return this
-        return KodeverkDeserializer(this, valueType, valueDeserializer)
+        val parentType = property?.type ?: context.contextualType
+        val enumType = parentType.containedTypeOrUnknown(0)
+        val enumDeserializer = context.findContextualValueDeserializer(enumType, property)
+        if (enumType == this.enumType && enumDeserializer == this.enumDeserializer) return this
+        return KodeverkDeserializer(this, enumType, enumDeserializer)
     }
 
     override fun deserialize(parser: JsonParser, context: DeserializationContext): Kodeverk<*> {
-        checkNotNull(valueDeserializer)
+        checkNotNull(enumDeserializer)
         return try {
-            valueDeserializer.deserialize(parser, context) as Kodeverk<*>
+            enumDeserializer.deserialize(parser, context) as Kodeverk<*>
         } catch (e: InvalidFormatException) {
             UkjentKode(e.value.toString())
         }

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

@@ -10,39 +10,55 @@ import tools.jackson.databind.ValueDeserializer
 import tools.jackson.databind.ValueSerializer
 import tools.jackson.databind.deser.std.StdDeserializer
 import tools.jackson.databind.ser.std.StdSerializer
+import java.math.BigDecimal
+import java.math.BigInteger
 
 internal class JsonNullableSerializer : StdSerializer<JsonNullable<*>> {
-    private val valueType: JavaType?
-    private val valueSerializer: ValueSerializer<Any?>?
+    private val childType: JavaType?
+    private val childSerializer: ValueSerializer<Any?>?
 
     constructor() : super(JsonNullable::class.java) {
-        this.valueType = null
-        this.valueSerializer = null
+        this.childType = null
+        this.childSerializer = null
     }
 
     constructor(
         source: JsonNullableSerializer,
-        valueType: JavaType,
-        valueSerializer: ValueSerializer<Any?>,
+        childType: JavaType,
+        childSerializer: ValueSerializer<Any?>,
     ) : super(source) {
-        this.valueType = valueType
-        this.valueSerializer = valueSerializer
+        this.childType = childType
+        this.childSerializer = childSerializer
     }
 
     override fun createContextual(context: SerializationContext, property: BeanProperty?): ValueSerializer<*> {
-        val type = property?.type ?: TODO()
-        val valueType = type.containedTypeOrUnknown(0)
-        val valueSerializer = context.findValueSerializer(valueType)
-        if (valueType == this.valueType && valueSerializer == this.valueSerializer) return this
-        return JsonNullableSerializer(this, valueType, valueSerializer)
+        val parentType = property?.type ?: return this
+        val childType = parentType.containedTypeOrUnknown(0)
+        val childSerializer = context.findValueSerializer(childType)
+        if (childType == this.childType && childSerializer == this.childSerializer) return this
+        return JsonNullableSerializer(this, childType, childSerializer)
     }
 
     override fun serialize(value: JsonNullable<Any?>, generator: JsonGenerator, context: SerializationContext) {
         if (value !is JsonNullable.Present || value.value == null) {
             generator.writeNull()
+        } else if (childSerializer == null) {
+            when (value.value) {
+                is Boolean -> generator.writeBoolean(value.value)
+
+                is String -> generator.writeString(value.value)
+
+                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)
+
+                else -> generator.writePOJO(value.value)
+            }
         } else {
-            checkNotNull(valueSerializer)
-            valueSerializer.serialize(value.value, generator, context)
+            childSerializer.serialize(value.value, generator, context)
         }
     }
 
@@ -51,34 +67,34 @@ internal class JsonNullableSerializer : StdSerializer<JsonNullable<*>> {
 }
 
 internal class JsonNullableDeserializer : StdDeserializer<JsonNullable<*>> {
-    private val valueType: JavaType?
-    private val valueDeserializer: ValueDeserializer<*>?
+    private val childType: JavaType?
+    private val childDeserializer: ValueDeserializer<*>?
 
     constructor() : super(JsonNullable::class.java) {
-        this.valueType = null
-        this.valueDeserializer = null
+        this.childType = null
+        this.childDeserializer = null
     }
 
     constructor(
         source: JsonNullableDeserializer,
-        valueType: JavaType,
-        valueDeserializer: ValueDeserializer<*>,
+        childType: JavaType,
+        childDeserializer: ValueDeserializer<*>,
     ) : super(source) {
-        this.valueType = valueType
-        this.valueDeserializer = valueDeserializer
+        this.childType = childType
+        this.childDeserializer = childDeserializer
     }
 
     override fun createContextual(context: DeserializationContext, property: BeanProperty?): ValueDeserializer<*> {
-        val type = property?.type ?: context.contextualType
-        val valueType = type.containedTypeOrUnknown(0)
-        val valueDeserializer = context.findContextualValueDeserializer(valueType, null)
-        if (valueType == this.valueType && valueDeserializer == this.valueDeserializer) return this
-        return JsonNullableDeserializer(this, valueType, valueDeserializer)
+        val parentType = property?.type ?: context.contextualType
+        val childType = parentType.containedTypeOrUnknown(0)
+        val childDeserializer = context.findContextualValueDeserializer(childType, property)
+        if (childType == this.childType && childDeserializer == this.childDeserializer) return this
+        return JsonNullableDeserializer(this, childType, childDeserializer)
     }
 
     override fun deserialize(parser: JsonParser, context: DeserializationContext): JsonNullable<*> {
-        checkNotNull(valueDeserializer)
-        val value = valueDeserializer.deserialize(parser, context)
+        checkNotNull(childDeserializer)
+        val value = childDeserializer.deserialize(parser, context)
         return JsonNullable.Present(value)
     }
 

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ confluent = "8.2.0"
 contractPdlAvro = "1.0.3"
 cyclonedx = "3.2.0"
 ehcache = "3.11.1"
-flyway = "12.0.3"
+flyway = "12.1.0"
 graphql = "9.0.0"
 graphql-java = "25.0"
 h2 = "2.4.240"
@@ -30,7 +30,7 @@ jsoup = "1.22.1"
 junit = "6.0.3"
 kafka = "4.2.0"
 konfig = "1.6.10.0"
-kotest = "6.1.4"
+kotest = "6.1.5"
 kotest-ktor = "2.0.0"
 kotlin = "2.3.10"
 kotlin-logging = "8.0.01"
@@ -43,7 +43,7 @@ lettuce = "7.5.0.RELEASE"
 logback = "1.5.32"
 logback-logstash = "9.0"
 logback-syslog4j = "1.0.0"
-micrometer = "1.16.3"
+micrometer = "1.16.4"
 microprofile = "4.1.1"
 mockk = "1.14.9"
 mustache = "0.9.14"