Issue #356 Demangling kotlin getter

release-notes/CREDITS-2.x

@@ -13,8 +13,13 @@ Authors:
 
 Contributors:
 
+Wolfgang Jung (elektro-wolle@github)
+* Fixed inline class serialization
+  (2.12.1)
+
 Hideaki Tanabe (tanabe@github)
 * Brought README.md into the modern world of Gradle (compile -> implementation)
+  (2.12.0)
 
 Hidde Wieringa (hiddewie@github)
 * Contributed test case for issue 308

release-notes/VERSION-2.x

@@ -14,6 +14,10 @@ Co-maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.12.1 (not yet released)
+
+#356 Serialization of inline classes under Kotlin 1.4+
+
 2.12.0 (29-Nov-2020)
 
 #322 Added extension methods to SimpleModule addSerializer and addDeserializer to support KClass arguments

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

@@ -4,12 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.PropertyName
 import com.fasterxml.jackson.databind.cfg.MapperConfig
-import com.fasterxml.jackson.databind.introspect.Annotated
-import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor
-import com.fasterxml.jackson.databind.introspect.AnnotatedField
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember
-import com.fasterxml.jackson.databind.introspect.AnnotatedParameter
-import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector
+import com.fasterxml.jackson.databind.introspect.*
 import com.fasterxml.jackson.databind.util.BeanUtil
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
@@ -25,18 +20,22 @@ import kotlin.reflect.jvm.javaType
 import kotlin.reflect.jvm.kotlinFunction
 
 internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val cache: ReflectionCache, val ignoredClassesForImplyingJsonCreator: Set<KClass<*>>) : NopAnnotationIntrospector() {
-    /*
-    override public fun findNameForDeserialization(annotated: Annotated?): PropertyName? {
-        // This should not do introspection here, only for explicit naming by annotations
-        return null
-    }
-    */
-
     // since 2.4
     override fun findImplicitPropertyName(member: AnnotatedMember): String? {
-        if (member is AnnotatedParameter) {
+        if (member is AnnotatedMethod && member.isInlineClass()) {
+            if (member.name.startsWith("get") &&
+                    member.name.contains('-') &&
+                    member.parameterCount == 0) {
+                return member.name.substringAfter("get").decapitalize().substringBefore('-')
+            } else if (member.name.startsWith("is") &&
+                    member.name.contains('-') &&
+                    member.parameterCount == 0) {
+                return member.name.substringAfter("is").decapitalize().substringBefore('-')
+            }
+        } else if (member is AnnotatedParameter) {
             return findKotlinParameterName(member)
         }
+
         return null
     }
 
@@ -46,7 +45,8 @@ internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val c
     //  https://github.com/FasterXML/jackson-databind/issues/2527
     //  for details)
     override fun findRenameByField(config: MapperConfig<*>,
-        field: AnnotatedField, implName: PropertyName): PropertyName? {
+                                   field: AnnotatedField,
+                                   implName: PropertyName): PropertyName? {
         val origSimple = implName.simpleName
         if (field.declaringClass.isKotlinClass() && origSimple.startsWith("is")) {
             val mangledName: String? = BeanUtil.stdManglePropertyName(origSimple, 2)
@@ -63,7 +63,7 @@ internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val c
 
         if (member is AnnotatedConstructor && !member.declaringClass.isEnum) {
             // if has parameters, is a Kotlin class, and the parameters all have parameter annotations, then pretend we have a JsonCreator
-            if (member.getParameterCount() > 0 && member.declaringClass.isKotlinClass()) {
+            if (member.parameterCount > 0 && member.declaringClass.isKotlinClass()) {
                 return cache.checkConstructorIsCreatorAnnotated(member) {
                     val kClass = cache.kotlinFromJava(member.declaringClass as Class<Any>)
                     val kConstructor = cache.kotlinFromJava(member.annotated as Constructor<Any>)
@@ -83,7 +83,7 @@ internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val c
                         }
 
                         fun Collection<KFunction<*>>.filterOutSingleStringCallables(): Collection<KFunction<*>> {
-                            return this.filter {  !it.isPossibleSingleString() }
+                            return this.filter { !it.isPossibleSingleString() }
                         }
 
                         val anyConstructorHasJsonCreator = kClass.constructors.filterOutSingleStringCallables()
@@ -158,3 +158,5 @@ internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val c
         }
     }
 }
+
+private fun AnnotatedMethod.isInlineClass() = declaringClass.declaredMethods.any { it.name.contains('-') }