Skip to content

Cleanup of deprecated contents #969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 28, 2025
Merged

Cleanup of deprecated contents #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ab7353
Raise deprecation level
k163377 Apr 28, 2025
7e27175
Remove deprecated old constructor
k163377 Apr 28, 2025
b0afcc0
Update release notes wrt #969
k163377 Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,11 @@
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
<breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
<excludes>
<!-- public -->
<!-- removed -->
<exclude>
com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException#MissingKotlinParameterException(kotlin.reflect.KParameter,java.io.Closeable,java.lang.String)
</exclude>
</excludes>
</parameter>
</configuration>
Expand Down
1 change: 1 addition & 0 deletions release-notes/CREDITS-2.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions release-notes/VERSION-2.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 1 addition & 13 deletions src/main/kotlin/com/fasterxml/jackson/module/kotlin/Exceptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.fasterxml.jackson.module.kotlin
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.JsonMappingException
import com.fasterxml.jackson.databind.exc.InvalidNullException
import java.io.Closeable
import kotlin.reflect.KParameter

/**
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinFeature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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")
)
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,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,
Expand All @@ -59,7 +60,7 @@ class KotlinModule private constructor(
* Now that 2 is complete, deprecation is in progress for 3.
*/
@Deprecated(
level = DeprecationLevel.WARNING,
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")
Expand Down Expand Up @@ -96,6 +97,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),
Expand Down