org.jetbrains.kotlinx.dataframe.io.Csv clashes with CSV on windows...

Kotlin · Dec 4, 2024 · 68708b3 · 68708b3
1 parent 8cb516b
commit 68708b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dataframe-csv/api/dataframe-csv.api b/dataframe-csv/api/dataframe-csv.api
@@ -48,7 +48,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/CompressionKt {
 	public static final fun useDecompressed (Ljava/io/InputStream;Lorg/jetbrains/kotlinx/dataframe/io/Compression;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
-public final class org/jetbrains/kotlinx/dataframe/io/Csv : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
+public final class org/jetbrains/kotlinx/dataframe/io/CsvDeephaven : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
 	public fun <init> ()V
 	public fun <init> (C)V
 	public synthetic fun <init> (CILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -140,7 +140,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/ToTsvStrKt {
 	public static synthetic fun toTsvStr$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;ZCLjava/lang/Character;Lorg/jetbrains/kotlinx/dataframe/io/QuoteMode;Ljava/lang/Character;Ljava/lang/Character;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
 }
 
-public final class org/jetbrains/kotlinx/dataframe/io/Tsv : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
+public final class org/jetbrains/kotlinx/dataframe/io/TsvDeephaven : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
 	public fun <init> ()V
 	public fun <init> (C)V
 	public synthetic fun <init> (CILkotlin/jvm/internal/DefaultConstructorMarker;)V

diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt
@@ -10,7 +10,7 @@ import java.io.File
 import java.io.InputStream
 import kotlin.reflect.typeOf
 
-public class Csv(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat {
+public class CsvDeephaven(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat {
     override fun readDataFrame(stream: InputStream, header: List<String>): DataFrame<*> =
         DataFrame.readCsv(inputStream = stream, header = header)
 

diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt
@@ -10,7 +10,7 @@ import java.io.File
 import java.io.InputStream
 import kotlin.reflect.typeOf
 
-public class Tsv(private val delimiter: Char = DelimParams.TSV_DELIMITER) : SupportedDataFrameFormat {
+public class TsvDeephaven(private val delimiter: Char = DelimParams.TSV_DELIMITER) : SupportedDataFrameFormat {
     override fun readDataFrame(stream: InputStream, header: List<String>): DataFrame<*> =
         DataFrame.readTsv(inputStream = stream, header = header)
 

diff --git a/...v/src/main/resources/META-INF/services/org.jetbrains.kotlinx.dataframe.io.SupportedFormat b/...v/src/main/resources/META-INF/services/org.jetbrains.kotlinx.dataframe.io.SupportedFormat
@@ -1,2 +1,2 @@
-org.jetbrains.kotlinx.dataframe.io.Csv
-org.jetbrains.kotlinx.dataframe.io.Tsv
+org.jetbrains.kotlinx.dataframe.io.CsvDeephaven
+org.jetbrains.kotlinx.dataframe.io.TsvDeephaven