Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dataframe-csv/api/dataframe-csv.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions ...v/src/main/resources/META-INF/services/org.jetbrains.kotlinx.dataframe.io.SupportedFormat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading