Merge branch '2.x' into 2.20

Author: k163377

.github/workflows/dep_build_v2.yml

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

.github/workflows/dep_build_v3.yml

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

.github/workflows/main.yml

@@ -21,10 +21,10 @@ jobs:
       max-parallel: 5
       matrix:
         java_version: ['8', '11', '17', '21', '24']
-        kotlin_version: ['2.0.21', '2.1.21', '2.2.20']
+        kotlin_version: ['2.1.21', '2.2.20']
         include:
           - java_version: '8'
-            kotlin_version: '2.0.21'
+            kotlin_version: '2.1.21'
             release_build: 'R'
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"

README.md

@@ -111,10 +111,10 @@ println(arrayNode.toString()) // ["foo",true,1,1.0,"YmFy"]
 Different `kotlin-core` versions are supported by different Jackson Kotlin module minor versions.
 Here is an incomplete list of supported versions:
 
+* Jackson 2.21.x: Kotlin-core 2.1 - 2.2
 * Jackson 2.20.x: Kotlin-core 2.0 - 2.2
 * Jackson 2.19.x: Kotlin-core 1.9 - 2.1
 * Jackson 2.18.x: Kotlin-core 1.8 - 2.1
-* Jackson 2.17.x: Kotlin-core 1.7 - 2.0
 
 Please note that the versions supported by 2.17 are tentative and may change depending on the release date.
 

pom.xml

@@ -8,12 +8,12 @@
     <parent>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-base</artifactId>
-        <version>2.20.1-SNAPSHOT</version>
+        <version>2.21.0-SNAPSHOT</version>
     </parent>
     <groupId>com.fasterxml.jackson.module</groupId>
     <artifactId>jackson-module-kotlin</artifactId>
     <name>jackson-module-kotlin</name>
