Update generated sources with recent changes

Kotlin · Jun 19, 2024 · fff717d · fff717d
1 parent 47228e6
commit fff717d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt
@@ -57,8 +57,8 @@ public class CSV(private val delimiter: Char = ',') : SupportedDataFrameFormat {
 }
 
 public enum class CSVType(public val format: CSVFormat) {
-    DEFAULT(CSVFormat.DEFAULT.withAllowMissingColumnNames().withIgnoreSurroundingSpaces()),
-    TDF(CSVFormat.TDF.withAllowMissingColumnNames())
+    DEFAULT(CSVFormat.DEFAULT.builder().setAllowMissingColumnNames(true).setIgnoreSurroundingSpaces(true).build()),
+    TDF(CSVFormat.TDF.builder().setAllowMissingColumnNames(true).build())
 }
 
 private val defaultCharset = Charsets.UTF_8
@@ -73,11 +73,15 @@ internal fun isCompressed(url: URL) = isCompressed(url.path)
 @Interpretable("ReadDelimStr")
 public fun DataFrame.Companion.readDelimStr(
     text: String,
+    delimiter: Char = ',',
     colTypes: Map<String, ColType> = mapOf(),
     skipLines: Int = 0,
     readLines: Int? = null,
 ): DataFrame<*> =
-    StringReader(text).use { readDelim(it, CSVType.DEFAULT.format.withHeader(), colTypes, skipLines, readLines) }
+    StringReader(text).use {
+        val format = CSVType.DEFAULT.format.builder().setHeader().setDelimiter(delimiter).build()
+        readDelim(it, format, colTypes, skipLines, readLines)
+    }
 
 public fun DataFrame.Companion.read(
     fileOrUrl: String,
@@ -212,7 +216,7 @@ public fun asURL(fileOrUrl: String): URL = (
     ).toURL()
 
 private fun getFormat(type: CSVType, delimiter: Char, header: List<String>, duplicate: Boolean): CSVFormat =
-    type.format.withDelimiter(delimiter).withHeader(*header.toTypedArray()).withAllowDuplicateHeaderNames(duplicate)
+    type.format.builder().setDelimiter(delimiter).setHeader(*header.toTypedArray()).setAllowMissingColumnNames(duplicate).build()
 
 public fun DataFrame.Companion.readDelim(
     inStream: InputStream,
@@ -268,7 +272,7 @@ public fun ColType.toType(): KClass<out Any> = when (this) {
 
 public fun DataFrame.Companion.readDelim(
     reader: Reader,
-    format: CSVFormat = CSVFormat.DEFAULT.withHeader(),
+    format: CSVFormat = CSVFormat.DEFAULT.builder().setHeader().build(),
     colTypes: Map<String, ColType> = mapOf(),
     skipLines: Int = 0,
     readLines: Int? = null,

diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/CsvTests.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/CsvTests.kt
@@ -242,7 +242,7 @@ class CsvTests {
         )
         df.writeCSV(
             "src/test/resources/without_header.csv",
-            CSVFormat.DEFAULT.withSkipHeaderRecord(),
+            CSVFormat.DEFAULT.builder().setSkipHeaderRecord(true).build(),
         )
         val producedFile = File("src/test/resources/without_header.csv")
         producedFile.exists() shouldBe true
@@ -258,6 +258,16 @@ class CsvTests {
         df shouldBe DataFrame.readCSV("../data/jetbrains repositories.csv")
     }
 
+    @Test
+    fun `readDelimStr delimiter`() {
+        val tsv = """
+            a	b	c
+            1	2	3
+        """.trimIndent()
+        val df = DataFrame.readDelimStr(tsv, '\t')
+        df shouldBe dataFrameOf("a", "b", "c")(1, 2, 3)
+    }
+
     companion object {
         private val simpleCsv = testCsv("testCSV")
         private val csvWithFrenchLocale = testCsv("testCSVwithFrenchLocale")