Skip to content

Commit 0478671

Browse files
authored
Merge pull request #984 from Kotlin/fixed-csv-serviceloader-error-windows
org.jetbrains.kotlinx.dataframe.io.Csv clashes with CSV on windows...
2 parents b9b0487 + 579802c commit 0478671

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

dataframe-csv/api/dataframe-csv.api

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/CompressionKt {
4848
public static final fun useDecompressed (Ljava/io/InputStream;Lorg/jetbrains/kotlinx/dataframe/io/Compression;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
4949
}
5050

51-
public final class org/jetbrains/kotlinx/dataframe/io/Csv : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
51+
public final class org/jetbrains/kotlinx/dataframe/io/CsvDeephaven : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
5252
public fun <init> ()V
5353
public fun <init> (C)V
5454
public synthetic fun <init> (CILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -140,7 +140,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/ToTsvStrKt {
140140
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;
141141
}
142142

143-
public final class org/jetbrains/kotlinx/dataframe/io/Tsv : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
143+
public final class org/jetbrains/kotlinx/dataframe/io/TsvDeephaven : org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat {
144144
public fun <init> ()V
145145
public fun <init> (C)V
146146
public synthetic fun <init> (CILkotlin/jvm/internal/DefaultConstructorMarker;)V

dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import java.io.File
1010
import java.io.InputStream
1111
import kotlin.reflect.typeOf
1212

13-
public class Csv(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat {
13+
public class CsvDeephaven(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat {
1414
override fun readDataFrame(stream: InputStream, header: List<String>): DataFrame<*> =
1515
DataFrame.readCsv(inputStream = stream, header = header)
1616

dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import java.io.File
1010
import java.io.InputStream
1111
import kotlin.reflect.typeOf
1212

13-
public class Tsv(private val delimiter: Char = DelimParams.TSV_DELIMITER) : SupportedDataFrameFormat {
13+
public class TsvDeephaven(private val delimiter: Char = DelimParams.TSV_DELIMITER) : SupportedDataFrameFormat {
1414
override fun readDataFrame(stream: InputStream, header: List<String>): DataFrame<*> =
1515
DataFrame.readTsv(inputStream = stream, header = header)
1616

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
org.jetbrains.kotlinx.dataframe.io.Csv
2-
org.jetbrains.kotlinx.dataframe.io.Tsv
1+
org.jetbrains.kotlinx.dataframe.io.CsvDeephaven
2+
org.jetbrains.kotlinx.dataframe.io.TsvDeephaven

0 commit comments

Comments
 (0)