Fixed thrown exception to RuntimeJsonMappingException

Author: k163377

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

@@ -4,12 +4,12 @@ import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.TreeNode
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.JsonDeserializer
-import com.fasterxml.jackson.databind.JsonMappingException
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.MappingIterator
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.ObjectReader
+import com.fasterxml.jackson.databind.RuntimeJsonMappingException
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.node.ArrayNode
@@ -57,10 +57,11 @@ inline fun <reified T> jacksonTypeRef(): TypeReference<T> = object: TypeReferenc
 inline fun <reified T> Any?.checkTypeMismatch(): T {
     // Basically, this check assumes that T is non-null and the value is null.
     // Since this can be caused by both input or ObjectMapper implementation errors,
-    // a more abstract JsonMappingException is thrown.
+    // a more abstract RuntimeJsonMappingException is thrown.
     if (this !is T) {
-        throw JsonMappingException(
-            null,
+        // Since the databind implementation of MappingIterator throws RuntimeJsonMappingException,
+        // JsonMappingException was not used to unify the behavior.
+        throw RuntimeJsonMappingException(
             "Deserialized value did not match the specified type; " +
                     "specified ${T::class.qualifiedName} but was ${this?.let { it::class.qualifiedName }}"
         )

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

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.module.kotlin
 
-import com.fasterxml.jackson.databind.JsonMappingException
+import com.fasterxml.jackson.databind.RuntimeJsonMappingException
 import com.fasterxml.jackson.databind.node.NullNode
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
@@ -13,15 +13,15 @@ class ReadValueTest {
         @Test
         fun jsonParser() {
             val src = defaultMapper.createParser("null")
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.readValue<String>(src)
-            }
+            }.printStackTrace()
         }
 
         @Test
         fun file() {
             val src = createTempJson("null")
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.readValue<String>(src)
             }
         }
@@ -34,45 +34,45 @@ class ReadValueTest {
         @Test
         fun string() {
             val src = "null"
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.readValue<String>(src)
             }
         }
 
         @Test
         fun reader() {
             val src = StringReader("null")
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.readValue<String>(src)
             }
         }
 
         @Test
         fun inputStream() {
             val src = "null".byteInputStream()
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.readValue<String>(src)
             }
         }
 
         @Test
         fun byteArray() {
             val src = "null".toByteArray()
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.readValue<String>(src)
             }
         }
 
         @Test
         fun treeToValueTreeNode() {
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.treeToValue<String>(NullNode.instance)
             }
         }
 
         @Test
         fun convertValueAny() {
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 defaultMapper.convertValue<String>(null)
             }
         }
@@ -81,7 +81,7 @@ class ReadValueTest {
         fun readValueTypedJsonParser() {
             val reader = defaultMapper.reader()
             val src = reader.createParser("null")
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 reader.readValueTyped<String>(src)
             }
         }

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

@@ -2,7 +2,6 @@ package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
-import com.fasterxml.jackson.databind.JsonMappingException
 import com.fasterxml.jackson.databind.RuntimeJsonMappingException
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.fasterxml.jackson.databind.module.SimpleModule
@@ -46,7 +45,7 @@ class ReadValuesTest {
             val itr = mapper.readValues<String>(src)
 
             assertEquals("foo", itr.nextValue())
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 itr.nextValue()
             }
         }
@@ -58,7 +57,7 @@ class ReadValuesTest {
             val itr = reader.readValuesTyped<String>(src)
 
             assertEquals("foo", itr.next())
-            assertThrows<JsonMappingException> {
+            assertThrows<RuntimeJsonMappingException> {
                 itr.next()
             }
         }