Skip to content

Commit 0ab4018

Browse files
k163377k163377
committed
Merge remote-tracking branch 'FasterXML/2.19'
1 parent fc996d3 commit 0ab4018

File tree

9 files changed

+36
-40
lines changed

9 files changed

+36
-40
lines changed

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/JsonKeyTest.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/JsonKeyTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass
22

33
import com.fasterxml.jackson.annotation.JsonKey
4-
import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
5-
import com.fasterxml.jackson.module.kotlin.testPrettyWriter
4+
import tools.jackson.module.kotlin.jacksonMapperBuilder
5+
import tools.jackson.module.kotlin.testPrettyWriter
66
import kotlin.test.Test
77
import kotlin.test.assertEquals
88

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/jsonInclude/JsonIncludeCustomTest.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/jsonInclude/JsonIncludeCustomTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.jsonInclude
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.jsonInclude
22

33
import com.fasterxml.jackson.annotation.JsonInclude
4-
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
4+
import tools.jackson.module.kotlin.jacksonObjectMapper
55
import kotlin.test.Test
66
import kotlin.test.assertEquals
77

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/jsonInclude/JsonIncludeNonNullTest.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/jsonInclude/JsonIncludeNonNullTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.jsonInclude
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.jsonInclude
22

33
import com.fasterxml.jackson.annotation.JsonInclude
4-
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
4+
import tools.jackson.module.kotlin.jacksonObjectMapper
55
import kotlin.test.Test
66
import kotlin.test.assertEquals
77
import kotlin.test.assertNotEquals

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/jsonInclude/ValueClasses.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/jsonInclude/ValueClasses.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.jsonInclude
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.jsonInclude
22

33
@JvmInline
44
value class Primitive(val v: Int)

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/ValueClasses.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/ValueClasses.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer
22

3-
import com.fasterxml.jackson.core.JsonGenerator
4-
import com.fasterxml.jackson.databind.SerializerProvider
5-
import com.fasterxml.jackson.databind.ser.std.StdSerializer
3+
import tools.jackson.core.JsonGenerator
4+
import tools.jackson.databind.SerializationContext
5+
import tools.jackson.databind.ser.std.StdSerializer
66

77
@JvmInline
88
value class Primitive(val v: Int) {
99
class Serializer : StdSerializer<Primitive>(Primitive::class.java) {
10-
override fun serialize(value: Primitive, gen: JsonGenerator, provider: SerializerProvider) {
10+
override fun serialize(value: Primitive, gen: JsonGenerator, provider: SerializationContext) {
1111
gen.writeNumber(value.v + 100)
1212
}
1313
}
@@ -16,7 +16,7 @@ value class Primitive(val v: Int) {
1616
@JvmInline
1717
value class NonNullObject(val v: String) {
1818
class Serializer : StdSerializer<NonNullObject>(NonNullObject::class.java) {
19-
override fun serialize(value: NonNullObject, gen: JsonGenerator, provider: SerializerProvider) {
19+
override fun serialize(value: NonNullObject, gen: JsonGenerator, provider: SerializationContext) {
2020
gen.writeString("${value.v}-ser")
2121
}
2222
}
@@ -25,7 +25,7 @@ value class NonNullObject(val v: String) {
2525
@JvmInline
2626
value class NullableObject(val v: String?) {
2727
class Serializer : StdSerializer<NullableObject>(NullableObject::class.java) {
28-
override fun serialize(value: NullableObject, gen: JsonGenerator, provider: SerializerProvider) {
28+
override fun serialize(value: NullableObject, gen: JsonGenerator, provider: SerializationContext) {
2929
gen.writeString(value.v?.let { "$it-ser" } ?: "NULL")
3030
}
3131
}

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.nonNullObject
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.nonNullObject
22

3-
import com.fasterxml.jackson.databind.annotation.JsonSerialize
4-
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
5-
import com.fasterxml.jackson.module.kotlin.testPrettyWriter
6-
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NonNullObject
3+
import tools.jackson.databind.annotation.JsonSerialize
4+
import tools.jackson.module.kotlin.jacksonObjectMapper
5+
import tools.jackson.module.kotlin.testPrettyWriter
6+
import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NonNullObject
77
import kotlin.test.Test
88
import kotlin.test.assertEquals
99

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.nullableObject.byAnnotation
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.nullableObject.byAnnotation
22

3-
import com.fasterxml.jackson.databind.annotation.JsonSerialize
4-
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
5-
import com.fasterxml.jackson.module.kotlin.testPrettyWriter
6-
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject
3+
import tools.jackson.databind.annotation.JsonSerialize
4+
import tools.jackson.module.kotlin.jacksonObjectMapper
5+
import tools.jackson.module.kotlin.testPrettyWriter
6+
import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject
77
import kotlin.test.Test
88
import kotlin.test.assertEquals
99

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.nullableObject.byAnnotation
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.nullableObject.byAnnotation
22

3-
import com.fasterxml.jackson.databind.annotation.JsonSerialize
4-
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
5-
import com.fasterxml.jackson.module.kotlin.testPrettyWriter
6-
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject
3+
import tools.jackson.databind.annotation.JsonSerialize
4+
import tools.jackson.module.kotlin.jacksonObjectMapper
5+
import tools.jackson.module.kotlin.testPrettyWriter
6+
import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject
77
import kotlin.test.Test
88
import kotlin.test.assertEquals
99
import kotlin.test.assertNotEquals

‎src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt‎ renamed to ‎src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.primitive
1+
package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.byAnnotation.primitive
22

3-
import com.fasterxml.jackson.databind.ObjectMapper
4-
import com.fasterxml.jackson.databind.annotation.JsonSerialize
5-
import com.fasterxml.jackson.module.kotlin.KotlinModule
6-
import com.fasterxml.jackson.module.kotlin.testPrettyWriter
7-
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.Primitive
3+
import tools.jackson.databind.annotation.JsonSerialize
4+
import tools.jackson.module.kotlin.jacksonObjectMapper
5+
import tools.jackson.module.kotlin.testPrettyWriter
6+
import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.Primitive
87
import kotlin.test.Test
98
import kotlin.test.assertEquals
109
import kotlin.test.assertNotEquals
1110

1211
class ByAnnotationTest {
1312
companion object {
14-
val writer = KotlinModule.Builder()
15-
.build()
16-
.let { ObjectMapper().registerModule(it) }
17-
.testPrettyWriter()
13+
val writer = jacksonObjectMapper().testPrettyWriter()
1814
}
1915

2016
data class NonNullFailingSrc(

0 commit comments

Comments
 (0)