Merge remote-tracking branch 'FasterXML/2.19'

Author: k163377

release-notes/CREDITS-2.x

@@ -31,6 +31,7 @@ WrongWrong (@k163377)
 # 2.18.3 (not yet released)
 
 WrongWrong (@k163377)
+* #904: Fixed an error when serializing a `value class` that wraps a `Map`
 * #900: Fixed an issue where some tests were not running
 
 # 2.18.0 (26-Sep-2024)

release-notes/VERSION-2.x

@@ -34,6 +34,10 @@ Co-maintainers:
 #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName.
 #835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport.
 
+2.18.3 (not yet released)
+
+#904: An error that occurred when serializing a `value class` that wraps a `Map`(#873) has been fixed.
+
 2.18.2 (27-Nov-2024)
 2.18.1 (28-Oct-2024)
 

src/main/kotlin/tools/jackson/module/kotlin/KotlinSerializers.kt

@@ -56,7 +56,7 @@ object ValueClassUnboxSerializer : StdSerializer<Any>(Any::class.java) {
             return
         }
 
-        ctxt.findValueSerializer(unboxed::class.java).serialize(unboxed, gen, ctxt)
+        ctxt.writeValue(gen, unboxed)
     }
 }
 

src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub873.kt

@@ -0,0 +1,45 @@
+package tools.jackson.module.kotlin.test.github
+
+import tools.jackson.module.kotlin.defaultMapper
+import tools.jackson.module.kotlin.readValue
+import kotlin.test.Test
+
+class GitHub873 {
+    @Test
+    fun `should serialize value class`() {
+
+        val person = Person(
+            mapOf(
+                "id" to "123",
+                "updated" to "2023-11-22 12:11:23",
+                "login" to "2024-01-15",
+            ),
+        )
+
+        val serialized = defaultMapper.writeValueAsString(
+            TimestampedPerson(
+                123L,
+                Person(person.properties),
+            )
+        )
+
+        val deserialized = defaultMapper.readValue<TimestampedPerson>(serialized)
+
+        assert(
+            deserialized == TimestampedPerson(
+                123L,
+                Person(person.properties),
+            )
+        )
+    }
+
+    @JvmInline
+    value class Person(
+        val properties: Map<String, Any>,
+    )
+
+    data class TimestampedPerson(
+        val timestamp: Long,
+        val person: Person,
+    )
+}