Merge pull request #441 from FasterXML/kotlin-1.5.0

dinomite · web-flow · commit 92b78168c5ca · 2021-05-25T05:43:34.000-04:00
Upgrade to Kotlin 1.5.0
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,12 @@
+language: java
+
+jdk:
+  - openjdk8
+  - openjdk11
+
+# whitelist
+branches:
+  only:
+    - master
+    - "2.13"
+    - "kotlin-1.5.0"
diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,7 @@
         <javac.src.version>1.8</javac.src.version>
         <javac.target.version>1.8</javac.target.version>
 
-        <version.kotlin>1.4.21</version.kotlin>
+        <version.kotlin>1.5.10</version.kotlin>
 
         <!-- Generate PackageVersion.java into this directory. -->
         <packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
@@ -203,6 +203,25 @@
                     <parameter>
                         <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
                         <breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
+                        <excludes>
+                            <!--
+                                TODO Remove after release of 2.13 and update the oldVersion above.
+
+                                Kotlin's method suffix generation changed in 1.4.30
+                                (https://github.com/Kotlin/KEEP/commit/e7984ffd83a1166c7f81a11d1a95b35cae929a2a#diff-012da204af6117588e5a1d3a41491bb7fe4e6c5620111c3c2d4a680c7a1057b1R653)
+                                which changes the presented API produced by these objects. While they aren't
+                                internal and should not be…they're fairly esoteric so we're ok with that breakage
+                                across a major version.
+                            -->
+                            <exclude>com.fasterxml.jackson.module.kotlin.UByteDeserializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.UByteSerializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.UIntDeserializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.UIntSerializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.ULongDeserializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.ULongSerializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.UShortDeserializer</exclude>
+                            <exclude>com.fasterxml.jackson.module.kotlin.UShortSerializer</exclude>
+                        </excludes>
                     </parameter>
                 </configuration>
                 <executions>
diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinDeserializers.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinDeserializers.kt
@@ -5,7 +5,11 @@ package com.fasterxml.jackson.module.kotlin
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.JsonToken.VALUE_NUMBER_INT
 import com.fasterxml.jackson.core.exc.InputCoercionException
-import com.fasterxml.jackson.databind.*
+import com.fasterxml.jackson.databind.BeanDescription
+import com.fasterxml.jackson.databind.DeserializationConfig
+import com.fasterxml.jackson.databind.DeserializationContext
+import com.fasterxml.jackson.databind.JavaType
+import com.fasterxml.jackson.databind.JsonDeserializer
 import com.fasterxml.jackson.databind.deser.Deserializers
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 
@@ -79,7 +83,6 @@ object ULongDeserializer : StdDeserializer<ULong>(ULong::class.java) {
         )
 }
 
-@ExperimentalUnsignedTypes
 internal class KotlinDeserializers : Deserializers.Base() {
     override fun findBeanDeserializer(
         type: JavaType,
@@ -96,4 +99,4 @@ internal class KotlinDeserializers : Deserializers.Base() {
             else -> null
         }
     }
-}
+}
diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt
@@ -4,10 +4,17 @@ import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.PropertyName
 import com.fasterxml.jackson.databind.cfg.MapperConfig
-import com.fasterxml.jackson.databind.introspect.*
+import com.fasterxml.jackson.databind.introspect.Annotated
+import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor
+import com.fasterxml.jackson.databind.introspect.AnnotatedField
+import com.fasterxml.jackson.databind.introspect.AnnotatedMember
+import com.fasterxml.jackson.databind.introspect.AnnotatedMethod
+import com.fasterxml.jackson.databind.introspect.AnnotatedParameter
+import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector
 import com.fasterxml.jackson.databind.util.BeanUtil
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
+import java.util.Locale
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
@@ -26,11 +33,15 @@ internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val c
             if (member.name.startsWith("get") &&
                     member.name.contains('-') &&
                     member.parameterCount == 0) {
-                return member.name.substringAfter("get").decapitalize().substringBefore('-')
+                return member.name.substringAfter("get")
+                    .replaceFirstChar { it.lowercase(Locale.getDefault()) }
+                    .substringBefore('-')
             } else if (member.name.startsWith("is") &&
                     member.name.contains('-') &&
                     member.parameterCount == 0) {
-                return member.name.substringAfter("is").decapitalize().substringBefore('-')
+                return member.name.substringAfter("is")
+                    .replaceFirstChar { it.lowercase(Locale.getDefault()) }
+                    .substringBefore('-')
             }
         } else if (member is AnnotatedParameter) {
             return findKotlinParameterName(member)
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github196.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github196.kt
@@ -0,0 +1,16 @@
+package com.fasterxml.jackson.module.kotlin.test.github
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import org.junit.Test
+import kotlin.test.assertSame
+
+/**
+ * An empty object should be deserialized as *the* Unit instance
+ */
+class TestGithub196 {
+    @Test
+    fun testUnitSingletonDeserialization() {
+        assertSame(jacksonObjectMapper().readValue("{}"), Unit)
+    }
+}
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github270.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github270.kt
@@ -6,7 +6,7 @@ import kotlin.test.assertEquals
 
 class TestGithub270 {
     data class Wrapper(private val field: String) {
-        val upper = field.toUpperCase()
+        val upper = field.uppercase()
         fun field() = field
         fun stillAField() = field
     }
@@ -16,4 +16,4 @@ class TestGithub270 {
         val json = jacksonObjectMapper().writeValueAsString(Wrapper("Hello"))
         assertEquals("""{"upper":"HELLO"}""", json)
     }
-}
+}
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github356.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github356.kt
@@ -20,9 +20,21 @@ class TestGithub356 {
         val original = ClassWithInlineMember(InlineClass("bar"))
         assertEquals("""{"inlineClassProperty":"bar"}""", mapper.writeValueAsString(original))
     }
