fix problem with jackson not replacing node

fork-handles · Jan 5, 2024 · d03dc44 · d03dc44
1 parent 62fddf9
commit d03dc44
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 This list is not intended to be all-encompassing - it will document major and breaking API changes with their rationale
 when appropriate:
 
+### v2.12.1.1
+- **data4k** : Fix problem with Jackson not replacing node
+
 ### v2.12.1.0
 - **data4k** : Encapsulate data in `content()` function.
 

diff --git a/data4k/src/main/kotlin/dev/forkhandles/data/DataContainer.kt b/data4k/src/main/kotlin/dev/forkhandles/data/DataContainer.kt
@@ -98,5 +98,5 @@ abstract class DataContainer<CONTENT>(
         DataProperty<DataContainer<CONTENT>, IN>(
             { existsFn(content, it) },
             { getFn(content, it)?.let { value -> value as OUT }?.let(mapInFn) },
-            { name, value -> setFn(content, name, (value as IN?)?.let(mapOutFn)) })
+            { name, value -> setFn(content, name, value?.let(mapOutFn)) })
 }
diff --git a/data4k/src/main/kotlin/dev/forkhandles/data/DataProperty.kt b/data4k/src/main/kotlin/dev/forkhandles/data/DataProperty.kt
@@ -6,8 +6,8 @@ import kotlin.reflect.jvm.jvmErasure
 
 open class DataProperty<IN, OUT : Any?>(
     private val existsFn: IN.(String) -> Boolean,
-    private val getFn: IN.(String) -> Any?,
-    private val setFn: IN.(String, Any?) -> Unit
+    private val getFn: IN.(String) -> OUT?,
+    private val setFn: IN.(String, OUT?) -> Unit
 ) : ReadWriteProperty<IN, OUT> {
     @Suppress("UNCHECKED_CAST")
     override fun getValue(thisRef: IN, property: KProperty<*>): OUT {
@@ -20,7 +20,7 @@ open class DataProperty<IN, OUT : Any?>(
                 else -> throw NoSuchElementException("Field <${property.name}> is missing")
             }
 
-            property.returnType.jvmErasure.isInstance(result) -> result as OUT
+            property.returnType.jvmErasure.isInstance(result) -> result
 
             else -> throw NoSuchElementException("Value for field <${property.name}> is not a ${property.returnType.jvmErasure} but ${result.javaClass.kotlin}")
         }

diff --git a/data4k/src/main/kotlin/dev/forkhandles/data/JsonNodeDataContainer.kt b/data4k/src/main/kotlin/dev/forkhandles/data/JsonNodeDataContainer.kt
@@ -23,9 +23,9 @@ abstract class JsonNodeDataContainer(input: JsonNode) :
     DataContainer<JsonNode>(
         input,
         { content, it -> content.has(it) },
-        { content, it -> content[it]?.let(Companion::nodeToValue) },
+        { content, it -> content[it]?.let(::nodeToValue) },
         { node: JsonNode, name, value ->
-            (node as? ObjectNode)?.also { node.set<JsonNode>(name, value.toNode()) }
+            (node as? ObjectNode)?.also { node.replace(name, value.toNode()) }
                 ?: error("Invalid node type ${input::class.java}")
         }
     ) {
@@ -58,8 +58,9 @@ abstract class JsonNodeDataContainer(input: JsonNode) :
                 is Double -> DoubleNode(this)
                 is String -> TextNode(this)
                 is Iterable<*> -> ArrayNode(instance)
-                    .also { map { if (it is JsonNode) it else it.toNode() }.forEach(it::add)
-                }
+                    .also {
+                        map { if (it is JsonNode) it else it.toNode() }.forEach(it::add)
+                    }
 
                 else -> error("Cannot set value of type ${this::class.java}")
             }