Merge pull request #497 from Fuud/fix_treeToValue

treeToValue extensions function should not have type erasure

Author: dinomite

release-notes/CREDITS-2.x

@@ -13,6 +13,10 @@ Authors:
 
 Contributors:
 
+Fedor Bobin (Fuud@github)
+* #496, #45: Fix treeToValue extension function should not have type erasure
+  (2.13)
+
 Mikhael Sokolov (sokomishalov@github)
 * #489: JsonNode, ArrayNode and ObjectNode extension functions
 

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

@@ -46,12 +46,12 @@ inline fun <reified T> ObjectMapper.readValue(src: Reader): T = readValue(src, j
 inline fun <reified T> ObjectMapper.readValue(src: InputStream): T = readValue(src, jacksonTypeRef<T>())
 inline fun <reified T> ObjectMapper.readValue(src: ByteArray): T = readValue(src, jacksonTypeRef<T>())
 
-inline fun <reified T> ObjectMapper.treeToValue(n: TreeNode): T? = treeToValue(n, T::class.java)
+inline fun <reified T> ObjectMapper.treeToValue(n: TreeNode): T = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
 inline fun <reified T> ObjectMapper.convertValue(from: Any): T = convertValue(from, jacksonTypeRef<T>())
 
 inline fun <reified T> ObjectReader.readValueTyped(jp: JsonParser): T = readValue(jp, jacksonTypeRef<T>())
 inline fun <reified T> ObjectReader.readValuesTyped(jp: JsonParser): Iterator<T> = readValues(jp, jacksonTypeRef<T>())
-inline fun <reified T> ObjectReader.treeToValue(n: TreeNode): T? = treeToValue(n, T::class.java)
+inline fun <reified T> ObjectReader.treeToValue(n: TreeNode): T? = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
 
 operator fun ArrayNode.plus(element: Boolean) = Unit.apply { add(element) }
 operator fun ArrayNode.plus(element: Short) = Unit.apply { add(element) }

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

@@ -61,4 +61,19 @@ class TestExtensionMethods {
         (4 downTo 0).forEach { arrayNode -= it }
         assertThat(arrayNode.size(), `is`(0))
     }
+
+    @Test fun noTypeErasure(){
+        data class Person(val name: String)
+        val source = """[ { "name" : "Neo" } ]"""
+        val tree = mapper.readTree(source)
+
+        val readValueResult: List<Person> = mapper.readValue(source)
+        assertThat(readValueResult, `is`(listOf(Person("Neo"))))
+
+        val treeToValueResult: List<Person> = mapper.treeToValue(tree)
+        assertThat(treeToValueResult, `is`(listOf(Person("Neo"))))
+
+        val convertValueResult: List<Person> = mapper.convertValue(tree)
+        assertThat(convertValueResult, `is`(listOf(Person("Neo"))))
+    }
 }