-    <version>2.20.1-SNAPSHOT</version>
+    <version>2.21.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Add-on module for Jackson (https://github.com/FasterXML/jackson/) to support
         Kotlin language, specifically introspection of method/constructor parameter names,
@@ -62,7 +62,7 @@
         <javac.src.version>1.8</javac.src.version>
         <javac.target.version>1.8</javac.target.version>
 
-        <version.kotlin>2.0.21</version.kotlin>
+        <version.kotlin>2.1.21</version.kotlin>
 
         <!-- Generate PackageVersion.java into this directory. -->
         <packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
@@ -237,7 +237,7 @@
                             -->
                             <!-- 30-Sep-2023, wrongwrong: For 2.16, compare to 2.15.2 baseline
                             -->
-                            <version>2.19.0</version>
+                            <version>2.20.0</version>
                             <type>jar</type>
                         </dependency>
                     </oldVersion>
@@ -253,24 +253,17 @@
                             <!-- public -->
                             <!-- removed -->
                             <exclude>
-                                com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException#MissingKotlinParameterException(kotlin.reflect.KParameter,java.io.Closeable,java.lang.String)
+                                com.fasterxml.jackson.module.kotlin.KotlinModule#getEnabledSingletonSupport()
                             </exclude>
-                            <exclude>
-                                com.fasterxml.jackson.module.kotlin.WrapsNullableValueClassBoxDeserializer
-                            </exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.ValueClassUnboxKeySerializer</exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.KotlinKeySerializersKt</exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.ValueClassSerializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.ValueClassUnboxSerializer</exclude>
                             <!-- internal -->
                             <exclude>
-                                com.fasterxml.jackson.module.kotlin.KotlinKeySerializers#KotlinKeySerializers()
+                                com.fasterxml.jackson.module.kotlin.KotlinInstantiators#KotlinInstantiators(com.fasterxml.jackson.module.kotlin.ReflectionCache,boolean,boolean,boolean,boolean)
                             </exclude>
                             <exclude>
-                                com.fasterxml.jackson.module.kotlin.KotlinSerializers#KotlinSerializers()
+                                com.fasterxml.jackson.module.kotlin.KotlinValueInstantiator#KotlinValueInstantiator(com.fasterxml.jackson.databind.deser.std.StdValueInstantiator,com.fasterxml.jackson.module.kotlin.ReflectionCache,boolean,boolean,boolean,boolean)
                             </exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.ValueClassStaticJsonKeySerializer</exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.ValueClassBoxConverter</exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.ValueClassKeyDeserializer</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

release-notes/CREDITS-2.x

@@ -15,7 +15,15 @@ Authors:
 
 Contributors:
 
-# 2.20.0 (not yet released)
+# 2.21.0 (not yet released)
+
+WrongWrong (@k163377)
+* #1043: Cleanup of deprecated contents
+* #1042: Remove old StrictNullChecks
+* #1041: Remove MissingKotlinParameterException
+* #1039: Update settings for 2.20
+
+# 2.20.0 (28-Aug-2025)
 
 WrongWrong (@k163377)
 * #1025: Deprecate MissingKotlinParameterException and replace with new exception

release-notes/VERSION-2.x

@@ -16,6 +16,14 @@ Co-maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.21.0 (not yet released)
+
+#1043: Deprecated content has been cleaned up with the version upgrade.
+#1042: The old StrictNullChecks backend has been removed.
+  This improves the throughput of deserialization slightly.
+#1041: The deprecated MissingKotlinParameterException has been removed.
+#1039: Kotlin has been upgraded to 2.1.x.
+
 2.20.0 (28-Aug-2025)
 
 #1025: When a null is entered for a non-null parameter, the KotlinInvalidNullException is now thrown instead of the

src/main/kotlin/com/fasterxml/jackson/module/kotlin/Exceptions.kt

@@ -40,13 +40,12 @@ enum class KotlinFeature(internal val enabledByDefault: Boolean) {
      *
      * With this disabled, the default, collections which are typed to disallow null members (e.g. `List<String>`)
      * may contain null values after deserialization.
-     * Enabling it protects against this but has significant performance impact.
+     * Enabling this will cause an [InvalidNullException] to be thrown if null is entered.
+     *
+     * Internally, it will be the same as if [JsonSetter] (contentNulls = FAIL) had been granted.
+     *
+     * Benchmarks show that it can check for illegal nulls with throughput nearly identical to the default (see [jackson-module-kotlin#719]).
      */
-    @Deprecated(
-        level = DeprecationLevel.ERROR,
-        message = "This option will be migrated to the new backend in 2.21.",
-        replaceWith = ReplaceWith("NewStrictNullChecks")
-    )
     StrictNullChecks(enabledByDefault = false),
 
     /**
@@ -80,15 +79,15 @@ enum class KotlinFeature(internal val enabledByDefault: Boolean) {
      * Internally, it will be the same as if [JsonSetter] (contentNulls = FAIL) had been granted.
      * Benchmarks show that it can check for illegal nulls with throughput nearly identical to the default (see [jackson-module-kotlin#719]).
      *
-     * Note that in the new backend, the exception thrown has changed from [MissingKotlinParameterException] to [InvalidNullException].
-     * The message will be changed accordingly.
-     * Since 2.19, the base class of [MissingKotlinParameterException] has also been changed to [InvalidNullException],
-     * so be careful when catching it.
-     *
      * This is a temporary option for a phased backend migration,
      * which will eventually be merged into [StrictNullChecks].
      * Also, specifying both this and [StrictNullChecks] is not permitted.
      */
+    @Deprecated(
+        level = DeprecationLevel.WARNING,
+        message = "This option will be merged into StrictNullChecks in 2.23.",
+        replaceWith = ReplaceWith("StrictNullChecks")
+    )
     NewStrictNullChecks(enabledByDefault = false);
 
     internal val bitSet: BitSet = (1 shl ordinal).toBitSet()

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinFeature.kt

@@ -43,32 +43,11 @@ class KotlinModule private constructor(
     val nullToEmptyMap: Boolean = NullToEmptyMap.enabledByDefault,
     val nullIsSameAsDefault: Boolean = NullIsSameAsDefault.enabledByDefault,
     val singletonSupport: Boolean = SingletonSupport.enabledByDefault,
-    @Suppress("DEPRECATION_ERROR")
     strictNullChecks: Boolean = StrictNullChecks.enabledByDefault,
     val kotlinPropertyNameAsImplicitName: Boolean = KotlinPropertyNameAsImplicitName.enabledByDefault,
     val useJavaDurationConversion: Boolean = UseJavaDurationConversion.enabledByDefault,
-    private val newStrictNullChecks: Boolean = NewStrictNullChecks.enabledByDefault,
+    newStrictNullChecks: Boolean = NewStrictNullChecks.enabledByDefault,
 ) : SimpleModule(KotlinModule::class.java.name, PackageVersion.VERSION) {
-    /*
-     * Prior to 2.18, an older Enum called SingletonSupport was used to manage feature.
-     * To deprecate it and replace it with singletonSupport: Boolean, the following steps are in progress.
-     *
-     * 1. add enabledSingletonSupport: Boolean property
-     * 2. delete SingletonSupport class and change the property to singletonSupport: Boolean
-     * 3. remove the enabledSingletonSupport property
-     *
-     * Now that 2 is complete, deprecation is in progress for 3.
-     */
-    @Deprecated(
-        level = DeprecationLevel.ERROR,
-        message = "This property is scheduled to be removed in 2.21 or later" +
-                " in order to unify the use of KotlinFeature.",
-        replaceWith = ReplaceWith("singletonSupport")
-    )
-    val enabledSingletonSupport: Boolean get() = singletonSupport
-
-    private val oldStrictNullChecks: Boolean = strictNullChecks
-
     // To reduce the amount of destructive changes, no properties will be added to the public.
     val strictNullChecks: Boolean = if (strictNullChecks) {
         if (newStrictNullChecks) {
@@ -113,7 +92,7 @@ class KotlinModule private constructor(
 
         val cache = ReflectionCache(reflectionCacheSize)
 
-        context.addValueInstantiators(KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault, oldStrictNullChecks))
+        context.addValueInstantiators(KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault))
 
         if (singletonSupport) {
             context.addBeanDeserializerModifier(KotlinBeanDeserializerModifier)
@@ -128,7 +107,7 @@ class KotlinModule private constructor(
             useJavaDurationConversion
         ))
         context.appendAnnotationIntrospector(
-            KotlinNamesAnnotationIntrospector(cache, newStrictNullChecks, kotlinPropertyNameAsImplicitName)
+            KotlinNamesAnnotationIntrospector(cache, strictNullChecks, kotlinPropertyNameAsImplicitName)
         )
 
         context.addDeserializers(KotlinDeserializers(cache, useJavaDurationConversion))