Merge remote-tracking branch 'FasterXML/2.x' into 3.x

Author: k163377

release-notes/CREDITS-2.x

@@ -23,6 +23,9 @@ WrongWrong (@k163377)
 
 # 2.19.1 (not yet released)
 
+WrongWrong (@k163377)
+* #986: Optimize imports
+
 # 2.19.0 (24-Apr-2025)
 
 WrongWrong (@k163377)

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

@@ -19,7 +19,6 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.Field
 import java.lang.reflect.Method
 import java.util.Locale
-import kotlin.collections.getOrNull
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KMutableProperty1

src/test/kotlin/tools/jackson/module/kotlin/ArgumentBucketTest.kt

@@ -2,10 +2,10 @@ package tools.jackson.module.kotlin
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.functions
 import kotlin.reflect.full.hasAnnotation
-import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue

src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt

@@ -9,10 +9,10 @@ import tools.jackson.databind.deser.std.StdDeserializer
 import tools.jackson.module.kotlin.WrapsNullableValueClassDeserializer
 import tools.jackson.module.kotlin.jacksonObjectMapper
 import tools.jackson.module.kotlin.readValue
-import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
 
 class NullableObjectEdgeCases {
     @JvmInline

src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt

@@ -6,8 +6,8 @@ import tools.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
 import java.lang.reflect.InvocationTargetException
 import kotlin.test.assertNotEquals
 

src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt

@@ -5,9 +5,9 @@ import tools.jackson.module.kotlin.defaultMapper
 import tools.jackson.module.kotlin.readValue
 import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
-import org.junit.jupiter.api.Test
 
 /**
  * Up to argument size 32 there is one mask argument for the default argument,

src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt

@@ -5,9 +5,9 @@ import tools.jackson.module.kotlin.defaultMapper
 import tools.jackson.module.kotlin.readValue
 import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
-import org.junit.jupiter.api.Test
 
 /**
  * Up to argument size 32 there is one mask argument for the default argument,

src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt

@@ -5,9 +5,9 @@ import tools.jackson.module.kotlin.defaultMapper
 import tools.jackson.module.kotlin.readValue
 import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
-import org.junit.jupiter.api.Test
 
 /**
  * Up to argument size 32 there is one mask argument for the default argument,

src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersTests.kt

@@ -4,10 +4,10 @@ import tools.jackson.core.exc.InputCoercionException
 import tools.jackson.databind.ObjectMapper
 import tools.jackson.module.kotlin.jacksonObjectMapper
 import tools.jackson.module.kotlin.readValue
-import org.junit.jupiter.api.Test
-import java.math.BigInteger
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import java.math.BigInteger
 
 internal class UnsignedNumbersTests {
 

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

@@ -1,11 +1,11 @@
 package tools.jackson.module.kotlin.test.github
 
 import com.fasterxml.jackson.annotation.JsonValue
-
 import tools.jackson.module.kotlin.jacksonMapperBuilder
 import tools.jackson.module.kotlin.testPrettyWriter
 import kotlin.test.assertEquals
 import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
 
 class GitHub530 {
     // At the moment, the output is the same with or without `JsonValue`,

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

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import tools.jackson.module.kotlin.jacksonObjectMapper
 import tools.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Test
-import kotlin.reflect.jvm.javaMethod
-import kotlin.reflect.jvm.kotlinFunction
 import kotlin.test.assertEquals
 
 class TestGithub114 {