Merge branch '2.12' into 2.13

Author: dinomite

release-notes/CREDITS-2.x

@@ -13,6 +13,14 @@ Authors:
 
 Contributors:
 
+Christopher Mason (masoncj@github)
+* #194: Contributed test case for @JsonIdentityInfo usage
+  (2.12.NEXT)
+
+Martin Häusler (MartinHaeusler@github)
+* Reported #194: @JsonIdentityInfo bug
+  (2.12.NEXT)
+
 Eric Fenderbosch (efenderbosch@github)
 * Fixed #182: Serialize unsigned numbers
   (2.12.2)

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

@@ -0,0 +1,49 @@
+package com.fasterxml.jackson.module.kotlin.test.github
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo
+import com.fasterxml.jackson.annotation.ObjectIdGenerators
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import org.junit.Test
+import java.util.UUID
+import kotlin.test.assertEquals
+
+class TestGithub194 {
+    val id: UUID = UUID.fromString("149800a6-7855-4e09-9185-02e442da8013")
+    val json = """{"id": "$id", "name": "Foo"}"""
+
+    @Test
+    fun testIdentityInfo() {
+        val mapper = jacksonObjectMapper()
+        val value = mapper.readValue(json, WithIdentity::class.java)
+        assertEquals(id, value.id)
+        assertEquals(id.toString(), value.idString)
+        assertEquals("Foo", value.name)
+    }
+
+    @JsonIdentityInfo(
+            property = "id",
+            scope = WithIdentity::class,
+            generator = ObjectIdGenerators.PropertyGenerator::class
+    )
+    class WithIdentity(val id: UUID,
+                       val idString: String = id.toString(),
+                       val name: String)
+
+    @Test
+    fun testIdentityInfo_WithDefaultId() {
+        val mapper = jacksonObjectMapper()
+        val value = mapper.readValue(json, WithIdentityAndDefaultId::class.java)
+        assertEquals(id, value.id)
+        assertEquals(id.toString(), value.idString)
+        assertEquals("Foo", value.name)
+    }
+
+    @JsonIdentityInfo(
+            property = "id",
+            scope = WithIdentityAndDefaultId::class,
+            generator = ObjectIdGenerators.PropertyGenerator::class
+    )
+    class WithIdentityAndDefaultId(val id: UUID,
+                                   val idString: String = id.toString(),
+                                   val name: String)
+}