Merge branch '2.x' into 3.x

Author: k163377

release-notes/CREDITS-2.x

@@ -18,6 +18,7 @@ Contributors:
 # 2.20.0 (not yet released)
 
 WrongWrong (@k163377)
+* #969: Cleanup of deprecated contents
 * #967: Update settings for 2.20
 
 # 2.19.1 (not yet released)

release-notes/VERSION-2.x

@@ -18,6 +18,7 @@ Co-maintainers:
 
 2.20.0 (not yet released)
 
+#969: Deprecated content has been cleaned up with the version upgrade.
 #967: Kotlin has been upgraded to 2.0.21.
 
 2.19.1 (not yet released)

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

@@ -3,7 +3,6 @@ package tools.jackson.module.kotlin
 import tools.jackson.core.JsonParser
 import tools.jackson.databind.DatabindException
 import tools.jackson.databind.exc.InvalidNullException
-import java.io.Closeable
 import kotlin.reflect.KParameter
 
 /**
@@ -31,15 +30,4 @@ class MissingKotlinParameterException(
     val parameter: KParameter,
     processor: JsonParser? = null,
     msg: String
-) : InvalidNullException(processor, msg, null) {
-    @Deprecated(
-        "Use main constructor, ",
-        ReplaceWith("MissingKotlinParameterException(KParameter, JsonParser?, String)"),
-        DeprecationLevel.ERROR,
-    )
-    constructor(
-            parameter: KParameter,
-            processor: Closeable? = null,
-            msg: String
-    ) : this(parameter, processor as JsonParser, msg)
-}
+) : InvalidNullException(processor, msg, null)

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

@@ -42,7 +42,7 @@ enum class KotlinFeature(internal val enabledByDefault: Boolean) {
      * Enabling it protects against this but has significant performance impact.
      */
     @Deprecated(
-        level = DeprecationLevel.WARNING,
+        level = DeprecationLevel.ERROR,
         message = "This option will be migrated to the new backend in 2.21.",
         replaceWith = ReplaceWith("NewStrictNullChecks")
     )

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

@@ -34,6 +34,7 @@ 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,
@@ -70,6 +71,7 @@ class KotlinModule private constructor(
         builder.isEnabled(NullToEmptyMap),
         builder.isEnabled(NullIsSameAsDefault),
         builder.isEnabled(SingletonSupport),
+        @Suppress("DEPRECATION_ERROR")
         builder.isEnabled(StrictNullChecks),
         builder.isEnabled(KotlinPropertyNameAsImplicitName),
         builder.isEnabled(UseJavaDurationConversion),