bedre feilmeldinger i serder for Kodeverk og JsonNullable

Author: di0nys1us

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

@@ -1,5 +1,6 @@
 package no.nav.hjelpemidler.domain.kodeverk
 
+import no.nav.hjelpemidler.domain.serialization.error
 import tools.jackson.core.JsonParser
 import tools.jackson.databind.BeanProperty
 import tools.jackson.databind.DeserializationContext
@@ -28,17 +29,18 @@ internal class KodeverkDeserializer : StdScalarDeserializer<Kodeverk<*>> {
     }
 
     override fun createContextual(context: DeserializationContext, property: BeanProperty?): ValueDeserializer<*> {
-        val parentType = property?.type ?: context.contextualType
-        val enumType = parentType.containedTypeOrUnknown(0)
+        val parentType = property?.type ?: context.contextualType ?: context.error("Could not determine parent type")
+        val enumType = parentType.containedType(0) ?: context.error("Could not determine enum type")
         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(enumDeserializer)
+        val deserializer = enumDeserializer
+            ?: context.error("KodeverkDeserializer used without contextualization (enumDeserializer is null)")
         return try {
-            enumDeserializer.deserialize(parser, context) as Kodeverk<*>
+            deserializer.deserialize(parser, context) as Kodeverk<*>
         } catch (e: InvalidFormatException) {
             UkjentKode(e.value.toString())
         }

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

@@ -0,0 +1,13 @@
+package no.nav.hjelpemidler.domain.serialization
+
+import tools.jackson.databind.DatabindException
+import tools.jackson.databind.DeserializationContext
+import tools.jackson.databind.SerializationContext
+
+internal fun SerializationContext.error(message: String): Nothing {
+    throw DatabindException.from(this, message)
+}
+
+internal fun DeserializationContext.error(message: String): Nothing {
+    throw DatabindException.from(this, message)
+}

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

@@ -34,7 +34,7 @@ internal class JsonNullableSerializer : StdSerializer<JsonNullable<*>> {
 
     override fun createContextual(context: SerializationContext, property: BeanProperty?): ValueSerializer<*> {
         val parentType = property?.type ?: return this
-        val childType = parentType.containedTypeOrUnknown(0)
+        val childType = parentType.containedType(0) ?: context.error("Could not determine child type")
         val childSerializer = context.findValueSerializer(childType)
         if (childType == this.childType && childSerializer == this.childSerializer) return this
         return JsonNullableSerializer(this, childType, childSerializer)
@@ -88,16 +88,17 @@ internal class JsonNullableDeserializer : StdDeserializer<JsonNullable<*>> {
     }
 
     override fun createContextual(context: DeserializationContext, property: BeanProperty?): ValueDeserializer<*> {
-        val parentType = property?.type ?: context.contextualType
-        val childType = parentType.containedTypeOrUnknown(0)
+        val parentType = property?.type ?: context.contextualType ?: context.error("Could not determine parent type")
+        val childType = parentType.containedType(0) ?: context.error("Could not determine child type")
         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(childDeserializer)
-        val value = childDeserializer.deserialize(parser, context)
+        val deserializer = childDeserializer
+            ?: context.error("JsonNullableDeserializer used without contextualization (childDeserializer is null)")
+        val value = deserializer.deserialize(parser, context)
         return JsonNullable.Present(value)
     }
 

gradle/libs.versions.toml

@@ -30,7 +30,7 @@ jsoup = "1.22.1"
 junit = "6.0.3"
 kafka = "4.2.0"
 konfig = "1.6.10.0"
-kotest = "6.1.5"
+kotest = "6.1.6"
 kotest-ktor = "2.0.0"
 kotlin = "2.3.10"
 kotlin-logging = "8.0.01"
@@ -48,7 +48,7 @@ microprofile = "4.1.1"
 mockk = "1.14.9"
 mustache = "0.9.14"
 netty = "4.2.10.Final"
-nocommons = "0.16.0"
+nocommons = "0.17.0"
 openapi = "7.20.0"
 openhtmltopdf = "1.1.37"
 oracle = "23.26.1.0.0"
@@ -60,8 +60,8 @@ redisson = "4.3.0"
 shadow = "8.1.1"
 slf4j = "2.0.17"
 spotless = "8.3.0"
-swagger = "2.2.44"
-swaggerParser = "2.1.38"
+swagger = "2.2.45"
+swaggerParser = "2.1.39"
 tbdLibs = "2026.02.19-20.58-521cdd3c"
 testcontainers = "2.0.3"
 threeten = "1.8.0"