CSV: Ignore nullable values at the end (#188)

hfhbd · Feb 29, 2024 · 2a2ad02 · 2a2ad02
1 parent 0408470
commit 2a2ad02
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/gradle/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts
@@ -9,4 +9,8 @@ dependencyResolutionManagement {
  }
 }
 
+plugins {
+ id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "build-logic"
diff --git a/kotlinx-serialization-csv/src/commonMain/kotlin/app/softwork/serialization/csv/CSVDecoder.kt b/kotlinx-serialization-csv/src/commonMain/kotlin/app/softwork/serialization/csv/CSVDecoder.kt
@@ -22,7 +22,10 @@ public class CSVDecoder(
  return this
  }
 
- override fun decodeNotNullMark(): Boolean = data[currentRow][index] != ""
+ override fun decodeNotNullMark(): Boolean {
+ val value = data[currentRow].getOrNull(index)
+ return value != null && value != ""
+ }
 
  override fun endStructure(descriptor: SerialDescriptor) {
  level -= 1

diff --git a/...-serialization-csv/src/commonTest/kotlin/app/softwork/serialization/csv/CsvDecoderTest.kt b/...-serialization-csv/src/commonTest/kotlin/app/softwork/serialization/csv/CsvDecoderTest.kt
@@ -63,6 +63,19 @@ class CsvDecoderTest {
  )
  }
 
+ @Test
+ fun nullableSecondWithoutComma() {
+ val csv = """
+ bar,baz
+ 42
+ """.trimIndent()
+
+ assertEquals(
+ expected = FooNull(bar = 42, baz = null),
+ actual = CSVFormat.decodeFromString(FooNull.serializer(), csv)
+ )
+ }
+
  @Test
  fun nullableFirst() {
  val csv = """