+
+    @Test
+    fun deserializeValueClass() {
+        val original = ClassWithValueMember(ValueClass("bar"))
+        assertEquals(original, mapper.readValue(mapper.writeValueAsString(original)))
+    }
+
+    @Test
+    fun serializeValueClass() {
+        val original = ClassWithValueMember(ValueClass("bar"))
+        assertEquals("""{"valueClassProperty":"bar"}""", mapper.writeValueAsString(original))
+    }
 }
 
-@Suppress("EXPERIMENTAL_FEATURE_WARNING") // Enabled in test-compile
+// Deprecated usage kept at 1.5.0 upgrade; delete in the future
 inline class InlineClass(val value: String)
 
 @JsonDeserialize(builder = ClassWithInlineMember.JacksonBuilder::class)
@@ -31,3 +43,14 @@ data class ClassWithInlineMember(val inlineClassProperty: InlineClass) {
         fun build() = ClassWithInlineMember(InlineClass(inlineClassProperty))
     }
 }
+
+@Suppress("EXPERIMENTAL_FEATURE_WARNING") // Enabled in test-compile
+@JvmInline
+value class ValueClass(val value: String)
+
+@JsonDeserialize(builder = ClassWithValueMember.JacksonBuilder::class)
+data class ClassWithValueMember(val valueClassProperty: ValueClass) {
+    data class JacksonBuilder constructor(val valueClassProperty: String) {
+        fun build() = ClassWithValueMember(ValueClass(valueClassProperty))
+    }
+}
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github47.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github47.kt
@@ -1,7 +1,8 @@
 package com.fasterxml.jackson.module.kotlin.test.github
 
 import com.fasterxml.jackson.databind.MapperFeature
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.Test
 import kotlin.test.assertEquals
 
@@ -11,8 +12,9 @@ class TestGithub47 {
 
     @Test
     fun testCaseInsensitivePropertyNames() {
-        val mapper = jacksonObjectMapper()
-        mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
+        val mapper = jacksonMapperBuilder()
+            .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
+            .build()
 
         val jsonWithMismtachedPropertyName = """
                     {
@@ -23,4 +25,4 @@ class TestGithub47 {
         val item: ConfigItem = mapper.readValue<ConfigItem>(jsonWithMismtachedPropertyName)
         assertEquals("test", item.configItemId)
     }
-}
+}
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub337.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub337.kt
@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.kotlin.test.github.failing
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.MapperFeature.SORT_PROPERTIES_ALPHABETICALLY
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
 import org.junit.Ignore
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -12,17 +12,18 @@ import kotlin.test.assertEquals
  * Fields named "is…" are only serialized if they are Boolean
  */
 class TestGitHub337 {
-    private val mapper = jacksonObjectMapper()
-            .setSerializationInclusion(JsonInclude.Include.ALWAYS)
-            .configure(SORT_PROPERTIES_ALPHABETICALLY, true)
+    private val mapper = jacksonMapperBuilder()
+        .configure(SORT_PROPERTIES_ALPHABETICALLY, true)
+        .build()
+        .setSerializationInclusion(JsonInclude.Include.ALWAYS)
     private val writer = mapper.writerWithDefaultPrettyPrinter()
 
     @Test
     @Ignore
     fun test_ClassWithIsFields() {
         data class ClassWithIsFields(
-                val isBooleanField: Boolean,
-                val isIntField: Int
+            val isBooleanField: Boolean,
+            val isIntField: Int
         )
 
         val problematic = ClassWithIsFields(true, 9)
@@ -38,8 +39,8 @@ class TestGitHub337 {
     @Ignore
     fun test_AnnotatedClassWithIsFields() {
         data class ClassWithIsFields(
-                @JsonProperty("isBooleanField") val isBooleanField: Boolean,
-                @JsonProperty("isIntField") val isIntField: Int
+            @JsonProperty("isBooleanField") val isBooleanField: Boolean,
+            @JsonProperty("isIntField") val isIntField: Int
         )
 
         val problematic = ClassWithIsFields(true, 9)
@@ -54,8 +55,8 @@ class TestGitHub337 {
     @Test
     fun test_AnnotatedGetClassWithIsFields() {
         data class ClassWithIsFields(
-                @JsonProperty("isBooleanField") val isBooleanField: Boolean,
-                @get:JsonProperty("isIntField") val isIntField: Int
+            @JsonProperty("isBooleanField") val isBooleanField: Boolean,
+            @get:JsonProperty("isIntField") val isIntField: Int
         )
 
         val problematic = ClassWithIsFields(true, 9)
@@ -66,4 +67,4 @@ class TestGitHub337 {
         }""".trimIndent()
         assertEquals(expected, writer.writeValueAsString(problematic))
     }
-}
+}
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github160DisableAnnotations.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github160DisableAnnotations.kt
@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.kotlin.test.github.failing
 
 import com.fasterxml.jackson.databind.MapperFeature
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.fasterxml.jackson.module.kotlin.test.expectFailure
 import org.junit.Test
