Merge branch 'master' into tatu/3.0/887-use-module-info

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -18,6 +18,7 @@ Contributors:
 # 2.19.0 (not yet released)
 
 WrongWrong (@k163377)
+* #914: Add test case to serialize Nothing? (for #314)
 * #910: Add default KeyDeserializer for value class
 * #885: Performance improvement of strictNullChecks
 * #884: Changed the base class of MissingKotlinParameterException to InvalidNullException

release-notes/VERSION-2.x

@@ -18,8 +18,8 @@ Co-maintainers:
 
 2.19.0 (not yet released)
 
-#910: A default `KeySerializer` for `value class` has been added.
- This eliminates the need to have a custom `KeySerializer` for each `value class` when using it as a key in a `Map`, if only simple boxing is needed.
+#910: A default `KeyDeserializer` for `value class` has been added.
+ This eliminates the need to have a custom `KeyDeserializer` for each `value class` when using it as a key in a `Map`, if only simple boxing is needed.
 #889: Kotlin has been upgraded to 1.9.25.
 #885: A new `StrictNullChecks` option(KotlinFeature.NewStrictNullChecks) has been added which greatly improves throughput.
  Benchmarks show a consistent throughput drop of less than 2% when enabled (prior to the improvement, the worst throughput drop was more than 30%).

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

@@ -0,0 +1,29 @@
+package tools.jackson.module.kotlin.test.github
+
+import tools.jackson.databind.MapperFeature
+import tools.jackson.module.kotlin.jsonMapper
+import tools.jackson.module.kotlin.kotlinModule
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class GitHub314 {
+    // Since Nothing? is compiled as a Void, it can be serialized by specifying ALLOW_VOID_VALUED_PROPERTIES
+    data object NothingData {
+        val data: Nothing? = null
+    }
+
+    @Test
+    fun test() {
+        val expected = """{"data":null}"""
+
+        val withoutKotlinModule = jsonMapper { enable(MapperFeature.ALLOW_VOID_VALUED_PROPERTIES) }
+        assertEquals(expected, withoutKotlinModule.writeValueAsString(NothingData))
+
+        val withKotlinModule = jsonMapper {
+            enable(MapperFeature.ALLOW_VOID_VALUED_PROPERTIES)
+            addModule(kotlinModule())
+        }
+
+        assertEquals(expected, withKotlinModule.writeValueAsString(NothingData))
+    }
+}

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
 import tools.jackson.module.kotlin.readValue
 import tools.jackson.module.kotlin.jsonMapper
 import org.junit.jupiter.api.Test
+import tools.jackson.module.kotlin.jacksonObjectMapper
 import kotlin.test.assertEquals
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "_type")
@@ -21,7 +22,7 @@ class GitHub844 {
         }
         """
 
-        val jacksonObjectMapper = jsonMapper()
+        val jacksonObjectMapper = jacksonObjectMapper()
         val message = jacksonObjectMapper.readValue<BaseClass>(json)
 
         assertEquals(ChildClass("Test"), message)