Skip to content

Replace the non-custom mapper with defaultMapper #990

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 2 commits into from
May 11, 2025
Merged

Replace the non-custom mapper with defaultMapper #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4dff13
Replace the non-custom mapper with defaultMapper
k163377 May 11, 2025
a65b928
Replace the non-custom mapper with defaultMapper
k163377 May 11, 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
13 changes: 6 additions & 7 deletions src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinInstantiatorsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test

class KotlinInstantiatorsTest {
private val mapper = jacksonObjectMapper()
private val deserConfig = mapper.deserializationConfig
private val deserConfig = defaultMapper.deserializationConfig

private val kotlinInstantiators = KotlinInstantiators(
ReflectionCache(10),
Expand All @@ -18,7 +17,7 @@ class KotlinInstantiatorsTest {

@Test
fun `Provides default instantiator for Java class`() {
val javaType = mapper.constructType(String::class.java)
val javaType = defaultMapper.constructType(String::class.java)
val defaultInstantiator = StdValueInstantiator(deserConfig, javaType)
val instantiator = kotlinInstantiators.findValueInstantiator(
deserConfig,
Expand All @@ -33,7 +32,7 @@ class KotlinInstantiatorsTest {
fun `Provides KotlinValueInstantiator for Kotlin class`() {
class TestClass

val javaType = mapper.constructType(TestClass::class.java)
val javaType = defaultMapper.constructType(TestClass::class.java)
val instantiator = kotlinInstantiators.findValueInstantiator(
deserConfig,
deserConfig.introspect(javaType),
Expand All @@ -51,15 +50,15 @@ class KotlinInstantiatorsTest {

val subClassInstantiator = object : StdValueInstantiator(
deserConfig,
mapper.constructType(DefaultClass::class.java)
defaultMapper.constructType(DefaultClass::class.java)
) {}

assertThrows(IllegalStateException::class.java) {
kotlinInstantiators.findValueInstantiator(
deserConfig,
deserConfig.introspect(mapper.constructType(TestClass::class.java)),
deserConfig.introspect(defaultMapper.constructType(TestClass::class.java)),
subClassInstantiator
)
}
}
}
}
6 changes: 3 additions & 3 deletions ...erxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.DeserializationContext
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.databind.deser.std.StdDeserializer
import com.fasterxml.jackson.module.kotlin.WrapsNullableValueClassDeserializer
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
Expand Down Expand Up @@ -38,7 +38,7 @@ class NullableObjectEdgeCases {

@Test
fun nullValueIsUsedPreferentially() {
val result = jacksonObjectMapper().readValue<NullValue>("""{"nn":null,"n":null}""")
val result = defaultMapper.readValue<NullValue>("""{"nn":null,"n":null}""")
assertEquals(NullValue(NullValueDeserializer.nv, NullValueDeserializer.nv), result)
}

Expand All @@ -62,7 +62,7 @@ class NullableObjectEdgeCases {
@Test
fun `Nulls_SKIP works`() {
assertThrows<KotlinReflectionInternalError>("#761(KT-57357) fixed") {
val result = jacksonObjectMapper().readValue<NullsSkip>("""{"nn":null,"n":null}""")
val result = defaultMapper.readValue<NullsSkip>("""{"nn":null,"n":null}""")
assertEquals(NullValue(VC("skip"), VC("skip")), result)
}
}
Expand Down
10 changes: 4 additions & 6 deletions ...on/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass

import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue
Expand All @@ -13,7 +12,6 @@ import kotlin.test.assertNotEquals

class WithoutCustomDeserializeMethodTest {
companion object {
val mapper = jacksonObjectMapper()
val throwable = IllegalArgumentException("test")
}

Expand Down Expand Up @@ -68,8 +66,8 @@ class WithoutCustomDeserializeMethodTest {
NullableObject("baz"),
NullableObject("qux")
)
val src = mapper.writeValueAsString(expected)
val result = mapper.readValue<Dst>(src)
val src = defaultMapper.writeValueAsString(expected)
val result = defaultMapper.readValue<Dst>(src)

assertEquals(expected, result)
}
Expand All @@ -84,8 +82,8 @@ class WithoutCustomDeserializeMethodTest {
NullableObject(null),
null
)
val src = mapper.writeValueAsString(expected)
val result = mapper.readValue<Dst>(src)
val src = defaultMapper.writeValueAsString(expected)
val result = defaultMapper.readValue<Dst>(src)

assertEquals(expected, result)
}
Expand Down
10 changes: 3 additions & 7 deletions ...son/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultArgument

import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test

class NonNullObjectTest {
companion object {
val mapper = jacksonObjectMapper()
}

data class ByConstructor(
val nn: NonNullObject = NonNullObject("foo"),
val nNn: NonNullObject? = NonNullObject("bar"),
Expand All @@ -20,7 +16,7 @@ class NonNullObjectTest {

@Test
fun byConstructorTest() {
assertEquals(ByConstructor(), mapper.readValue<ByConstructor>("{}"))
assertEquals(ByConstructor(), defaultMapper.readValue<ByConstructor>("{}"))
}

data class ByFactory(val nn: NonNullObject, val nNn: NonNullObject?, val nN: NonNullObject?) {
Expand All @@ -37,6 +33,6 @@ class NonNullObjectTest {

@Test
fun byFactoryTest() {
assertEquals(ByFactory.creator(), mapper.readValue<ByFactory>("{}"))
assertEquals(ByFactory.creator(), defaultMapper.readValue<ByFactory>("{}"))
}
}
10 changes: 3 additions & 7 deletions ...on/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultArgument

import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertThrows
import org.junit.jupiter.api.Test

class NullableObjectTest {
companion object {
val mapper = jacksonObjectMapper()
}

data class ByConstructor(
val nnNn: NullableObject = NullableObject("foo"),
val nnN: NullableObject = NullableObject(null),
Expand All @@ -24,7 +20,7 @@ class NullableObjectTest {
fun byConstructorTestFailing() {
// #761(KT-57357) fixed
assertThrows(Error::class.java) {
assertEquals(ByConstructor(), mapper.readValue<ByConstructor>("{}"))
assertEquals(ByConstructor(), defaultMapper.readValue<ByConstructor>("{}"))
}
}

Expand All @@ -50,7 +46,7 @@ class NullableObjectTest {
fun byFactoryTest() {
// #761(KT-57357) fixed
assertThrows(Error::class.java) {
assertEquals(ByFactory.creator(), mapper.readValue<ByFactory>("{}"))
assertEquals(ByFactory.creator(), defaultMapper.readValue<ByFactory>("{}"))
}
}
}
10 changes: 3 additions & 7 deletions ...jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultArgument

import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test

class PrimitiveTest {
companion object {
val mapper = jacksonObjectMapper()
}

data class ByConstructor(
val nn: Primitive = Primitive(1),
val nNn: Primitive? = Primitive(2),
Expand All @@ -20,7 +16,7 @@ class PrimitiveTest {

@Test
fun byConstructorTest() {
assertEquals(ByConstructor(), mapper.readValue<ByConstructor>("{}"))
assertEquals(ByConstructor(), defaultMapper.readValue<ByConstructor>("{}"))
}

data class ByFactory(val nn: Primitive, val nNn: Primitive?, val nN: Primitive?) {
Expand All @@ -37,6 +33,6 @@ class PrimitiveTest {

@Test
fun byFactoryTest() {
assertEquals(ByFactory.creator(), mapper.readValue<ByFactory>("{}"))
assertEquals(ByFactory.creator(), defaultMapper.readValue<ByFactory>("{}"))
}
}
8 changes: 3 additions & 5 deletions ...lin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.DeserializationContext
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.databind.deser.std.StdDeserializer
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
Expand All @@ -20,8 +20,7 @@ class SpecifiedForClassTest {

@Test
fun directDeserTest() {
val mapper = jacksonObjectMapper()
val result = mapper.readValue<Value>("1")
val result = defaultMapper.readValue<Value>("1")

assertEquals(Value(101), result)
}
Expand All @@ -30,8 +29,7 @@ class SpecifiedForClassTest {

@Test
fun paramDeserTest() {
val mapper = jacksonObjectMapper()
val result = mapper.readValue<Wrapper>("""{"v":1}""")
val result = defaultMapper.readValue<Wrapper>("""{"v":1}""")

assertEquals(Wrapper(Value(101)), result)
}
Expand Down
12 changes: 4 additions & 8 deletions ...tion/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation.specifiedForProperty

import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test

class NonNullObjectTest {
companion object {
val mapper = jacksonObjectMapper()
}

data class NonNull(
@get:JsonDeserialize(using = NonNullObject.Deserializer::class)
val getterAnn: NonNullObject,
Expand All @@ -22,7 +18,7 @@ class NonNullObjectTest {

@Test
fun nonNull() {
val result = mapper.readValue<NonNull>(
val result = defaultMapper.readValue<NonNull>(
"""
{
"getterAnn" : "foo",
Expand All @@ -44,7 +40,7 @@ class NonNullObjectTest {
inner class NullableTest {
@Test
fun nonNullInput() {
val result = mapper.readValue<Nullable>(
val result = defaultMapper.readValue<Nullable>(
"""
{
"getterAnn" : "foo",
Expand All @@ -57,7 +53,7 @@ class NonNullObjectTest {

@Test
fun nullInput() {
val result = mapper.readValue<Nullable>(
val result = defaultMapper.readValue<Nullable>(
"""
{
"getterAnn" : null,
Expand Down
12 changes: 4 additions & 8 deletions ...ion/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation.specifiedForProperty

import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test

class NullableObjectTest {
companion object {
val mapper = jacksonObjectMapper()
}

data class NonNull(
@get:JsonDeserialize(using = NullableObject.DeserializerWrapsNullable::class)
val getterAnn: NullableObject,
Expand All @@ -22,7 +18,7 @@ class NullableObjectTest {

@Test
fun nonNull() {
val result = mapper.readValue<NonNull>(
val result = defaultMapper.readValue<NonNull>(
"""
{
"getterAnn" : "foo",
Expand All @@ -44,7 +40,7 @@ class NullableObjectTest {
inner class NullableTest {
@Test
fun nonNullInput() {
val result = mapper.readValue<Nullable>(
val result = defaultMapper.readValue<Nullable>(
"""
{
"getterAnn" : "foo",
Expand All @@ -57,7 +53,7 @@ class NullableObjectTest {

@Test
fun nullInput() {
val result = mapper.readValue<Nullable>(
val result = defaultMapper.readValue<Nullable>(
"""
{
"getterAnn" : null,
Expand Down
12 changes: 4 additions & 8 deletions ...egration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation.specifiedForProperty

import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.defaultMapper
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive
import com.fasterxml.jackson.module.kotlin.readValue
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test

class PrimitiveTest {
companion object {
val mapper = jacksonObjectMapper()
}

data class NonNull(
@get:JsonDeserialize(using = Primitive.Deserializer::class)
val getterAnn: Primitive,
Expand All @@ -22,7 +18,7 @@ class PrimitiveTest {

@Test
fun nonNull() {
val result = mapper.readValue<NonNull>(
val result = defaultMapper.readValue<NonNull>(
"""
{
"getterAnn" : 1,
Expand All @@ -44,7 +40,7 @@ class PrimitiveTest {
inner class NullableTest {
@Test
fun nonNullInput() {
val result = mapper.readValue<Nullable>(
val result = defaultMapper.readValue<Nullable>(
"""
{
"getterAnn" : 1,
Expand All @@ -57,7 +53,7 @@ class PrimitiveTest {

@Test
fun nullInput() {
val result = mapper.readValue<Nullable>(
val result = defaultMapper.readValue<Nullable>(
"""
{
"getterAnn" : null,
Expand Down
Loading