Remove usages of deprecated API

Author: koperagen

core/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
@@ -77,7 +77,7 @@ public fun DataFrame.Companion.readDelimStr(
     skipLines: Int = 0,
     readLines: Int? = null,
 ): DataFrame<*> =
-    StringReader(text).use { readDelim(it, CSVType.DEFAULT.format.withHeader(), colTypes, skipLines, readLines) }
+    StringReader(text).use { readDelim(it, CSVType.DEFAULT.format.builder().setHeader().build(), colTypes, skipLines, readLines) }
 
 public fun DataFrame.Companion.read(
     fileOrUrl: String,
@@ -212,7 +212,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 +268,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,

core/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

docs/StardustDocs/topics/write.md

@@ -21,7 +21,8 @@ df.writeCSV(file)
 <!---FUN writeCsvStr-->
 
 ```kotlin
-val csvStr = df.toCsv(CSVFormat.DEFAULT.withDelimiter(';').withRecordSeparator(System.lineSeparator()))
+val format = CSVFormat.DEFAULT.builder().setDelimiter(';').setRecordSeparator(System.lineSeparator()).build()
+val csvStr = df.toCsv(format)
 ```
 
 <!---END-->
@@ -104,8 +105,10 @@ val wb = WorkbookFactory.create(true)
 
 // Create different sheets from different data frames in the workbook
 val allPersonsSheet = df.writeExcel(wb, sheetName = "allPersons")
-val happyPersonsSheet = df.filter { person -> person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "happyPersons")
-val unhappyPersonsSheet = df.filter { person -> !person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "unhappyPersons")
+val happyPersonsSheet =
+    df.filter { person -> person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "happyPersons")
+val unhappyPersonsSheet =
+    df.filter { person -> !person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "unhappyPersons")
 
 // Do anything you want by POI
 listOf(happyPersonsSheet, unhappyPersonsSheet).forEach { setStyles(it) }
@@ -125,9 +128,11 @@ Add new sheets without using Apache POI directly by using a parameter to keep us
 // Create a new Excel workbook with a single sheet called "allPersons", replacing the file if it already exists -> Current sheets: allPersons
 df.writeExcel(file, sheetName = "allPersons")
 // Add a new sheet to the previous file without replacing it, by setting keepFile = true -> Current sheets: allPersons, happyPersons
-df.filter { person -> person.isHappy }.remove("isHappy").writeExcel(file, sheetName = "happyPersons", keepFile = true)
+df.filter { person -> person.isHappy }.remove("isHappy")
+    .writeExcel(file, sheetName = "happyPersons", keepFile = true)
 // Add a new sheet to the previous file without replacing it, by setting keepFile = true -> Current sheets: allPersons, happyPersons, unhappyPersons
-df.filter { person -> !person.isHappy }.remove("isHappy").writeExcel(file, sheetName = "unhappyPersons", keepFile = true)
+df.filter { person -> !person.isHappy }.remove("isHappy")
+    .writeExcel(file, sheetName = "unhappyPersons", keepFile = true)
 ```
 
 <!---END-->
@@ -203,7 +208,7 @@ df.arrowWriter(
     // Specify mismatch subscriber
     mismatchSubscriber = writeMismatchMessage,
 
-).use { writer: ArrowWriter ->
+    ).use { writer: ArrowWriter ->
 
     // Save to any format and sink, like in the previous example
     writer.writeArrowFeather(file)

tests/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Write.kt

@@ -46,7 +46,8 @@ class Write : TestBase() {
     @Test
     fun writeCsvStr() {
         // SampleStart
-        val csvStr = df.toCsv(CSVFormat.DEFAULT.withDelimiter(';').withRecordSeparator(System.lineSeparator()))
+        val format = CSVFormat.DEFAULT.builder().setDelimiter(';').setRecordSeparator(System.lineSeparator()).build()
+        val csvStr = df.toCsv(format)
         // SampleEnd
         csvStr shouldStartWith """
             name;age;city;weight;isHappy
@@ -116,8 +117,10 @@ class Write : TestBase() {
 
             // Create different sheets from different data frames in the workbook
             val allPersonsSheet = df.writeExcel(wb, sheetName = "allPersons")
-            val happyPersonsSheet = df.filter { person -> person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "happyPersons")
-            val unhappyPersonsSheet = df.filter { person -> !person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "unhappyPersons")
+            val happyPersonsSheet =
+                df.filter { person -> person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "happyPersons")
+            val unhappyPersonsSheet =
+                df.filter { person -> !person.isHappy }.remove("isHappy").writeExcel(wb, sheetName = "unhappyPersons")
 
             // Do anything you want by POI
             listOf(happyPersonsSheet, unhappyPersonsSheet).forEach { setStyles(it) }
@@ -153,7 +156,7 @@ class Write : TestBase() {
     fun writeArrowPerSchema() {
         useTempFile { file ->
             val schemaJson =
-"""{
+                """{
   "fields" : [ {
     "name" : "name",
     "nullable" : true,
@@ -210,7 +213,7 @@ class Write : TestBase() {
                 // Specify mismatch subscriber
                 mismatchSubscriber = writeMismatchMessage,
 
-            ).use { writer: ArrowWriter ->
+                ).use { writer: ArrowWriter ->
 
                 // Save to any format and sink, like in the previous example
                 writer.writeArrowFeather(file)
@@ -226,9 +229,11 @@ class Write : TestBase() {
             // Create a new Excel workbook with a single sheet called "allPersons", replacing the file if it already exists -> Current sheets: allPersons
             df.writeExcel(file, sheetName = "allPersons")
             // Add a new sheet to the previous file without replacing it, by setting keepFile = true -> Current sheets: allPersons, happyPersons
-            df.filter { person -> person.isHappy }.remove("isHappy").writeExcel(file, sheetName = "happyPersons", keepFile = true)
+            df.filter { person -> person.isHappy }.remove("isHappy")
+                .writeExcel(file, sheetName = "happyPersons", keepFile = true)
             // Add a new sheet to the previous file without replacing it, by setting keepFile = true -> Current sheets: allPersons, happyPersons, unhappyPersons
-            df.filter { person -> !person.isHappy }.remove("isHappy").writeExcel(file, sheetName = "unhappyPersons", keepFile = true)
+            df.filter { person -> !person.isHappy }.remove("isHappy")
+                .writeExcel(file, sheetName = "unhappyPersons", keepFile = true)
             // SampleEnd
         }
     }