Merge branch '2.19'

Author: k163377

release-notes/CREDITS-2.x

@@ -30,7 +30,12 @@ WrongWrong (@k163377)
 * #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName
 * #835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport
 
-# 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

@@ -36,6 +36,10 @@ Co-maintainers:
 #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName.
 #835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport.
 
+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/tools/jackson/module/kotlin/KotlinAnnotationIntrospector.kt

@@ -56,7 +56,7 @@ internal class KotlinAnnotationIntrospector(
                     }
                     else -> null
                 }
-            } catch (ex: UnsupportedOperationException) {
+            } catch (_: UnsupportedOperationException) {
                 null
             }
     }
@@ -111,7 +111,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/tools/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt

@@ -56,8 +56,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/tools/jackson/module/kotlin/KotlinValueDeserializerModifier.kt

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

src/main/kotlin/tools/jackson/module/kotlin/MethodValueCreator.kt

@@ -1,7 +1,6 @@
 package tools.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/tools/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/tools/jackson/module/kotlin/test/KotlinFeatures.kt

@@ -191,7 +191,7 @@ private 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
         }
     }
 

src/test/kotlin/tools/jackson/module/kotlin/test/github/Github161.kt

@@ -20,7 +20,7 @@ class TestGithub161 {
         try {
             objectMapper.readValue(json, Foo::class.java)
             fail("Expected an error on the missing primitive value")
-        } catch (ex: MismatchedInputException) {
+        } catch (_: MismatchedInputException) {
             // success
         }
     }