Merge pull request #920 from k163377/reafctors

Minor refactors that do not affect behavior

Author: k163377

release-notes/CREDITS-2.x

@@ -15,7 +15,12 @@ Authors:
 
 Contributors:
 
-# 2.18.3 (not yet released)
+# 2.18.4 (not yet released)
+
+WrongWrong (@k163377)
+* #920: Minor refactors that do not affect behavior
+
+# 2.18.3 (28-Feb-2025)
 
 WrongWrong (@k163377)
 * #908: Additional fixes related to #904.

release-notes/VERSION-2.x

@@ -16,6 +16,10 @@ Co-maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.18.4 (not yet released)
+
+#920: Minor refactorings were made that did not affect behavior.
+
 2.18.3 (28-Feb-2025)
 
 #904: Fixed a problem where context was not being propagated properly when serializing an unboxed value of `value class`

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

@@ -50,7 +50,7 @@ internal class KotlinAnnotationIntrospector(
                     }
                     else -> null
                 }
-            } catch (ex: UnsupportedOperationException) {
+            } catch (_: UnsupportedOperationException) {
                 null
             }
         }
@@ -107,7 +107,7 @@ internal class KotlinAnnotationIntrospector(
     }
 
     private fun AccessibleObject.isRequiredByAnnotation(): Boolean? = annotations
-        ?.firstOrNull { it.annotationClass == JsonProperty::class }
+        .firstOrNull { it.annotationClass == JsonProperty::class }
         ?.let { it as JsonProperty }
         ?.required
 

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

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier
 
 // [module-kotlin#225]: keep Kotlin singletons as singletons
 object KotlinBeanDeserializerModifier : BeanDeserializerModifier() {
+    private fun readResolve(): Any = KotlinBeanDeserializerModifier
+
     override fun modifyDeserializer(
             config: DeserializationConfig,
             beanDesc: BeanDescription,

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

@@ -9,7 +9,6 @@ import com.fasterxml.jackson.module.kotlin.KotlinFeature.StrictNullChecks
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.KotlinPropertyNameAsImplicitName
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.UseJavaDurationConversion
 import java.util.*
-import kotlin.reflect.KClass
 
 fun Class<*>.isKotlinClass(): Boolean = this.isAnnotationPresent(Metadata::class.java)
 

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

@@ -1,12 +1,10 @@
 package com.fasterxml.jackson.module.kotlin
 
-import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.cfg.MapperConfig
 import com.fasterxml.jackson.databind.introspect.Annotated
 import com.fasterxml.jackson.databind.introspect.AnnotatedClass
-import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod
 import com.fasterxml.jackson.databind.introspect.AnnotatedParameter
@@ -16,12 +14,9 @@ import java.lang.reflect.Constructor
 import java.util.Locale
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
-import kotlin.reflect.full.companionObject
-import kotlin.reflect.full.declaredFunctions
 import kotlin.reflect.full.hasAnnotation
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.primaryConstructor
-import kotlin.reflect.jvm.javaConstructor
 import kotlin.reflect.jvm.javaGetter
 import kotlin.reflect.jvm.javaType
 
@@ -56,8 +51,7 @@ internal class KotlinNamesAnnotationIntrospector(
 
         return member.member.declaringClass.takeIf { it.isKotlinClass() }?.let { clazz ->
             // For edge case, methods must be compared by name, not directly.
-            clazz.kotlin.memberProperties.find { it.javaGetter?.name == getterName }
-                ?.let { it.name }
+            clazz.kotlin.memberProperties.find { it.javaGetter?.name == getterName }?.name
         }
     }
 

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

@@ -12,7 +12,6 @@ import com.fasterxml.jackson.databind.deser.ValueInstantiators
 import com.fasterxml.jackson.databind.deser.impl.PropertyValueBuffer
 import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator
 import java.lang.reflect.TypeVariable
-import kotlin.reflect.KParameter
 import kotlin.reflect.KType
 import kotlin.reflect.KTypeProjection
 import kotlin.reflect.jvm.javaType

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

@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.module.kotlin
 
 import kotlin.reflect.KFunction
-import kotlin.reflect.KParameter
 import kotlin.reflect.full.extensionReceiverParameter
 import kotlin.reflect.full.instanceParameter
 import kotlin.reflect.jvm.isAccessible

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

@@ -170,7 +170,7 @@ private fun Constructor<*>.valueClassAwareKotlinFunction(): KFunction<*>? {
         declaringClass
             .getDeclaredConstructor(*parameterTypes, defaultConstructorMarker)
             .kotlinFunction
-    } catch (t: Throwable) {
+    } catch (_: Throwable) {
         null
     }
 }

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

@@ -199,7 +199,7 @@ class TestM11Changes {
         try {
             person.phone
             fail("While person can be deserialized without a phone, phone must be set before attempting to access it")
-        } catch(e: IllegalStateException) { // expected
+        } catch (_: IllegalStateException) { // expected
         }
     }