Skip to content

Commit a92c593

Browse files
k163377k163377
committed
Merge remote-tracking branch 'FasterXML/2.x' into 3.x
2 parents cdb2947 + 07f2adf commit a92c593

File tree

77 files changed

+320
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+320
-454
lines changed

‎src/test/kotlin/tools/jackson/module/kotlin/KotlinInstantiatorsTest.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import org.junit.jupiter.api.Test
77
import tools.jackson.databind.deser.std.StdValueInstantiator
88

99
class KotlinInstantiatorsTest {
10-
private val mapper = jacksonObjectMapper()
11-
private val deserConfig = mapper.deserializationConfig()
10+
private val deserConfig = defaultMapper.deserializationConfig()
1211

1312
private val kotlinInstantiators = KotlinInstantiators(
1413
ReflectionCache(10),
@@ -20,7 +19,7 @@ class KotlinInstantiatorsTest {
2019

2120
@Test
2221
fun `Provides default instantiator for Java class`() {
23-
val javaType = mapper.constructType(String::class.java)
22+
val javaType = defaultMapper.constructType(String::class.java)
2423
val defaultInstantiator = StdValueInstantiator(deserConfig, javaType)
2524
val classIntrospector = deserConfig.classIntrospectorInstance()
2625
val instantiator = kotlinInstantiators.modifyValueInstantiator(
@@ -37,7 +36,7 @@ class KotlinInstantiatorsTest {
3736
fun `Provides KotlinValueInstantiator for Kotlin class`() {
3837
class TestClass
3938

40-
val javaType = mapper.constructType(TestClass::class.java)
39+
val javaType = defaultMapper.constructType(TestClass::class.java)
4140
val classIntrospector = deserConfig.classIntrospectorInstance()
4241
val instantiator = kotlinInstantiators.modifyValueInstantiator(
4342
deserConfig,
@@ -57,11 +56,11 @@ class KotlinInstantiatorsTest {
5756

5857
val subClassInstantiator = object : StdValueInstantiator(
5958
deserConfig,
60-
mapper.constructType(DefaultClass::class.java)
59+
defaultMapper.constructType(DefaultClass::class.java)
6160
) {}
6261

6362
assertThrows(IllegalStateException::class.java) {
64-
val javaType = mapper.constructType(TestClass::class.java)
63+
val javaType = defaultMapper.constructType(TestClass::class.java)
6564
val classIntrospector = deserConfig.classIntrospectorInstance()
6665
kotlinInstantiators.modifyValueInstantiator(
6766
deserConfig,

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import tools.jackson.databind.DeserializationContext
1010
import tools.jackson.databind.annotation.JsonDeserialize
1111
import tools.jackson.databind.deser.std.StdDeserializer
1212
import tools.jackson.module.kotlin.WrapsNullableValueClassDeserializer
13-
import tools.jackson.module.kotlin.jacksonObjectMapper
13+
import tools.jackson.module.kotlin.defaultMapper
1414
import tools.jackson.module.kotlin.readValue
1515
import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
1616

@@ -38,7 +38,7 @@ class NullableObjectEdgeCases {
3838

3939
@Test
4040
fun nullValueIsUsedPreferentially() {
41-
val result = jacksonObjectMapper().readValue<NullValue>("""{"nn":null,"n":null}""")
41+
val result = defaultMapper.readValue<NullValue>("""{"nn":null,"n":null}""")
4242
assertEquals(NullValue(NullValueDeserializer.nv, NullValueDeserializer.nv), result)
4343
}
4444

@@ -62,7 +62,7 @@ class NullableObjectEdgeCases {
6262
@Test
6363
fun `Nulls_SKIP works`() {
6464
assertThrows<KotlinReflectionInternalError>("#761(KT-57357) fixed") {
65-
val result = jacksonObjectMapper().readValue<NullsSkip>("""{"nn":null,"n":null}""")
65+
val result = defaultMapper.readValue<NullsSkip>("""{"nn":null,"n":null}""")
6666
assertEquals(NullValue(VC("skip"), VC("skip")), result)
6767
}
6868
}

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import org.junit.jupiter.api.Nested
66
import org.junit.jupiter.api.Test
77
import org.junit.jupiter.api.assertThrows
88
import tools.jackson.module.kotlin.defaultMapper
9-
import tools.jackson.module.kotlin.jacksonObjectMapper
109
import tools.jackson.module.kotlin.readValue
1110
import java.lang.reflect.InvocationTargetException
1211
import kotlin.test.assertNotEquals
1312

1413
class WithoutCustomDeserializeMethodTest {
1514
companion object {
16-
val mapper = jacksonObjectMapper()
1715
val throwable = IllegalArgumentException("test")
1816
}
1917

@@ -68,8 +66,8 @@ class WithoutCustomDeserializeMethodTest {
6866
NullableObject("baz"),
6967
NullableObject("qux")
7068
)
71-
val src = mapper.writeValueAsString(expected)
72-
val result = mapper.readValue<Dst>(src)
69+
val src = defaultMapper.writeValueAsString(expected)
70+
val result = defaultMapper.readValue<Dst>(src)
7371

7472
assertEquals(expected, result)
7573
}
@@ -84,8 +82,8 @@ class WithoutCustomDeserializeMethodTest {
8482
NullableObject(null),
8583
null
8684
)
87-
val src = mapper.writeValueAsString(expected)
88-
val result = mapper.readValue<Dst>(src)
85+
val src = defaultMapper.writeValueAsString(expected)
86+
val result = defaultMapper.readValue<Dst>(src)
8987

9088
assertEquals(expected, result)
9189
}

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultAr
33
import com.fasterxml.jackson.annotation.JsonCreator
44
import org.junit.jupiter.api.Assertions.assertEquals
55
import org.junit.jupiter.api.Test
6-
import tools.jackson.module.kotlin.jacksonObjectMapper
6+
import tools.jackson.module.kotlin.defaultMapper
77
import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject
88
import tools.jackson.module.kotlin.readValue
99

1010
class NonNullObjectTest {
11-
companion object {
12-
val mapper = jacksonObjectMapper()
13-
}
14-
1511
data class ByConstructor(
1612
val nn: NonNullObject = NonNullObject("foo"),
1713
val nNn: NonNullObject? = NonNullObject("bar"),
@@ -20,7 +16,7 @@ class NonNullObjectTest {
2016

2117
@Test
2218
fun byConstructorTest() {
23-
assertEquals(ByConstructor(), mapper.readValue<ByConstructor>("{}"))
19+
assertEquals(ByConstructor(), defaultMapper.readValue<ByConstructor>("{}"))
2420
}
2521

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

3834
@Test
3935
fun byFactoryTest() {
40-
assertEquals(ByFactory.creator(), mapper.readValue<ByFactory>("{}"))
36+
assertEquals(ByFactory.creator(), defaultMapper.readValue<ByFactory>("{}"))
4137
}
4238
}

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import org.junit.jupiter.api.Assertions.assertEquals
55
import org.junit.jupiter.api.Assertions.assertThrows
66
import org.junit.jupiter.api.Test
7-
import tools.jackson.module.kotlin.jacksonObjectMapper
7+
import tools.jackson.module.kotlin.defaultMapper
88
import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject
99
import tools.jackson.module.kotlin.readValue
1010

1111
class NullableObjectTest {
12-
companion object {
13-
val mapper = jacksonObjectMapper()
14-
}
15-
1612
data class ByConstructor(
1713
val nnNn: NullableObject = NullableObject("foo"),
1814
val nnN: NullableObject = NullableObject(null),
@@ -24,7 +20,7 @@ class NullableObjectTest {
2420
fun byConstructorTestFailing() {
2521
// #761(KT-57357) fixed
2622
assertThrows(Error::class.java) {
27-
assertEquals(ByConstructor(), mapper.readValue<ByConstructor>("{}"))
23+
assertEquals(ByConstructor(), defaultMapper.readValue<ByConstructor>("{}"))
2824
}
2925
}
3026

@@ -50,7 +46,7 @@ class NullableObjectTest {
5046
fun byFactoryTest() {
5147
// #761(KT-57357) fixed
5248
assertThrows(Error::class.java) {
53-
assertEquals(ByFactory.creator(), mapper.readValue<ByFactory>("{}"))
49+
assertEquals(ByFactory.creator(), defaultMapper.readValue<ByFactory>("{}"))
5450
}
5551
}
5652
}

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultAr
33
import com.fasterxml.jackson.annotation.JsonCreator
44
import org.junit.jupiter.api.Assertions.assertEquals
55
import org.junit.jupiter.api.Test
6-
import tools.jackson.module.kotlin.jacksonObjectMapper
6+
import tools.jackson.module.kotlin.defaultMapper
77
import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive
88
import tools.jackson.module.kotlin.readValue
99

1010
class PrimitiveTest {
11-
companion object {
12-
val mapper = jacksonObjectMapper()
13-
}
14-
1511
data class ByConstructor(
1612
val nn: Primitive = Primitive(1),
1713
val nNn: Primitive? = Primitive(2),
@@ -20,7 +16,7 @@ class PrimitiveTest {
2016

2117
@Test
2218
fun byConstructorTest() {
23-
assertEquals(ByConstructor(), mapper.readValue<ByConstructor>("{}"))
19+
assertEquals(ByConstructor(), defaultMapper.readValue<ByConstructor>("{}"))
2420
}
2521

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

3834
@Test
3935
fun byFactoryTest() {
40-
assertEquals(ByFactory.creator(), mapper.readValue<ByFactory>("{}"))
36+
assertEquals(ByFactory.creator(), defaultMapper.readValue<ByFactory>("{}"))
4137
}
4238
}

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import tools.jackson.core.JsonParser
66
import tools.jackson.databind.DeserializationContext
77
import tools.jackson.databind.annotation.JsonDeserialize
88
import tools.jackson.databind.deser.std.StdDeserializer
9-
import tools.jackson.module.kotlin.jacksonObjectMapper
9+
import tools.jackson.module.kotlin.defaultMapper
1010
import tools.jackson.module.kotlin.readValue
1111

1212
class SpecifiedForClassTest {
@@ -20,8 +20,7 @@ class SpecifiedForClassTest {
2020

2121
@Test
2222
fun directDeserTest() {
23-
val mapper = jacksonObjectMapper()
24-
val result = mapper.readValue<Value>("1")
23+
val result = defaultMapper.readValue<Value>("1")
2524

2625
assertEquals(Value(101), result)
2726
}
@@ -30,8 +29,7 @@ class SpecifiedForClassTest {
3029

3130
@Test
3231
fun paramDeserTest() {
33-
val mapper = jacksonObjectMapper()
34-
val result = mapper.readValue<Wrapper>("""{"v":1}""")
32+
val result = defaultMapper.readValue<Wrapper>("""{"v":1}""")
3533

3634
assertEquals(Wrapper(Value(101)), result)
3735
}

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ import org.junit.jupiter.api.Assertions.assertEquals
44
import org.junit.jupiter.api.Nested
55
import org.junit.jupiter.api.Test
66
import tools.jackson.databind.annotation.JsonDeserialize
7-
import tools.jackson.module.kotlin.jacksonObjectMapper
7+
import tools.jackson.module.kotlin.defaultMapper
88
import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject
99
import tools.jackson.module.kotlin.readValue
1010

1111
class NonNullObjectTest {
12-
companion object {
13-
val mapper = jacksonObjectMapper()
14-
}
15-
1612
data class NonNull(
1713
@get:JsonDeserialize(using = NonNullObject.Deserializer::class)
1814
val getterAnn: NonNullObject,
@@ -22,7 +18,7 @@ class NonNullObjectTest {
2218

2319
@Test
2420
fun nonNull() {
25-
val result = mapper.readValue<NonNull>(
21+
val result = defaultMapper.readValue<NonNull>(
2622
"""
2723
{
2824
"getterAnn" : "foo",
@@ -44,7 +40,7 @@ class NonNullObjectTest {
4440
inner class NullableTest {
4541
@Test
4642
fun nonNullInput() {
47-
val result = mapper.readValue<Nullable>(
43+
val result = defaultMapper.readValue<Nullable>(
4844
"""
4945
{
5046
"getterAnn" : "foo",
@@ -57,7 +53,7 @@ class NonNullObjectTest {
5753

5854
@Test
5955
fun nullInput() {
60-
val result = mapper.readValue<Nullable>(
56+
val result = defaultMapper.readValue<Nullable>(
6157
"""
6258
{
6359
"getterAnn" : null,

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ import org.junit.jupiter.api.Assertions.assertEquals
44
import org.junit.jupiter.api.Nested
55
import org.junit.jupiter.api.Test
66
import tools.jackson.databind.annotation.JsonDeserialize
7-
import tools.jackson.module.kotlin.jacksonObjectMapper
7+
import tools.jackson.module.kotlin.defaultMapper
88
import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject
99
import tools.jackson.module.kotlin.readValue
1010

1111
class NullableObjectTest {
12-
companion object {
13-
val mapper = jacksonObjectMapper()
14-
}
15-
1612
data class NonNull(
1713
@get:JsonDeserialize(using = NullableObject.DeserializerWrapsNullable::class)
1814
val getterAnn: NullableObject,
@@ -22,7 +18,7 @@ class NullableObjectTest {
2218

2319
@Test
2420
fun nonNull() {
25-
val result = mapper.readValue<NonNull>(
21+
val result = defaultMapper.readValue<NonNull>(
2622
"""
2723
{
2824
"getterAnn" : "foo",
@@ -44,7 +40,7 @@ class NullableObjectTest {
4440
inner class NullableTest {
4541
@Test
4642
fun nonNullInput() {
47-
val result = mapper.readValue<Nullable>(
43+
val result = defaultMapper.readValue<Nullable>(
4844
"""
4945
{
5046
"getterAnn" : "foo",
@@ -57,7 +53,7 @@ class NullableObjectTest {
5753

5854
@Test
5955
fun nullInput() {
60-
val result = mapper.readValue<Nullable>(
56+
val result = defaultMapper.readValue<Nullable>(
6157
"""
6258
{
6359
"getterAnn" : null,

‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ import org.junit.jupiter.api.Assertions.assertEquals
44
import org.junit.jupiter.api.Nested
55
import org.junit.jupiter.api.Test
66
import tools.jackson.databind.annotation.JsonDeserialize
7-
import tools.jackson.module.kotlin.jacksonObjectMapper
7+
import tools.jackson.module.kotlin.defaultMapper
88
import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive
99
import tools.jackson.module.kotlin.readValue
1010

1111
class PrimitiveTest {
12-
companion object {
13-
val mapper = jacksonObjectMapper()
14-
}
15-
1612
data class NonNull(
1713
@get:JsonDeserialize(using = Primitive.Deserializer::class)
1814
val getterAnn: Primitive,
@@ -22,7 +18,7 @@ class PrimitiveTest {
2218

2319
@Test
2420
fun nonNull() {
25-
val result = mapper.readValue<NonNull>(
21+
val result = defaultMapper.readValue<NonNull>(
2622
"""
2723
{
2824
"getterAnn" : 1,
@@ -44,7 +40,7 @@ class PrimitiveTest {
4440
inner class NullableTest {
4541
@Test
4642
fun nonNullInput() {
47-
val result = mapper.readValue<Nullable>(
43+
val result = defaultMapper.readValue<Nullable>(
4844
"""
4945
{
5046
"getterAnn" : 1,
@@ -57,7 +53,7 @@ class PrimitiveTest {
5753

5854
@Test
5955
fun nullInput() {
60-
val result = mapper.readValue<Nullable>(
56+
val result = defaultMapper.readValue<Nullable>(
6157
"""
6258
{
6359
"getterAnn" : null,

0 commit comments

Comments
 (0)