Skip to content

Commit 7d8412b

Browse files
committed
Unified property name
In addition, optimize imports.
1 parent d17465a commit 7d8412b

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.fasterxml.jackson.module.kotlin
22

3-
import com.fasterxml.jackson.annotation.JsonCreator
43
import com.fasterxml.jackson.annotation.JsonProperty
54
import com.fasterxml.jackson.databind.JavaType
65
import com.fasterxml.jackson.databind.cfg.MapperConfig
76
import com.fasterxml.jackson.databind.introspect.Annotated
87
import com.fasterxml.jackson.databind.introspect.AnnotatedClass
9-
import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor
108
import com.fasterxml.jackson.databind.introspect.AnnotatedMember
119
import com.fasterxml.jackson.databind.introspect.AnnotatedMethod
1210
import com.fasterxml.jackson.databind.introspect.AnnotatedParameter
@@ -16,18 +14,15 @@ import java.lang.reflect.Constructor
1614
import java.util.Locale
1715
import kotlin.reflect.KClass
1816
import kotlin.reflect.KFunction
19-
import kotlin.reflect.full.companionObject
20-
import kotlin.reflect.full.declaredFunctions
2117
import kotlin.reflect.full.hasAnnotation
2218
import kotlin.reflect.full.memberProperties
2319
import kotlin.reflect.full.primaryConstructor
24-
import kotlin.reflect.jvm.javaConstructor
2520
import kotlin.reflect.jvm.javaGetter
2621
import kotlin.reflect.jvm.javaType
2722

2823
internal class KotlinNamesAnnotationIntrospector(
2924
private val cache: ReflectionCache,
30-
private val useKotlinPropertyNameForGetter: Boolean
25+
private val kotlinPropertyNameAsImplicitName: Boolean
3126
) : NopAnnotationIntrospector() {
3227
private fun getterNameFromJava(member: AnnotatedMethod): String? {
3328
val name = member.name
@@ -67,7 +62,7 @@ internal class KotlinNamesAnnotationIntrospector(
6762

6863
return when (member) {
6964
is AnnotatedMethod -> if (member.parameterCount == 0) {
70-
if (useKotlinPropertyNameForGetter) {
65+
if (kotlinPropertyNameAsImplicitName) {
7166
// Fall back to default if it is a getter-like function
7267
getterNameFromKotlin(member) ?: getterNameFromJava(member)
7368
} else getterNameFromJava(member)

0 commit comments

Comments
 (0)