diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index d56cae886..69734b150 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -17,6 +17,9 @@ Contributors: # 2.19.1 (not yet released) +WrongWrong (@k163377) +* #986: Optimize imports + # 2.19.0 (24-Apr-2025) WrongWrong (@k163377) diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt index f09b1707a..5a8113bff 100644 --- a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt +++ b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt @@ -2,13 +2,13 @@ package com.fasterxml.jackson.module.kotlin import com.fasterxml.jackson.databind.MapperFeature import com.fasterxml.jackson.databind.module.SimpleModule +import com.fasterxml.jackson.module.kotlin.KotlinFeature.KotlinPropertyNameAsImplicitName +import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyMap import com.fasterxml.jackson.module.kotlin.KotlinFeature.SingletonSupport import com.fasterxml.jackson.module.kotlin.KotlinFeature.StrictNullChecks -import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks -import com.fasterxml.jackson.module.kotlin.KotlinFeature.KotlinPropertyNameAsImplicitName import com.fasterxml.jackson.module.kotlin.KotlinFeature.UseJavaDurationConversion import java.util.* diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt index b082ad855..c6f3403b9 100644 --- a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt +++ b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt @@ -14,7 +14,6 @@ import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector import com.fasterxml.jackson.databind.introspect.PotentialCreator import java.lang.reflect.Constructor import java.util.Locale -import kotlin.collections.getOrNull import kotlin.reflect.KClass import kotlin.reflect.KFunction import kotlin.reflect.KParameter diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/ArgumentBucketTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/ArgumentBucketTest.kt index f011a5ea1..3a8ebfef8 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/ArgumentBucketTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/ArgumentBucketTest.kt @@ -2,10 +2,10 @@ package com.fasterxml.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 diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt index d448a3eff..526cc7071 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt @@ -2,11 +2,11 @@ package com.fasterxml.jackson.module.kotlin import com.fasterxml.jackson.core.json.JsonReadFeature import com.fasterxml.jackson.core.json.JsonWriteFeature +import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyMap import com.fasterxml.jackson.module.kotlin.KotlinFeature.SingletonSupport -import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt index 95b44ae6d..26f2eabba 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt @@ -9,10 +9,10 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.fasterxml.jackson.module.kotlin.WrapsNullableValueClassDeserializer import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.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 diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt index ab5709599..760efb7de 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt @@ -6,8 +6,8 @@ import com.fasterxml.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 diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt index 596a44736..d94b316c7 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt @@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.d import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt index 643883a74..288a13e62 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt @@ -2,10 +2,10 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.d import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt index 744de4168..240722276 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt @@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.d import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt index ad424ad08..a7413fcb2 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt @@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.d import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt index 521e762f8..8945587e7 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt @@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.d import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt index b80d7375b..3f018fe08 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt @@ -6,10 +6,10 @@ import com.fasterxml.jackson.databind.exc.InvalidDefinitionException import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.module.kotlin.defaultMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Nested diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt index e348211f2..70b4a9ca8 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt @@ -2,10 +2,10 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.m import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt index 8947b7ef6..217456447 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -2,12 +2,12 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import com.fasterxml.jackson.module.kotlin.readValue 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, diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt index 03b80e973..edc69096b 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.callPrimaryConstructor import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt index 612822fdd..a45660f1f 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt index 2ba9df1c1..e78f34389 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.callPrimaryConstructor import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt index e6a95c3e4..588e987f1 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -2,12 +2,12 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import com.fasterxml.jackson.module.kotlin.readValue 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, diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt index b9bbf9129..59ca7f582 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.callPrimaryConstructor import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt index 2004745c5..568f28298 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt index ad3be7c73..b186f7c94 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.callPrimaryConstructor import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt index c057ed4c1..fcb9cc673 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -2,12 +2,12 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue 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, diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt index cf2b2cff3..a673b0cb0 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.callPrimaryConstructor import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt index 61a0702b8..b293095e1 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.p import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt index 758a4ba81..f4874cb41 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.module.kotlin.assertReflectEquals import com.fasterxml.jackson.module.kotlin.callPrimaryConstructor import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt index 648cdeb22..7c8fc09d9 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt @@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.ser import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.testPrettyWriter import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NonNullObject +import com.fasterxml.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt index caaa60465..6a06ff81f 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt @@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.ser import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.testPrettyWriter import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject +import com.fasterxml.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt index 61f4c1232..4dd60c080 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt @@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.ser import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.testPrettyWriter import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject +import com.fasterxml.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt index bac4c6b0f..966161db7 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.ser import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.module.kotlin.KotlinModule -import com.fasterxml.jackson.module.kotlin.testPrettyWriter import com.fasterxml.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.Primitive +import com.fasterxml.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/UnsignedNumbersTests.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/UnsignedNumbersTests.kt index ed48991d1..0f480d020 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/UnsignedNumbersTests.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/UnsignedNumbersTests.kt @@ -4,10 +4,10 @@ import com.fasterxml.jackson.core.exc.InputCoercionException import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.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 { diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub530.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub530.kt index 22df63a23..dc08f85ef 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub530.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub530.kt @@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder import com.fasterxml.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`, diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub625.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub625.kt index a03415d05..1e74db789 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub625.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub625.kt @@ -2,7 +2,6 @@ package com.fasterxml.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.testPrettyWriter import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub873.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub873.kt index c45def865..f8d4238eb 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub873.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub873.kt @@ -2,7 +2,6 @@ package com.fasterxml.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.module.kotlin.defaultMapper -import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import kotlin.test.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github114.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github114.kt index a6b95a2b1..850465abb 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github114.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github114.kt @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.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 { diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github153.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github153.kt index 14e837772..a0b67c1e8 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github153.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github153.kt @@ -7,7 +7,6 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement import com.fasterxml.jackson.module.kotlin.kotlinModule import com.fasterxml.jackson.module.kotlin.test.expectFailure -import com.fasterxml.jackson.module.kotlin.test.github.TestGithub153.MyPojo import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github27.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github27.kt index c13ba6a3c..81e810b63 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github27.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github27.kt @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import kotlin.test.assertTrue diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github340.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github340.kt index 7d3cdb06d..89dfe6ce4 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github340.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github340.kt @@ -1,7 +1,6 @@ package com.fasterxml.jackson.module.kotlin.test.github import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.kotlinModule import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github46.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github46.kt index d3b01602f..9304ff9f5 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github46.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github46.kt @@ -1,7 +1,7 @@ package com.fasterxml.jackson.module.kotlin.test.github -import com.fasterxml.jackson.module.kotlin.* -import org.junit.jupiter.api.Assertions +import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper +import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Test import kotlin.reflect.full.primaryConstructor import kotlin.test.assertEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github50.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github50.kt index 5f1d442ba..be59d743c 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github50.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github50.kt @@ -1,10 +1,8 @@ package com.fasterxml.jackson.module.kotlin.test.github; import com.fasterxml.jackson.annotation.JsonUnwrapped -import com.fasterxml.jackson.databind.exc.InvalidDefinitionException import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue -import com.fasterxml.jackson.module.kotlin.test.expectFailure import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub451.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub451.kt index 66308750a..fde983652 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub451.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub451.kt @@ -1,7 +1,6 @@ package com.fasterxml.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.fasterxml.jackson.module.kotlin.test.expectFailure import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.opentest4j.AssertionFailedError diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github518.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github518.kt index f680c72a5..0e662849c 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github518.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/Github518.kt @@ -6,8 +6,8 @@ import com.fasterxml.jackson.module.kotlin.jsonMapper import com.fasterxml.jackson.module.kotlin.kotlinModule import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.test.expectFailure -import kotlin.test.assertSame import org.junit.jupiter.api.Test +import kotlin.test.assertSame /** * An empty object should be deserialized as *the* Unit instance for a nullable Unit reference Type.