Skip to content

Commit a903676

Browse files
ktlintFormat and apiDump
1 parent a33ee00 commit a903676

File tree

6 files changed

+26
-20
lines changed

6 files changed

+26
-20
lines changed

core/api/core.api

Lines changed: 14 additions & 10 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;
@@ -6420,17 +6421,17 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/io/SupportedForm
64206421
}
64216422

64226423
public final class org/jetbrains/kotlinx/dataframe/io/SupportedFormatSample$DataFile : org/jetbrains/kotlinx/dataframe/io/SupportedFormatSample {
6423-
public static final synthetic fun box-impl (Ljava/io/File;)Lorg/jetbrains/kotlinx/dataframe/io/SupportedFormatSample$DataFile;
6424-
public static fun constructor-impl (Ljava/io/File;)Ljava/io/File;
6424+
public static final synthetic fun box-impl (Ljava/nio/file/Path;)Lorg/jetbrains/kotlinx/dataframe/io/SupportedFormatSample$DataFile;
6425+
public static fun constructor-impl (Ljava/nio/file/Path;)Ljava/nio/file/Path;
64256426
public fun equals (Ljava/lang/Object;)Z
6426-
public static fun equals-impl (Ljava/io/File;Ljava/lang/Object;)Z
6427-
public static final fun equals-impl0 (Ljava/io/File;Ljava/io/File;)Z
6428-
public final fun getSampleFile ()Ljava/io/File;
6427+
public static fun equals-impl (Ljava/nio/file/Path;Ljava/lang/Object;)Z
6428+
public static final fun equals-impl0 (Ljava/nio/file/Path;Ljava/nio/file/Path;)Z
6429+
public final fun getSampleFilePath ()Ljava/nio/file/Path;
64296430
public fun hashCode ()I
6430-
public static fun hashCode-impl (Ljava/io/File;)I
6431+
public static fun hashCode-impl (Ljava/nio/file/Path;)I
64316432
public fun toString ()Ljava/lang/String;
6432-
public static fun toString-impl (Ljava/io/File;)Ljava/lang/String;
6433-
public final synthetic fun unbox-impl ()Ljava/io/File;
6433+
public static fun toString-impl (Ljava/nio/file/Path;)Ljava/lang/String;
6434+
public final synthetic fun unbox-impl ()Ljava/nio/file/Path;
64346435
}
64356436

64366437
public final class org/jetbrains/kotlinx/dataframe/io/SupportedFormatSample$DataString : org/jetbrains/kotlinx/dataframe/io/SupportedFormatSample {
@@ -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
@@ -58,8 +58,8 @@ public sealed interface SupportedFormatSample {
5858
public interface SupportedDataFrameFormat : SupportedFormat {
5959
public fun readDataFrame(stream: InputStream, header: List<String> = emptyList()): DataFrame<*>
6060

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

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

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-openapi-generator/api/dataframe-openapi-generator.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
public final class org/jetbrains/kotlinx/dataframe/io/IsOpenApiKt {
2-
public static final fun isOpenApi (Ljava/io/File;)Z
32
public static final fun isOpenApi (Ljava/lang/String;)Z
43
public static final fun isOpenApi (Ljava/net/URL;)Z
4+
public static final fun isOpenApi (Ljava/nio/file/Path;)Z
55
public static final fun isOpenApiStr (Ljava/lang/String;)Z
66
}
77

dataframe-openapi-generator/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/isOpenApi.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.jetbrains.kotlinx.dataframe.io
22

33
import io.github.oshai.kotlinlogging.KotlinLogging
44
import io.swagger.parser.OpenAPIParser
5-
import java.io.File
65
import java.net.URL
76
import java.nio.file.Path
87
import kotlin.io.path.extension
@@ -33,7 +32,6 @@ public fun isOpenApi(url: URL): Boolean {
3332
return isOpenApiStr(url.readText())
3433
}
3534

36-
3735
public fun isOpenApi(path: Path): Boolean {
3836
if (path.extension.lowercase() in listOf("yml", "yaml")) {
3937
return true

0 commit comments

Comments
 (0)