Skip to content

Commit 94afb47

Browse files
committed
Remove meaningless checks and properties in KNAI
1 parent 4fbe48d commit 94afb47

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ class KotlinModule private constructor(
8989
builder.isEnabled(UseJavaDurationConversion),
9090
)
9191

92-
private val ignoredClassesForImplyingJsonCreator = emptySet<KClass<*>>()
93-
9492
override fun setupModule(context: SetupContext) {
9593
super.setupModule(context)
9694

@@ -114,12 +112,7 @@ class KotlinModule private constructor(
114112
nullIsSameAsDefault,
115113
useJavaDurationConversion
116114
))
117-
context.appendAnnotationIntrospector(
118-
KotlinNamesAnnotationIntrospector(
119-
cache,
120-
ignoredClassesForImplyingJsonCreator,
121-
kotlinPropertyNameAsImplicitName)
122-
)
115+
context.appendAnnotationIntrospector(KotlinNamesAnnotationIntrospector(cache, kotlinPropertyNameAsImplicitName))
123116

124117
context.addDeserializers(KotlinDeserializers(cache, useJavaDurationConversion))
125118
context.addKeyDeserializers(KotlinKeyDeserializers)

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

-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import kotlin.reflect.jvm.javaType
2323

2424
internal class KotlinNamesAnnotationIntrospector(
2525
private val cache: ReflectionCache,
26-
private val ignoredClassesForImplyingJsonCreator: Set<KClass<*>>,
2726
private val useKotlinPropertyNameForGetter: Boolean
2827
) : NopAnnotationIntrospector() {
2928
private fun getterNameFromJava(member: AnnotatedMethod): String? {
@@ -89,7 +88,6 @@ internal class KotlinNamesAnnotationIntrospector(
8988
// don't add a JsonCreator to any constructor if one is declared already
9089

9190
val kClass = member.declaringClass.kotlin
92-
.apply { if (this in ignoredClassesForImplyingJsonCreator) return false }
9391
val kConstructor = cache.kotlinFromJava(member.annotated) ?: return false
9492

9593
// TODO: should we do this check or not? It could cause failures if we miss another way a property could be set

0 commit comments

Comments
 (0)