@@ -12,7 +12,9 @@ class TestGithub160 {
 
     @Test
     fun dataClass() {
-        val mapper = jacksonObjectMapper().configure(MapperFeature.USE_ANNOTATIONS, false)
+        val mapper = jacksonMapperBuilder()
+            .configure(MapperFeature.USE_ANNOTATIONS, false)
+            .build()
         expectFailure<MismatchedInputException>("GitHub #160 has been fixed!") {
             mapper.readValue<DataClass>("""{"blah":"blah"}""")
         }
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github196.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github196.kt

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@ package com.fasterxml.jackson.module.kotlin`
`5`	`5`	`import com.fasterxml.jackson.core.JsonParser`
`6`	`6`	`import com.fasterxml.jackson.core.JsonToken.VALUE_NUMBER_INT`
`7`	`7`	`import com.fasterxml.jackson.core.exc.InputCoercionException`
`8`		`-import com.fasterxml.jackson.databind.*`
	`8`	`+import com.fasterxml.jackson.databind.BeanDescription`
	`9`	`+import com.fasterxml.jackson.databind.DeserializationConfig`
	`10`	`+import com.fasterxml.jackson.databind.DeserializationContext`
	`11`	`+import com.fasterxml.jackson.databind.JavaType`
	`12`	`+import com.fasterxml.jackson.databind.JsonDeserializer`
`9`	`13`	`import com.fasterxml.jackson.databind.deser.Deserializers`
`10`	`14`	`import com.fasterxml.jackson.databind.deser.std.StdDeserializer`
`11`	`15`
`@@ -79,7 +83,6 @@ object ULongDeserializer : StdDeserializer<ULong>(ULong::class.java) {`
`79`	`83`	`)`
`80`	`84`	`}`
`81`	`85`
`82`		`-@ExperimentalUnsignedTypes`
`83`	`86`	`internal class KotlinDeserializers : Deserializers.Base() {`
`84`	`87`	`override fun findBeanDeserializer(`
`85`	`88`	`type: JavaType,`
`@@ -96,4 +99,4 @@ internal class KotlinDeserializers : Deserializers.Base() {`
`96`	`99`	`else -> null`
`97`	`100`	`}`
`98`	`101`	`}`
`99`		`-}`
	`102`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import kotlin.test.assertEquals`
`6`	`6`
`7`	`7`	`class TestGithub270 {`
`8`	`8`	`data class Wrapper(private val field: String) {`
`9`		`- val upper = field.toUpperCase()`
	`9`	`+ val upper = field.uppercase()`
`10`	`10`	`fun field() = field`
`11`	`11`	`fun stillAField() = field`
`12`	`12`	`}`
`@@ -16,4 +16,4 @@ class TestGithub270 {`
`16`	`16`	`val json = jacksonObjectMapper().writeValueAsString(Wrapper("Hello"))`
`17`	`17`	`assertEquals("""{"upper":"HELLO"}""", json)`
`18`	`18`	`}`
`19`		`-}`
	`19`	`+}`