Merge pull request #438 from k163377/fix_on_named_companion

Fixed mapping failure when `private` `companion object` is nammed.

Author: dinomite

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

@@ -71,7 +71,7 @@ internal class KotlinValueInstantiator(
                 possibleCompanion.objectInstance
             } catch (ex: IllegalAccessException) {
                 // fallback for when an odd access exception happens through Kotlin reflection
-                val companionField = possibleCompanion.java.enclosingClass.fields.firstOrNull { it.name == "Companion" }
+                val companionField = possibleCompanion.java.enclosingClass.fields.firstOrNull { it.type.kotlin.isCompanion }
                         ?: throw ex
                 val accessible = companionField.isAccessible
                 if ((!accessible && ctxt.config.isEnabled(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)) ||

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

@@ -197,6 +197,23 @@ class TestJacksonWithKotlin {
         }
     }
 
+    private class StateObjectWithFactoryOnNamedCompanion private constructor (override val name: String, override val age: Int, override val primaryAddress: String, override val wrongName: Boolean, override val createdDt: Date) : TestFields {
+        var factoryUsed: Boolean = false
+        companion object Named {
+            @JvmStatic @JsonCreator fun create(@JsonProperty("name") nameThing: String, @JsonProperty("age") age: Int, @JsonProperty("primaryAddress") primaryAddress: String, @JsonProperty("renamed") wrongName: Boolean, @JsonProperty("createdDt") createdDt: Date): StateObjectWithFactoryOnNamedCompanion {
+                val obj = StateObjectWithFactoryOnNamedCompanion(nameThing, age, primaryAddress, wrongName, createdDt)
+                obj.factoryUsed = true
+                return obj
+            }
+        }
+    }
+
+    @Test fun findingFactoryMethod3() {
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, StateObjectWithFactoryOnNamedCompanion::class.java)
+        stateObj.validate()
+        assertThat(stateObj.factoryUsed, equalTo(true))
+    }
+
     // GH #14 failing due to this enum type
     data class Gh14FailureWithEnum(var something: String = "hi", var someEnum: LaunchType = LaunchType.ACTIVITY)