Merge pull request #283 from ProjectMapK/import-2.18

Import 2.18 and refactors

Author: k163377

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModule.kt

@@ -93,7 +93,6 @@ public class KotlinModule private constructor(
     }
 
     public companion object {
-        @Suppress("ConstPropertyName")
         private const val serialVersionUID = 3L
     }
 

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ReflectionCache.kt

@@ -10,7 +10,6 @@ import java.util.Optional
 internal class ReflectionCache(initialCacheSize: Int, maxCacheSize: Int) : Serializable {
     companion object {
         // Increment is required when properties that use LRUMap are changed.
-        @Suppress("ConstPropertyName")
         private const val serialVersionUID = 4L
     }
 

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinBeanDeserializerModifier.kt

@@ -15,7 +15,6 @@ internal class KotlinBeanDeserializerModifier(
     Serializable {
     companion object {
         // Increment is required when properties that use LRUMap are changed.
-        @Suppress("ConstPropertyName")
         private const val serialVersionUID = 1L
     }
 

src/test/java/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub922RequiredCollectionsDtoJava.java

@@ -0,0 +1,29 @@
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+import java.util.Map;
+
+public class GitHub922RequiredCollectionsDtoJava {
+    private final List<String> list;
+    private final Map<String, String> map;
+
+    @JsonCreator
+    public GitHub922RequiredCollectionsDtoJava(
+            @JsonProperty(value = "list", required = true) List<String> list,
+            @JsonProperty(value = "map", required = true) Map<String, String> map
+    ) {
+        this.list = list;
+        this.map = map;
+    }
+
+    public List<String> getList() {
+        return list;
+    }
+
+    public Map<String, String> getMap() {
+        return map;
+    }
+}

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/KotlinFeatures.kt

@@ -195,7 +195,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/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub922.kt

@@ -0,0 +1,32 @@
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
+
+import com.fasterxml.jackson.databind.BeanDescription
+import com.fasterxml.jackson.databind.ObjectMapper
+import io.github.projectmapk.jackson.module.kogera.KotlinFeature
+import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+class GitHub922 {
+    private inline fun <reified T : Any> ObjectMapper.introspectSerialization(): BeanDescription =
+        serializationConfig.introspect(serializationConfig.constructType(T::class.java))
+
+    private inline fun <reified T : Any> ObjectMapper.introspectDeserialization(): BeanDescription =
+        deserializationConfig.introspect(deserializationConfig.constructType(T::class.java))
+
+    private fun BeanDescription.isRequired(propertyName: String): Boolean =
+        this.findProperties().first { it.name == propertyName }.isRequired
+
+    @Test
+    fun `nullToEmpty does not override specification by Java annotation`() {
+        val mapper = jacksonObjectMapper {
+            enable(KotlinFeature.NullToEmptyCollection)
+            enable(KotlinFeature.NullToEmptyMap)
+        }
+
+        val desc = mapper.introspectDeserialization<GitHub922RequiredCollectionsDtoJava>()
+
+        assertTrue(desc.isRequired("list"))
+        assertTrue(desc.isRequired("map"))
+    }
+}

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/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
         }
     }