Skip to content

Changed to use default argument on null if JsonSetter(nulls = Nulls.SKIP) is specified. #707

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 5 commits into from
Sep 2, 2023
+27 −1
Merged

Changed to use default argument on null if JsonSetter(nulls = Nulls.SKIP) is specified. #707

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
863d3ac
Fixed to use default value if JsonSetter(nulls = Nulls.SKIP) is speci…
k163377 Aug 25, 2023
f04e2f4
Add test
k163377 Aug 25, 2023
23050b1
Fix null handling
k163377 Aug 25, 2023
11350bc
Modified the acquisition method to take into account custom annotatio…
k163377 Aug 26, 2023
0466751
Update release notes wrt #707
k163377 Sep 1, 2023
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
7 changes: 6 additions & 1 deletion src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinValueInstantiator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.fasterxml.jackson.module.kotlin

import com.fasterxml.jackson.annotation.JsonSetter
import com.fasterxml.jackson.annotation.Nulls
import com.fasterxml.jackson.databind.BeanDescription
import com.fasterxml.jackson.databind.DeserializationConfig
import com.fasterxml.jackson.databind.DeserializationContext
Expand Down Expand Up @@ -32,6 +34,9 @@ internal class KotlinValueInstantiator(

private fun List<KTypeProjection>.markedNonNullAt(index: Int) = getOrNull(index)?.type?.isMarkedNullable == false

private fun SettableBeanProperty.skipNulls(): Boolean =
nullIsSameAsDefault || (getAnnotation(JsonSetter::class.java).nulls == Nulls.SKIP)

override fun createFromObjectWith(
ctxt: DeserializationContext,
props: Array<out SettableBeanProperty>,
Expand Down Expand Up @@ -70,7 +75,7 @@ internal class KotlinValueInstantiator(
val paramType = paramDef.type
var paramVal = if (!isMissing || paramDef.isPrimitive() || jsonProp.hasInjectableValueId()) {
val tempParamVal = buffer.getParameter(jsonProp)
if (nullIsSameAsDefault && tempParamVal == null && paramDef.isOptional) {
if (tempParamVal == null && jsonProp.skipNulls() && paramDef.isOptional) {
return@forEachIndexed
}
tempParamVal
Expand Down
20 changes: 20 additions & 0 deletions src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github526.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.fasterxml.jackson.module.kotlin.test.github

import com.fasterxml.jackson.annotation.JsonSetter
import com.fasterxml.jackson.annotation.Nulls
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.Test
import kotlin.test.assertEquals

class Github526 {
data class D(@JsonSetter(nulls = Nulls.SKIP) val v: Int = -1)

@Test
fun test() {
val mapper = jacksonObjectMapper()
val d = mapper.readValue<D>("""{"v":null}""")

assertEquals(-1, d.v)
}
}