Skip to content

Commit 3831751

Browse files
Revert "ktlint format and apiDump"
This reverts commit 9e0d436.
1 parent 9e0d436 commit 3831751

File tree

15 files changed

+46
-61
lines changed

15 files changed

+46
-61
lines changed

core/api/core.api

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6086,7 +6086,6 @@ 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;
60906089
}
60916090

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

64036402
public abstract interface class org/jetbrains/kotlinx/dataframe/io/SupportedDataFrameFormat : org/jetbrains/kotlinx/dataframe/io/SupportedFormat {
6404-
public fun readDataFrame (Ljava/io/File;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6403+
public abstract fun readDataFrame (Ljava/io/File;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64056404
public abstract fun readDataFrame (Ljava/io/InputStream;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;
6405+
public fun readDataFrame (Ljava/nio/file/Path;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64076406
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;
64086407
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;
64096408
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;
@@ -6484,7 +6483,6 @@ public final class org/jetbrains/kotlinx/dataframe/io/TSV : org/jetbrains/kotlin
64846483
public fun getTestOrder ()I
64856484
public fun readDataFrame (Ljava/io/File;Ljava/util/List;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
64866485
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;
64886486
}
64896487

64906488
public final class org/jetbrains/kotlinx/dataframe/io/TsvKt {
@@ -6532,15 +6530,13 @@ public final class org/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema {
65326530
public fun <init> (Ljava/io/File;)V
65336531
public fun <init> (Ljava/lang/String;)V
65346532
public fun <init> (Ljava/net/URL;)V
6535-
public fun <init> (Ljava/nio/file/Path;)V
65366533
public final fun getUrl ()Ljava/net/URL;
65376534
}
65386535

65396536
public final class org/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchemaKt {
65406537
public static final fun importDataSchema (Ljava/io/File;)Lorg/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema;
65416538
public static final fun importDataSchema (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/jupyter/ImportDataSchema;
65426539
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;
65446540
}
65456541

65466542
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.nio.file.Path
6160
import java.util.zip.GZIPInputStream
61+
import java.nio.file.Path
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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ import kotlin.io.path.writeText
1010

1111
class GuessOverloadsTest {
1212

13-
private fun sampleJson(): String =
14-
"""
13+
private fun sampleJson(): String = """
1514
[
1615
{"name":"Alice","age":15},
1716
{"name":"Bob","age":20}
1817
]
19-
""".trimIndent()
18+
""".trimIndent()
2019

2120
@Test
2221
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.Assert.assertEquals
43
import org.junit.Test
4+
import org.junit.Assert.assertEquals
5+
import java.io.File
56
import java.nio.file.Files
6-
import java.nio.file.Path
77
import java.nio.file.Paths
8+
import java.nio.file.Path
89
import kotlin.io.path.createTempDirectory
910

1011
class HtmlOverloadsTest {
1112

1213
@Test
1314
fun writeHtml_overloads_String_Path_File_produce_same_content() {
14-
val html =
15-
DataFrameHtmlData(style = "body{color:black;}", body = "<div>hello</div>", script = "console.log('x')")
15+
val html = 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ 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
78
import kotlin.io.path.createTempDirectory
89

910
class ImportDataSchemaOverloadsTest {

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ 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
1213
import java.io.OutputStream
1314
import java.nio.channels.Channels
1415
import java.nio.channels.WritableByteChannel
@@ -100,11 +101,8 @@ public interface ArrowWriter : AutoCloseable {
100101

101102
/** Path overload for Arrow IPC writing. */
102103
public fun writeArrowIPC(path: Path, append: Boolean = true) {
103-
val options = if (append) {
104-
arrayOf(StandardOpenOption.CREATE, StandardOpenOption.APPEND)
105-
} else {
106-
arrayOf(StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)
107-
}
104+
val options = if (append) arrayOf(StandardOpenOption.CREATE, StandardOpenOption.APPEND)
105+
else arrayOf(StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)
108106
Files.newOutputStream(path, *options).use { os ->
109107
writeArrowIPC(os)
110108
}
@@ -150,9 +148,7 @@ public interface ArrowWriter : AutoCloseable {
150148
/** Path overload for Arrow Feather writing. */
151149
public fun writeArrowFeather(path: Path) {
152150
Files.newOutputStream(
153-
path,
154-
StandardOpenOption.CREATE,
155-
StandardOpenOption.TRUNCATE_EXISTING,
151+
path, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING,
156152
).use { os ->
157153
writeArrowFeather(os)
158154
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ 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
910
import kotlin.io.path.createTempDirectory
1011

1112
class ArrowOverloadsSmokeTest {
1213

1314
@Test
1415
fun feather_overloads_roundtrip() {
1516
val df = dataFrameOf("name", "age")(
16-
"Alice",
17-
15,
18-
"Bob",
19-
20,
17+
"Alice", 15,
18+
"Bob", 20,
2019
)
2120
val tmp: Path = createTempDirectory("arrow_overloads_")
2221
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/ReadTsvKt {
61+
public final class org/jetbrains/kotlinx/dataframe/io/ReadTsvDeephavenKt {
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ 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
3233
import java.io.InputStream
3334
import java.net.URL
3435
import java.nio.file.Path

0 commit comments

Comments
 (0)