From 880964bee6006d3cb7d269237c04e19f5933633e Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 2 Feb 2025 06:09:28 +0900 Subject: [PATCH 1/2] Fixed previous merge failures --- .../kotlin/kogeraIntegration/deser/StrictNullChecksTest.kt | 2 +- .../jackson/module/kotlin/test/StrictNullChecksTestOld.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/StrictNullChecksTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/StrictNullChecksTest.kt index 918fbec3f..269d4d88d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/StrictNullChecksTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/StrictNullChecksTest.kt @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser +package tools.jackson.module.kotlin.kogeraIntegration.deser import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt index 397bc27de..fae2e2687 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.module.kotlin.test +package tools.jackson.module.kotlin.test import tools.jackson.databind.json.JsonMapper import tools.jackson.module.kotlin.KotlinFeature.StrictNullChecks @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import kotlin.test.assertNull -class StrictNullChecksTest { +class StrictNullChecksTestOld { private val mapper = JsonMapper.builder() .addModule(kotlinModule { enable(StrictNullChecks) }) .build() From 62c6e16dec2ca9d71af49954f2f50dd42b5cd064 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 2 Feb 2025 06:18:45 +0900 Subject: [PATCH 2/2] Deleted test that are no longer needed Because FAIL_ON_NULL_FOR_PRIMITIVES is now enabled by default. https://github.com/FasterXML/jackson-future-ideas/wiki/JSTEP-2#deserializationfeature --- .../kotlin/test/github/failing/Github242.kt | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github242.kt diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github242.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github242.kt deleted file mode 100644 index e01cdb88a..000000000 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github242.kt +++ /dev/null @@ -1,24 +0,0 @@ -package tools.jackson.module.kotlin.test.github.failing - -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test -import kotlin.test.assertEquals - -// Also see https://github.com/FasterXML/jackson-databind/issues/3392 -class Github242 { - data class IntValue(val value: Int) - - private val objectMapper = jacksonObjectMapper() - - // Since `nullish` is entered for a `non-null` value, deserialization is expected to fail, - // but at the moment the process continues with the default value set on the `databind`. - @Test - fun `test value throws - Int`() { - val v0 = objectMapper.readValue("{}") - val v1 = objectMapper.readValue("{\"value\":null}") - - assertEquals(0, v0.value) - assertEquals(v0, v1) - } -}