Merge remote-tracking branch 'FasterXML/2.19'

Author: k163377

.github/workflows/dep_build_v2.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         java_version: ['8', '17', '21', '23']
         # Versions need to align with ones in 'main.yml' workflow
-        kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
+        kotlin_version: ['1.9.24', '2.0.21', '2.1.10']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:

.github/workflows/dep_build_v3.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         java_version: ['17', '21', '23']
         # Versions need to align with ones in 'main.yml' workflow
-        kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
+        kotlin_version: ['1.9.24', '2.0.21', '2.1.10']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
       max-parallel: 5
       matrix:
         java_version: ['17', '21', '23']
-        kotlin_version: ['1.9.25', '2.0.21', '2.1.0']
+        kotlin_version: ['1.9.25', '2.0.21', '2.1.10']
         include:
           - java_version: '17'
             kotlin_version: '1.9.25'

release-notes/CREDITS-2.x

@@ -17,6 +17,9 @@ Contributors:
 
 # 2.19.0 (not yet released)
 
+Tatu Saloranta (@cowtowncoder)
+* #889: Upgrade kotlin dep to 1.9.25 (from 1.9.24)
+
 WrongWrong (@k163377)
 * #914: Add test case to serialize Nothing? (for #314)
 * #910: Add default KeyDeserializer for value class
@@ -33,6 +36,7 @@ WrongWrong (@k163377)
 # 2.18.4 (not yet released)
 
 WrongWrong (@k163377)
+* #923: Fixed hasRequiredMarker to only process content defined in Kotlin
 * #920: Minor refactors that do not affect behavior
 
 # 2.18.3 (28-Feb-2025)

release-notes/VERSION-2.x

@@ -38,6 +38,8 @@ Co-maintainers:
 
 2.18.4 (not yet released)
 
+#923: Fixed a problem where the result of processing `hasRequiredMarker ` by a `KotlinModule` would also apply to
+  classes defined in `Java` when `NullToEmptyCollection` or `NullToEmptyMap` was enabled.
 #920: Minor refactorings were made that did not affect behavior.
 
 2.18.3 (28-Feb-2025)

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

@@ -42,7 +42,10 @@ internal class KotlinAnnotationIntrospector(
     // TODO: implement nullIsSameAsDefault flag, which represents when TRUE that if something has a default value, it can be passed a null to default it
     //       this likely impacts this class to be accurate about what COULD be considered required
 
-    override fun hasRequiredMarker(cfg : MapperConfig<*>, m: AnnotatedMember): Boolean? =
+    override fun hasRequiredMarker(
+        cfg : MapperConfig<*>,
+        m: AnnotatedMember
+    ): Boolean? = m.takeIf { it.member.declaringClass.isKotlinClass() }?.let { _ ->
         cache.javaMemberIsRequired(m) {
             try {
                 when {
@@ -59,6 +62,7 @@ internal class KotlinAnnotationIntrospector(
             } catch (_: UnsupportedOperationException) {
                 null
             }
+        }
     }
 
     override fun findSerializationConverter(config: MapperConfig<*>?, a: Annotated): Converter<*, *>? = when (a) {

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

@@ -0,0 +1,32 @@
+package tools.jackson.module.kotlin.test.github
+
+import tools.jackson.databind.BeanDescription
+import tools.jackson.databind.ObjectMapper
+import tools.jackson.module.kotlin.KotlinFeature
+import tools.jackson.module.kotlin.jacksonObjectMapper
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class GitHub922 {
+    private inline fun <reified T : Any> ObjectMapper.introspectSerialization(): BeanDescription =
+        _serializationContext().introspectBeanDescription(_serializationContext().constructType(T::class.java))
+
+    private inline fun <reified T : Any> ObjectMapper.introspectDeserialization(): BeanDescription =
+        _deserializationContext().introspectBeanDescription(_deserializationContext().constructType(T::class.java))
+
+    private fun BeanDescription.isRequired(propertyName: String): Boolean =
+        this.findProperties().first { it.name == propertyName }.isRequired
+
+    @Test
+    fun `nullToEmpty does not override specification by Java annotation`() {
+        val mapper = jacksonObjectMapper {
+            enable(KotlinFeature.NullToEmptyCollection)
+            enable(KotlinFeature.NullToEmptyMap)
+        }
+
+        val desc = mapper.introspectDeserialization<GitHub922RequiredCollectionsDtoJava>()
+
+        assertTrue(desc.isRequired("list"))
+        assertTrue(desc.isRequired("map"))
+    }
+}

src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub922RequiredCollectionsDtoJava.java

@@ -0,0 +1,29 @@
+package tools.jackson.module.kotlin.test.github;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+import java.util.Map;
+
+public class GitHub922RequiredCollectionsDtoJava {
+    private final List<String> list;
+    private final Map<String, String> map;
+
+    @JsonCreator
+    public GitHub922RequiredCollectionsDtoJava(
+            @JsonProperty(value = "list", required = true) List<String> list,
+            @JsonProperty(value = "map", required = true) Map<String, String> map
+    ) {
+        this.list = list;
+        this.map = map;
+    }
+
+    public List<String> getList() {
+        return list;
+    }
+
+    public Map<String, String> getMap() {
+        return map;
+    }
+}