Skip to content

Commit 9e0d436

Browse files
ktlint format and apiDump
1 parent 6331f91 commit 9e0d436

File tree

15 files changed

+61
-46
lines changed

15 files changed

+61
-46
lines changed

core/api/core.api

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6086,6 +6086,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/CSV : org/jetbrains/kotlin
60866086
public fun getTestOrder ()I
60876087
public fun readDataFrame (Ljava/io/File;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
60886088
public fun readDataFrame (Ljava/io/InputStream;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6089+
public fun readDataFrame (Ljava/nio/file/Path;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
60896090
}
60906091

60916092
public final class org/jetbrains/kotlinx/dataframe/io/CSVType : java/lang/Enum {
@@ -6400,9 +6401,9 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/io/SupportedCode
64006401
}
64016402

64026403
public abstract interface class org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat : org/jetbrains/kotlinx/dataframe/io/SupportedFormat {
6403-
public abstract fun readDataFrame (Ljava/io/File;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6404+
public fun readDataFrame (Ljava/io/File;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64046405
public abstract fun readDataFrame (Ljava/io/InputStream;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6405-
public fun readDataFrame (Ljava/nio/file/Path;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6406+
public abstract fun readDataFrame (Ljava/nio/file/Path;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64066407
public static synthetic fun readDataFrame$default (Lorg/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat;Ljava/io/File;Ljava/util/List;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64076408
public static synthetic fun readDataFrame$default (Lorg/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat;Ljava/io/InputStream;Ljava/util/List;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64086409
public static synthetic fun readDataFrame$default (Lorg/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat;Ljava/nio/file/Path;Ljava/util/List;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
@@ -6483,6 +6484,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/TSV : org/jetbrains/kotlin
64836484
public fun getTestOrder ()I
64846485
public fun readDataFrame (Ljava/io/File;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64856486
public fun readDataFrame (Ljava/io/InputStream;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6487+
public fun readDataFrame (Ljava/nio/file/Path;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64866488
}
64876489

64886490
public final class org/jetbrains/kotlinx/dataframe/io/TsvKt {
@@ -6530,13 +6532,15 @@ public final class org/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema {
65306532
public fun <init> (Ljava/io/File;)V
65316533
public fun <init> (Ljava/lang/String;)V
65326534
public fun <init> (Ljava/net/URL;)V
6535+
public fun <init> (Ljava/nio/file/Path;)V
65336536
public final fun getUrl ()Ljava/net/URL;
65346537
}
65356538

65366539
public final class org/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchemaKt {
65376540
public static final fun importDataSchema (Ljava/io/File;)Lorg/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema;
65386541
public static final fun importDataSchema (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema;
65396542
public static final fun importDataSchema (Ljava/net/URL;)Lorg/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema;
6543+
public static final fun importDataSchema (Ljava/nio/file/Path;)Lorg/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema;
65406544
}
65416545

65426546
public final class org/jetbrains/kotlinx/dataframe/jupyter/JupyterConfiguration {

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
@@ -57,8 +57,8 @@ import java.math.BigDecimal
5757
import java.math.BigInteger
5858
import java.net.URL
5959
import java.nio.charset.Charset
60-
import java.util.zip.GZIPInputStream
6160
import java.nio.file.Path
61+
import java.util.zip.GZIPInputStream
6262
import kotlin.reflect.KClass
6363
import kotlin.reflect.KType
6464
import kotlin.reflect.typeOf

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public sealed interface SupportedFormatSample {
5757
public interface SupportedDataFrameFormat : SupportedFormat {
5858
public fun readDataFrame(stream: InputStream, header: List<String> = emptyList()): DataFrame<*>
5959

60-
public fun readDataFrame(file: File, header: List<String> = emptyList()): DataFrame<*>
61-
= readDataFrame(file.toPath(), header)
60+
public fun readDataFrame(file: File, header: List<String> = emptyList()): DataFrame<*> =
61+
readDataFrame(file.toPath(), header)
6262

6363
public fun readDataFrame(path: Path, header: List<String> = emptyList()): DataFrame<*>
6464
}

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/GuessOverloadsTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ import kotlin.io.path.writeText
1010

1111
class GuessOverloadsTest {
1212

13-
private fun sampleJson(): String = """
13+
private fun sampleJson(): String =
14+
"""
1415
[
1516
{"name":"Alice","age":15},
1617
{"name":"Bob","age":20}
1718
]
18-
""".trimIndent()
19+
""".trimIndent()
1920

2021
@Test
2122
fun read_guess_overloads_String_Path_File_produce_same_df() {

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/HtmlOverloadsTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package org.jetbrains.kotlinx.dataframe.io
22

3-
import org.junit.Test
43
import org.junit.Assert.assertEquals
5-
import java.io.File
4+
import org.junit.Test
65
import java.nio.file.Files
7-
import java.nio.file.Paths
86
import java.nio.file.Path
7+
import java.nio.file.Paths
98
import kotlin.io.path.createTempDirectory
109

1110
class HtmlOverloadsTest {
1211

1312
@Test
1413
fun writeHtml_overloads_String_Path_File_produce_same_content() {
15-
val html = DataFrameHtmlData(style = "body{color:black;}", body = "<div>hello</div>", script = "console.log('x')")
14+
val html =
15+
DataFrameHtmlData(style = "body{color:black;}", body = "<div>hello</div>", script = "console.log('x')")
1616
val expected = html.toString()
1717

1818
val tmpDir: Path = createTempDirectory("html_overloads_")

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchemaOverloadsTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import org.junit.Assert.assertEquals
44
import org.junit.Test
55
import java.nio.file.Files
66
import java.nio.file.Path
7-
import java.nio.file.Paths
87
import kotlin.io.path.createTempDirectory
98

109
class ImportDataSchemaOverloadsTest {

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
99
import org.slf4j.LoggerFactory
1010
import java.io.ByteArrayOutputStream
1111
import java.io.File
12-
import java.io.FileOutputStream
1312
import java.io.OutputStream
1413
import java.nio.channels.Channels
1514
import java.nio.channels.WritableByteChannel
@@ -101,8 +100,11 @@ public interface ArrowWriter : AutoCloseable {
101100

102101
/** Path overload for Arrow IPC writing. */
103102
public fun writeArrowIPC(path: Path, append: Boolean = true) {
104-
val options = if (append) arrayOf(StandardOpenOption.CREATE, StandardOpenOption.APPEND)
105-
else arrayOf(StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)
103+
val options = if (append) {
104+
arrayOf(StandardOpenOption.CREATE, StandardOpenOption.APPEND)
105+
} else {
106+
arrayOf(StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)
107+
}
106108
Files.newOutputStream(path, *options).use { os ->
107109
writeArrowIPC(os)
108110
}
@@ -148,7 +150,9 @@ public interface ArrowWriter : AutoCloseable {
148150
/** Path overload for Arrow Feather writing. */
149151
public fun writeArrowFeather(path: Path) {
150152
Files.newOutputStream(
151-
path, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING,
153+
path,
154+
StandardOpenOption.CREATE,
155+
StandardOpenOption.TRUNCATE_EXISTING,
152156
).use { os ->
153157
writeArrowFeather(os)
154158
}

dataframe-arrow/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/ArrowOverloadsSmokeTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
66
import org.junit.Test
77
import java.nio.file.Files
88
import java.nio.file.Path
9-
import java.nio.file.Paths
109
import kotlin.io.path.createTempDirectory
1110

1211
class ArrowOverloadsSmokeTest {
1312

1413
@Test
1514
fun feather_overloads_roundtrip() {
1615
val df = dataFrameOf("name", "age")(
17-
"Alice", 15,
18-
"Bob", 20,
16+
"Alice",
17+
15,
18+
"Bob",
19+
20,
1920
)
2021
val tmp: Path = createTempDirectory("arrow_overloads_")
2122
try {

dataframe-csv/api/dataframe-csv.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/ReadDelimStrKt {
5858
public static synthetic fun readDelimStr$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame$Companion;Ljava/lang/String;CLjava/util/List;ZLjava/util/List;Ljava/util/Map;JLjava/lang/Long;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ZZZCZZZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
5959
}
6060

61-
public final class org/jetbrains/kotlinx/dataframe/io/ReadTsvDeephavenKt {
61+
public final class org/jetbrains/kotlinx/dataframe/io/ReadTsvKt {
6262
public static final fun readTsv (Lorg/jetbrains/kotlinx/dataframe/DataFrame$Companion;Ljava/io/File;CLjava/util/List;ZLjava/util/List;Ljava/util/Map;JLjava/lang/Long;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ZZZCZZZLorg/jetbrains/kotlinx/dataframe/io/Compression;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6363
public static final fun readTsv (Lorg/jetbrains/kotlinx/dataframe/DataFrame$Companion;Ljava/io/InputStream;CLjava/util/List;ZLjava/util/List;Ljava/util/Map;JLjava/lang/Long;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ZZZCZZZLorg/jetbrains/kotlinx/dataframe/io/Compression;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6464
public static final fun readTsv (Lorg/jetbrains/kotlinx/dataframe/DataFrame$Companion;Ljava/lang/String;CLjava/util/List;ZLjava/util/List;Ljava/util/Map;JLjava/lang/Long;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ZZZCZZZLorg/jetbrains/kotlinx/dataframe/io/Compression;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import org.jetbrains.kotlinx.dataframe.documentationCsv.DelimParams.SKIP_LINES
2929
import org.jetbrains.kotlinx.dataframe.documentationCsv.DelimParams.TRIM_INSIDE_QUOTED
3030
import org.jetbrains.kotlinx.dataframe.impl.io.readDelimImpl
3131
import java.io.File
32-
import java.io.FileInputStream
3332
import java.io.InputStream
3433
import java.net.URL
3534
import java.nio.file.Path

0 commit comments

Comments
 (0)