Second part of changes wrt databind/3044 (JsonSerializer->ValueSerializer)

Author: cowtowncoder

src/main/kotlin/com/fasterxml/jackson/module/kotlin/Extensions.kt

@@ -5,8 +5,8 @@ import com.fasterxml.jackson.core.TreeNode
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.*
 import com.fasterxml.jackson.databind.module.SimpleModule
-import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.ValueDeserializer
+import com.fasterxml.jackson.databind.ValueSerializer
 import com.fasterxml.jackson.databind.json.JsonMapper
 import java.io.File
 import java.io.InputStream
@@ -54,7 +54,7 @@ inline fun <reified T> ObjectReader.treeToValue(n: TreeNode): T? = treeToValue(n
 internal fun DatabindException.wrapWithPath(refFrom: Any?, refFieldName: String) = DatabindException.wrapWithPath(this, refFrom, refFieldName)
 internal fun DatabindException.wrapWithPath(refFrom: Any?, index: Int) = DatabindException.wrapWithPath(this, refFrom, index)
 
-inline fun <reified T : Any> SimpleModule.addSerializer(kClass: KClass<T>, serializer: JsonSerializer<T>) = this.apply {
+inline fun <reified T : Any> SimpleModule.addSerializer(kClass: KClass<T>, serializer: ValueSerializer<T>) = this.apply {
     addSerializer(kClass.java, serializer)
     addSerializer(kClass.javaObjectType, serializer)
 }

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinSerializers.kt

@@ -17,7 +17,7 @@ internal class KotlinSerializers : Serializers.Base() {
     override fun findSerializer(config: SerializationConfig,
                                 type: JavaType,
                                 beanDesc: BeanDescription?,
-                                formatOverrides: JsonFormat.Value?): JsonSerializer<*>? {
+                                formatOverrides: JsonFormat.Value?): ValueSerializer<*>? {
         return if (Sequence::class.java.isAssignableFrom(type.rawClass)) {
             SequenceSerializer
         } else {

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/KClassSerializerDeserializerTest.kt

@@ -3,9 +3,9 @@ package com.fasterxml.jackson.module.kotlin.test
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
-import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ValueDeserializer
+import com.fasterxml.jackson.databind.ValueSerializer
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.module.kotlin.addDeserializer
 import com.fasterxml.jackson.module.kotlin.addSerializer
@@ -50,7 +50,7 @@ data class TestDoubleData(
         val nullVal: Double?
 )
 
-class RoundingSerializer : JsonSerializer<Double>() {
+class RoundingSerializer : ValueSerializer<Double>() {
     override fun serialize(value: Double?, gen: JsonGenerator?, serializers: SerializerProvider?) {
         value?.let {
             gen?.writeNumber(BigDecimal(it).setScale(2, RoundingMode.HALF_UP))