Skip to content

Commit c1faf25

Browse files
k163377k163377
authored
Merge pull request #345 from ProjectMapK/default-mapper
Replace the non-custom mapper with defaultMapper
2 parents bc663f8 + 5872ecc commit c1faf25

File tree

87 files changed

+345
-493
lines changed

Some content is hidden

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

87 files changed

+345
-493
lines changed

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ClosedRangesTest.kt‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,36 @@
11
package io.github.projectmapk.jackson.module.kogera.zIntegration
22

33
import io.github.projectmapk.jackson.module.kogera.ClosedRangeResolver
4-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
4+
import io.github.projectmapk.jackson.module.kogera.defaultMapper
55
import io.github.projectmapk.jackson.module.kogera.readValue
66
import org.junit.jupiter.api.Assertions.assertEquals
77
import org.junit.jupiter.api.Assertions.assertNotNull
88
import org.junit.jupiter.api.Test
99

1010
class ClosedRangesTest {
11-
companion object {
12-
val mapper = jacksonObjectMapper()
13-
}
14-
1511
@Test
1612
fun intLikeRange() {
1713
val src = IntRange(0, 1)
18-
val json = mapper.writeValueAsString(src)
19-
val result = mapper.readValue<IntRange>(json)
14+
val json = defaultMapper.writeValueAsString(src)
15+
val result = defaultMapper.readValue<IntRange>(json)
2016

2117
assertEquals(src, result)
2218
}
2319

2420
@Test
2521
fun closedDoubleRange() {
2622
val src: ClosedFloatingPointRange<Double> = 0.0..1.0
27-
val json = mapper.writeValueAsString(src)
28-
val result = mapper.readValue<ClosedRange<Double>>(json)
23+
val json = defaultMapper.writeValueAsString(src)
24+
val result = defaultMapper.readValue<ClosedRange<Double>>(json)
2925

3026
assertEquals(src, result)
3127
}
3228

3329
@Test
3430
fun closedFloatRange() {
3531
val src: ClosedFloatingPointRange<Float> = 0.0f..1.0f
36-
val json = mapper.writeValueAsString(src)
37-
val result = mapper.readValue<ClosedFloatingPointRange<Float>>(json)
32+
val json = defaultMapper.writeValueAsString(src)
33+
val result = defaultMapper.readValue<ClosedFloatingPointRange<Float>>(json)
3834

3935
assertEquals(src, result)
4036
}
@@ -46,8 +42,8 @@ class ClosedRangesTest {
4642
@Test
4743
fun comparableRange() {
4844
val src: ClosedRange<Wrapper> = Wrapper(0)..Wrapper(1)
49-
val json = mapper.writeValueAsString(src)
50-
val result = mapper.readValue<ClosedRange<Wrapper>>(json)
45+
val json = defaultMapper.writeValueAsString(src)
46+
val result = defaultMapper.readValue<ClosedRange<Wrapper>>(json)
5147

5248
assertEquals(src, result)
5349
}

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/HasRequiredMarkerTest.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.BeanDescription
66
import com.fasterxml.jackson.databind.ObjectMapper
77
import io.github.projectmapk.jackson.module.kogera.KotlinFeature
88
import io.github.projectmapk.jackson.module.kogera.KotlinModule
9-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
9+
import io.github.projectmapk.jackson.module.kogera.defaultMapper
1010
import org.junit.jupiter.api.Assertions.assertFalse
1111
import org.junit.jupiter.api.Assertions.assertTrue
1212
import org.junit.jupiter.api.Nested
@@ -20,7 +20,6 @@ class HasRequiredMarkerTest {
2020
.find { it.name == propertyName }
2121
?.isRequired == true
2222

23-
val defaultMapper = jacksonObjectMapper()
2423
val nullToDefaultMapper = ObjectMapper().registerModule(
2524
KotlinModule.Builder()
2625
.enable(KotlinFeature.NullToEmptyCollection)

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/JsonSetterTest.kt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
33
import com.fasterxml.jackson.annotation.JsonSetter
44
import com.fasterxml.jackson.annotation.Nulls
55
import com.fasterxml.jackson.databind.exc.InvalidNullException
6-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
6+
import io.github.projectmapk.jackson.module.kogera.defaultMapper
77
import io.github.projectmapk.jackson.module.kogera.readValue
88
import org.junit.jupiter.api.Assertions.assertEquals
99
import org.junit.jupiter.api.Assertions.assertTrue
@@ -12,13 +12,11 @@ import org.junit.jupiter.api.Test
1212
import org.junit.jupiter.api.assertThrows
1313

1414
class JsonSetterTest {
15-
val mapper = jacksonObjectMapper()
16-
1715
data class NullsSkip(@JsonSetter(nulls = Nulls.SKIP) val v: Int = -1)
1816

1917
@Test
2018
fun nullsSkip() {
21-
val d = mapper.readValue<NullsSkip>("""{"v":null}""")
19+
val d = defaultMapper.readValue<NullsSkip>("""{"v":null}""")
2220

2321
assertEquals(-1, d.v)
2422
}
@@ -30,14 +28,14 @@ class JsonSetterTest {
3028
@Test
3129
fun onNull() {
3230
assertThrows<InvalidNullException> {
33-
mapper.readValue<NullsFail>("""{"v":null}""")
31+
defaultMapper.readValue<NullsFail>("""{"v":null}""")
3432
}
3533
}
3634

3735
@Test
3836
fun onMissing() {
3937
assertThrows<InvalidNullException> {
40-
mapper.readValue<NullsFail>("""{}""")
38+
defaultMapper.readValue<NullsFail>("""{}""")
4139
}
4240
}
4341
}
@@ -48,13 +46,13 @@ class JsonSetterTest {
4846
inner class NullsAsEmptyTest {
4947
@Test
5048
fun onNull() {
51-
val d = mapper.readValue<NullsAsEmpty>("""{"v":null}""")
49+
val d = defaultMapper.readValue<NullsAsEmpty>("""{"v":null}""")
5250
assertTrue(d.v.isEmpty())
5351
}
5452

5553
@Test
5654
fun onMissing() {
57-
val d = mapper.readValue<NullsAsEmpty>("""{}""")
55+
val d = defaultMapper.readValue<NullsAsEmpty>("""{}""")
5856
assertTrue(d.v.isEmpty())
5957
}
6058
}

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/VarargTest.kt‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
22

3-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
3+
import io.github.projectmapk.jackson.module.kogera.defaultMapper
44
import io.github.projectmapk.jackson.module.kogera.readValue
55
import org.junit.jupiter.api.Assertions.assertEquals
66
import org.junit.jupiter.api.Assertions.assertTrue
77
import org.junit.jupiter.api.Nested
88
import org.junit.jupiter.api.Test
99

1010
class VarargTest {
11-
val mapper = jacksonObjectMapper()
12-
1311
class OnlyVararg(vararg val v: Int)
1412

1513
@Nested
1614
inner class OnlyVarargTest {
1715
@Test
1816
fun hasArgs() {
19-
val r = mapper.readValue<OnlyVararg>("""{"v":[1,2,3]}""")
17+
val r = defaultMapper.readValue<OnlyVararg>("""{"v":[1,2,3]}""")
2018
assertEquals(listOf(1, 2, 3), r.v.asList())
2119
}
2220

2321
@Test
2422
fun empty() {
25-
val r = mapper.readValue<OnlyVararg>("""{"v":[]}""")
23+
val r = defaultMapper.readValue<OnlyVararg>("""{"v":[]}""")
2624
assertTrue(r.v.isEmpty())
2725
}
2826

2927
@Test
3028
fun undefined() {
31-
val r = mapper.readValue<OnlyVararg>("""{}""")
29+
val r = defaultMapper.readValue<OnlyVararg>("""{}""")
3230
assertTrue(r.v.isEmpty())
3331
}
3432
}
@@ -39,21 +37,21 @@ class VarargTest {
3937
inner class HeadVarargTest {
4038
@Test
4139
fun hasArgs() {
42-
val r = mapper.readValue<HeadVararg>("""{"i":0,"v":[1,2,null]}""")
40+
val r = defaultMapper.readValue<HeadVararg>("""{"i":0,"v":[1,2,null]}""")
4341
assertEquals(listOf(1, 2, null), r.v.asList())
4442
assertEquals(0, r.i)
4543
}
4644

4745
@Test
4846
fun empty() {
49-
val r = mapper.readValue<HeadVararg>("""{"i":0,"v":[]}""")
47+
val r = defaultMapper.readValue<HeadVararg>("""{"i":0,"v":[]}""")
5048
assertTrue(r.v.isEmpty())
5149
assertEquals(0, r.i)
5250
}
5351

5452
@Test
5553
fun undefined() {
56-
val r = mapper.readValue<HeadVararg>("""{"i":0}""")
54+
val r = defaultMapper.readValue<HeadVararg>("""{"i":0}""")
5755
assertTrue(r.v.isEmpty())
5856
assertEquals(0, r.i)
5957
}
@@ -65,21 +63,21 @@ class VarargTest {
6563
inner class TailVarargTest {
6664
@Test
6765
fun hasArgs() {
68-
val r = mapper.readValue<TailVararg>("""{"i":0,"v":["foo","bar","baz"]}""")
66+
val r = defaultMapper.readValue<TailVararg>("""{"i":0,"v":["foo","bar","baz"]}""")
6967
assertEquals(listOf("foo", "bar", "baz"), r.v.asList())
7068
assertEquals(0, r.i)
7169
}
7270

7371
@Test
7472
fun empty() {
75-
val r = mapper.readValue<TailVararg>("""{"i":0,"v":[]}""")
73+
val r = defaultMapper.readValue<TailVararg>("""{"i":0,"v":[]}""")
7674
assertTrue(r.v.isEmpty())
7775
assertEquals(0, r.i)
7876
}
7977

8078
@Test
8179
fun undefined() {
82-
val r = mapper.readValue<TailVararg>("""{"i":0}""")
80+
val r = defaultMapper.readValue<TailVararg>("""{"i":0}""")
8381
assertTrue(r.v.isEmpty())
8482
assertEquals(0, r.i)
8583
}
@@ -91,19 +89,19 @@ class VarargTest {
9189
inner class HasDefaultVarargTest {
9290
@Test
9391
fun hasArgs() {
94-
val r = mapper.readValue<HasDefaultVararg>("""{"v":["foo","bar",null]}""")
92+
val r = defaultMapper.readValue<HasDefaultVararg>("""{"v":["foo","bar",null]}""")
9593
assertEquals(listOf("foo", "bar", null), r.v.asList())
9694
}
9795

9896
@Test
9997
fun empty() {
100-
val r = mapper.readValue<HasDefaultVararg>("""{"v":[]}""")
98+
val r = defaultMapper.readValue<HasDefaultVararg>("""{"v":[]}""")
10199
assertTrue(r.v.isEmpty())
102100
}
103101

104102
@Test
105103
fun undefined() {
106-
val r = mapper.readValue<HasDefaultVararg>("""{}""")
104+
val r = defaultMapper.readValue<HasDefaultVararg>("""{}""")
107105
assertEquals(listOf("foo", "bar"), r.v.asList())
108106
}
109107
}

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/deserializer/MissingAbsentValueTest.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonParser
44
import com.fasterxml.jackson.databind.DeserializationContext
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
66
import com.fasterxml.jackson.databind.deser.std.StdDeserializer
7-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
7+
import io.github.projectmapk.jackson.module.kogera.defaultMapper
88
import io.github.projectmapk.jackson.module.kogera.readValue
99
import org.junit.jupiter.api.Assertions.assertEquals
1010
import org.junit.jupiter.api.Test
@@ -25,8 +25,7 @@ class MissingAbsentValueTest {
2525

2626
@Test
2727
fun test() {
28-
val mapper = jacksonObjectMapper()
29-
val result = mapper.readValue<D>("{}")
28+
val result = defaultMapper.readValue<D>("{}")
3029

3130
assertEquals(D(-1, -1), result)
3231
}

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/NullableObjectEdgeCases.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.DeserializationContext
77
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
88
import com.fasterxml.jackson.databind.deser.std.StdDeserializer
99
import com.fasterxml.jackson.databind.exc.ValueInstantiationException
10+
import io.github.projectmapk.jackson.module.kogera.defaultMapper
1011
import io.github.projectmapk.jackson.module.kogera.deser.WrapsNullableValueClassDeserializer
11-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
1212
import io.github.projectmapk.jackson.module.kogera.readValue
1313
import org.junit.jupiter.api.Assertions.assertEquals
1414
import org.junit.jupiter.api.Test
@@ -37,7 +37,7 @@ class NullableObjectEdgeCases {
3737

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

@@ -61,7 +61,7 @@ class NullableObjectEdgeCases {
6161
@Test
6262
fun `Nulls_SKIP works`() {
6363
assertThrows<ValueInstantiationException>("#51 fixed") {
64-
val result = jacksonObjectMapper().readValue<NullsSkip>("""{"nn":null,"n":null}""")
64+
val result = defaultMapper.readValue<NullsSkip>("""{"nn":null,"n":null}""")
6565
assertEquals(NullValue(VC("skip"), VC("skip")), result)
6666
}
6767
}

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass
22

33
import io.github.projectmapk.jackson.module.kogera.defaultMapper
4-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
54
import io.github.projectmapk.jackson.module.kogera.readValue
65
import org.junit.jupiter.api.Assertions
76
import org.junit.jupiter.api.Assertions.assertEquals
@@ -13,7 +12,6 @@ import java.lang.reflect.InvocationTargetException
1312

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

@@ -78,8 +76,8 @@ class WithoutCustomDeserializeMethodTest {
7876
TwoUnitPrimitive(3),
7977
TwoUnitPrimitive(4)
8078
)
81-
val src = mapper.writeValueAsString(expected)
82-
val result = mapper.readValue<Dst>(src)
79+
val src = defaultMapper.writeValueAsString(expected)
80+
val result = defaultMapper.readValue<Dst>(src)
8381

8482
assertEquals(expected, result)
8583
}
@@ -96,8 +94,8 @@ class WithoutCustomDeserializeMethodTest {
9694
TwoUnitPrimitive(3),
9795
null
9896
)
99-
val src = mapper.writeValueAsString(expected)
100-
val result = mapper.readValue<Dst>(src)
97+
val src = defaultMapper.writeValueAsString(expected)
98+
val result = defaultMapper.readValue<Dst>(src)
10199

102100
assertEquals(expected, result)
103101
}

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.defaultArgument
22

33
import com.fasterxml.jackson.annotation.JsonCreator
4-
import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
4+
import io.github.projectmapk.jackson.module.kogera.defaultMapper
55
import io.github.projectmapk.jackson.module.kogera.readValue
66
import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NonNullObject
77
import org.junit.jupiter.api.Assertions.assertEquals
88
import org.junit.jupiter.api.Test
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
}

0 commit comments

Comments
 (0)