Merge remote-tracking branch 'origin/2.12' into github-396-missing-xml-constructor

Author: dinomite

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.10</version.kotlin>
+        <version.kotlin>1.4.21</version.kotlin>
 
         <!-- Generate PackageVersion.java into this directory. -->
         <packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>

release-notes/VERSION-2.x

@@ -25,6 +25,7 @@ Co-maintainers:
 #385: Add Moditect, source module info, to allow Kotlin module usage with Java Module system
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 
+2.11.4 (12-Dec-2020)
 2.11.3 (02-Oct-2020)
 2.11.2 (02-Aug-2020)
 

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/GithubDatabind1329.kt

@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.test.failing
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.fasterxml.jackson.annotation.JsonTypeName
-import com.fasterxml.jackson.module.kotlin.*
-import org.junit.Ignore
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
@@ -60,4 +60,4 @@ class GithubDatabind1329 {
         CONTACT,
         USER
     }
-}
+}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github145.kt

@@ -125,7 +125,7 @@ class TestGithub145 {
         }
     }
     @Test
-    @Ignore("Broke at some point on 2.12 branch (before automated tests were working); fixe for 2.12 release")
+    @Ignore("Broke at some point on 2.12 branch (before automated tests were working)")
     fun testPersonGood7() {
         val personGood7String = objectMapper.readValue<PersonGood7>(""""TestPreName,TestLastname"""")
         val personGood7Json =

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github180.kt

@@ -5,10 +5,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.Test
+import kotlin.test.assertNull
 
-class Github180_JsonCreatorTest {
+class TestGithub180 {
     class TestClass(val instantName: String? = null, val someInt: Int? = null) {
-
         companion object {
             @JvmStatic
             @JsonCreator
@@ -25,5 +25,7 @@ class Github180_JsonCreatorTest {
     @Test
     fun testMissingProperty() {
         val obj = jacksonObjectMapper().readValue<TestClass>("""{}""")
+        assertNull(obj.instantName)
+        assertNull(obj.someInt)
     }
-}
+}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github308.kt

@@ -10,8 +10,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
-class Github308 {
-
+class TestGithub308 {
     @JsonIgnoreProperties(ignoreUnknown = true)
     data class TestDto(
             @JsonIgnore
@@ -32,4 +31,4 @@ class Github308 {
         assertNull(dto.id)
         assertEquals(dto.cityId, 12345)
     }
-}
+}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github88.kt

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import org.junit.Test
 import kotlin.test.assertEquals
 
-class Github88 {
+class TestGithub88 {
     class CloneableKotlinObj(val id: String) : Cloneable
 
     @Test
@@ -20,5 +20,4 @@ class Github88 {
 
         assertEquals("{\"id\":\"123\"}", result)
     }
-
-}
+}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github91.kt

@@ -7,11 +7,10 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-class Github91Test {
-
+class TestGithub91 {
     data class DataClass1(val name: String, val content: DataClass2)
 
-    data class DataClass2 @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor (@JsonValue val content: String)
+    data class DataClass2 @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor(@JsonValue val content: String)
 
     private val jsonData = """
         {
@@ -27,4 +26,4 @@ class Github91Test {
         assertEquals(DataClass1("my name", DataClass2("some value")), dataClass1)
         assertEquals("{\"name\":\"my name\",\"content\":\"some value\"}", mapper.writeValueAsString(dataClass1))
     }
-}
+}