Skip to content

Commit 6e34b73

Browse files
committed
removed @ExperimentalCsv annotation, as manually having to add a dependency is already like an opt-in
1 parent 8c9c56f commit 6e34b73

File tree

21 files changed

+3
-52
lines changed

21 files changed

+3
-52
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ public fun DataFrame.Companion.readDelim(
418418
"Ran out of memory reading this CSV-like file. " +
419419
"You can try our new experimental CSV reader by adding the dependency " +
420420
"\"org.jetbrains.kotlinx:dataframe-csv:{VERSION}\" and using `DataFrame.readCsv()` instead of " +
421-
"`DataFrame.readCSV()`. This requires `@OptIn(ExperimentalCsv::class)`.",
421+
"`DataFrame.readCSV()`.",
422422
)
423423
}
424424
}

dataframe-csv/api/dataframe-csv.api

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ public final class org/jetbrains/kotlinx/dataframe/io/Csv : org/jetbrains/kotlin
5555
public fun readDataFrame (Ljava/io/InputStream;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
5656
}
5757

58-
public abstract interface annotation class org/jetbrains/kotlinx/dataframe/io/ExperimentalCsv : java/lang/annotation/Annotation {
59-
}
60-
6158
public final class org/jetbrains/kotlinx/dataframe/io/QuoteMode : java/lang/Enum {
6259
public static final field ALL Lorg/jetbrains/kotlinx/dataframe/io/QuoteMode;
6360
public static final field ALL_NON_NULL Lorg/jetbrains/kotlinx/dataframe/io/QuoteMode;

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,11 @@
33
package org.jetbrains.kotlinx.dataframe.documentation
44

55
import org.jetbrains.kotlinx.dataframe.DataFrame
6-
import org.jetbrains.kotlinx.dataframe.documentation.CommonReadDelimDocs.DataTitleArg
7-
import org.jetbrains.kotlinx.dataframe.documentation.CommonReadDelimDocs.FileTypeArg
8-
import org.jetbrains.kotlinx.dataframe.documentation.CommonReadDelimDocs.FileTypeTitleArg
9-
import org.jetbrains.kotlinx.dataframe.documentation.CommonReadDelimDocs.FunctionLinkArg
10-
import org.jetbrains.kotlinx.dataframe.documentation.CommonReadDelimDocs.OldFunctionLinkArg
116
import org.jetbrains.kotlinx.dataframe.io.ColType
127
import org.jetbrains.kotlinx.dataframe.io.DEFAULT_PARSER_OPTIONS
13-
import org.jetbrains.kotlinx.dataframe.io.ExperimentalCsv
148
import java.io.File
159
import java.io.InputStream
1610
import java.net.URL
17-
import java.util.Locale
1811

1912
/**
2013
* ### Read $[FileTypeTitleArg] $[DataTitleArg] to [DataFrame]
@@ -53,8 +46,7 @@ import java.util.Locale
5346
* $[StrFunctionLinkArg]`("a,b,c", delimiter = ",")`
5447
*
5548
* _**NOTE EXPERIMENTAL**: This is a new set of functions, replacing the old $[OldFunctionLinkArg]`()` functions.
56-
* They'll hopefully be faster and better. Until they are proven to be so,
57-
* you'll need to [opt in][OptIn] to [ExperimentalCsv][ExperimentalCsv] to be able to use them._
49+
* They'll hopefully be faster and better._
5850
*
5951
* @comment Some helper arguments for the function links
6052
* @set [FunctionLinkArg] \[DataFrame.${[FunctionNameArg]}\]\[${[FunctionNameArg]}\]

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package org.jetbrains.kotlinx.dataframe.documentation
44

55
import org.jetbrains.kotlinx.dataframe.DataFrame
6-
import org.jetbrains.kotlinx.dataframe.io.ExperimentalCsv
76
import org.jetbrains.kotlinx.dataframe.io.QuoteMode.ALL
87
import org.jetbrains.kotlinx.dataframe.io.toCsv
98
import org.jetbrains.kotlinx.dataframe.io.writeCSV
@@ -34,8 +33,7 @@ import java.io.File
3433
*
3534
* _**NOTE EXPERIMENTAL**: This is a new set of functions, replacing the old
3635
* [DataFrame.writeCSV][writeCSV]`()` and [DataFrame.toCsv][toCsv]`()` functions.
37-
* They'll hopefully be better. Until they are proven to be so,
38-
* you'll need to [opt in][OptIn] to [ExperimentalCsv][ExperimentalCsv] to be able to use them._
36+
* They'll hopefully be better._
3937
*
4038
* @comment Some helper arguments for the function links
4139
* @set [FunctionLinkArg] \[DataFrame.${[FunctionNameArg]}\]\[${[FunctionNameArg]}\]

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

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

13-
@ExperimentalCsv
1413
public class Csv(private val delimiter: Char = DelimParams.CSV_DELIMITER) : SupportedDataFrameFormat {
1514
override fun readDataFrame(stream: InputStream, header: List<String>): DataFrame<*> =
1615
DataFrame.readCsv(inputStream = stream, header = header)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import java.net.URL
4141
* @include [COMPRESSION]
4242
* @include [CommonReadDelimDocs.CommonReadParams]
4343
*/
44-
@ExperimentalCsv
4544
public fun DataFrame.Companion.readCsv(
4645
file: File,
4746
delimiter: Char = CSV_DELIMITER,
@@ -93,7 +92,6 @@ public fun DataFrame.Companion.readCsv(
9392
* @include [COMPRESSION]
9493
* @include [CommonReadDelimDocs.CommonReadParams]
9594
*/
96-
@ExperimentalCsv
9795
public fun DataFrame.Companion.readCsv(
9896
url: URL,
9997
delimiter: Char = CSV_DELIMITER,
@@ -145,7 +143,6 @@ public fun DataFrame.Companion.readCsv(
145143
* @include [COMPRESSION]
146144
* @include [CommonReadDelimDocs.CommonReadParams]
147145
*/
148-
@ExperimentalCsv
149146
public fun DataFrame.Companion.readCsv(
150147
fileOrUrl: String,
151148
delimiter: Char = CSV_DELIMITER,
@@ -199,7 +196,6 @@ public fun DataFrame.Companion.readCsv(
199196
* @include [CommonReadDelimDocs.CommonReadParams]
200197
* @include [ADJUST_CSV_SPECS]
201198
*/
202-
@ExperimentalCsv
203199
public fun DataFrame.Companion.readCsv(
204200
inputStream: InputStream,
205201
delimiter: Char = CSV_DELIMITER,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import org.jetbrains.kotlinx.dataframe.impl.io.readDelimImpl
3030
* @include [CSV_DELIMITER]
3131
* @include [CommonReadDelimDocs.CommonReadParams]
3232
*/
33-
@ExperimentalCsv
3433
public fun DataFrame.Companion.readCsvStr(
3534
text: String,
3635
delimiter: Char = CSV_DELIMITER,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import java.net.URL
4747
* @include [COMPRESSION]
4848
* @include [CommonReadDelimDocs.CommonReadParams]
4949
*/
50-
@ExperimentalCsv
5150
public fun DataFrame.Companion.readDelim(
5251
file: File,
5352
delimiter: Char = DELIM_DELIMITER,
@@ -99,7 +98,6 @@ public fun DataFrame.Companion.readDelim(
9998
* @include [COMPRESSION]
10099
* @include [CommonReadDelimDocs.CommonReadParams]
101100
*/
102-
@ExperimentalCsv
103101
public fun DataFrame.Companion.readDelim(
104102
url: URL,
105103
delimiter: Char = DELIM_DELIMITER,
@@ -151,7 +149,6 @@ public fun DataFrame.Companion.readDelim(
151149
* @include [COMPRESSION]
152150
* @include [CommonReadDelimDocs.CommonReadParams]
153151
*/
154-
@ExperimentalCsv
155152
public fun DataFrame.Companion.readDelim(
156153
fileOrUrl: String,
157154
delimiter: Char = DELIM_DELIMITER,
@@ -205,7 +202,6 @@ public fun DataFrame.Companion.readDelim(
205202
* @include [CommonReadDelimDocs.CommonReadParams]
206203
* @include [ADJUST_CSV_SPECS]
207204
*/
208-
@ExperimentalCsv
209205
public fun DataFrame.Companion.readDelim(
210206
inputStream: InputStream,
211207
delimiter: Char = DELIM_DELIMITER,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import org.jetbrains.kotlinx.dataframe.impl.io.readDelimImpl
3030
* @include [DELIM_DELIMITER]
3131
* @include [CommonReadDelimDocs.CommonReadParams]
3232
*/
33-
@ExperimentalCsv
3433
public fun DataFrame.Companion.readDelimStr(
3534
text: String,
3635
delimiter: Char = DELIM_DELIMITER,

0 commit comments

Comments
 (0)