From 1fafe299a2d08928474e9a57c29fe3a29f154dab Mon Sep 17 00:00:00 2001 From: hfhbd Date: Thu, 2 Mar 2023 21:14:16 +0100 Subject: [PATCH] Better java init interop --- .../api/kotlinx-serialization-csv.api | 3 +++ .../kotlin/app/softwork/serialization/csv/CSVFormat.kt | 2 ++ .../api/kotlinx-serialization-flf.api | 8 ++++---- .../softwork/serialization/flf/FixedLengthFormat.kt | 4 ++-- .../app/softwork/serialization/flf/FlfFormatTest.kt | 10 ---------- 5 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 kotlinx-serialization-flf/src/jvmTest/kotlin/app/softwork/serialization/flf/FlfFormatTest.kt diff --git a/kotlinx-serialization-csv/api/kotlinx-serialization-csv.api b/kotlinx-serialization-csv/api/kotlinx-serialization-csv.api index 2331f5d..ce1de0d 100644 --- a/kotlinx-serialization-csv/api/kotlinx-serialization-csv.api +++ b/kotlinx-serialization-csv/api/kotlinx-serialization-csv.api @@ -7,6 +7,9 @@ public abstract class app/softwork/serialization/csv/CSVFormat : kotlinx/seriali } public final class app/softwork/serialization/csv/CSVFormat$Default : app/softwork/serialization/csv/CSVFormat { + public final fun invoke ()Lapp/softwork/serialization/csv/CSVFormat; + public final fun invoke (Ljava/lang/String;)Lapp/softwork/serialization/csv/CSVFormat; + public final fun invoke (Ljava/lang/String;Ljava/lang/String;)Lapp/softwork/serialization/csv/CSVFormat; public final fun invoke (Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/modules/SerializersModule;)Lapp/softwork/serialization/csv/CSVFormat; public static synthetic fun invoke$default (Lapp/softwork/serialization/csv/CSVFormat$Default;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/modules/SerializersModule;ILjava/lang/Object;)Lapp/softwork/serialization/csv/CSVFormat; } diff --git a/kotlinx-serialization-csv/src/commonMain/kotlin/app/softwork/serialization/csv/CSVFormat.kt b/kotlinx-serialization-csv/src/commonMain/kotlin/app/softwork/serialization/csv/CSVFormat.kt index 1880eea..4929f3f 100644 --- a/kotlinx-serialization-csv/src/commonMain/kotlin/app/softwork/serialization/csv/CSVFormat.kt +++ b/kotlinx-serialization-csv/src/commonMain/kotlin/app/softwork/serialization/csv/CSVFormat.kt @@ -2,6 +2,7 @@ package app.softwork.serialization.csv import kotlinx.serialization.* import kotlinx.serialization.modules.* +import kotlin.jvm.* /** * [RFC-4180](https://datatracker.ietf.org/doc/html/rfc4180) @@ -23,6 +24,7 @@ public sealed class CSVFormat( lineSeparator = "\n", serializersModule = EmptySerializersModule() ) { + @JvmOverloads public operator fun invoke( separator: String = ",", lineSeparator: String = "\n", diff --git a/kotlinx-serialization-flf/api/kotlinx-serialization-flf.api b/kotlinx-serialization-flf/api/kotlinx-serialization-flf.api index 36df819..955b514 100644 --- a/kotlinx-serialization-flf/api/kotlinx-serialization-flf.api +++ b/kotlinx-serialization-flf/api/kotlinx-serialization-flf.api @@ -36,10 +36,10 @@ public abstract class app/softwork/serialization/flf/FixedLengthFormat : kotlinx public final class app/softwork/serialization/flf/FixedLengthFormat$Default : app/softwork/serialization/flf/FixedLengthFormat { public final fun invoke ()Lapp/softwork/serialization/flf/FixedLengthFormat; - public final fun invoke (Lkotlinx/serialization/modules/SerializersModule;)Lapp/softwork/serialization/flf/FixedLengthFormat; - public final fun invoke (Lkotlinx/serialization/modules/SerializersModule;Ljava/lang/String;)Lapp/softwork/serialization/flf/FixedLengthFormat; - public final fun invoke (Lkotlinx/serialization/modules/SerializersModule;Ljava/lang/String;Z)Lapp/softwork/serialization/flf/FixedLengthFormat; - public static synthetic fun invoke$default (Lapp/softwork/serialization/flf/FixedLengthFormat$Default;Lkotlinx/serialization/modules/SerializersModule;Ljava/lang/String;ZILjava/lang/Object;)Lapp/softwork/serialization/flf/FixedLengthFormat; + public final fun invoke (Ljava/lang/String;)Lapp/softwork/serialization/flf/FixedLengthFormat; + public final fun invoke (Ljava/lang/String;Z)Lapp/softwork/serialization/flf/FixedLengthFormat; + public final fun invoke (Ljava/lang/String;ZLkotlinx/serialization/modules/SerializersModule;)Lapp/softwork/serialization/flf/FixedLengthFormat; + public static synthetic fun invoke$default (Lapp/softwork/serialization/flf/FixedLengthFormat$Default;Ljava/lang/String;ZLkotlinx/serialization/modules/SerializersModule;ILjava/lang/Object;)Lapp/softwork/serialization/flf/FixedLengthFormat; } public final class app/softwork/serialization/flf/FixedLengthFormatKt { diff --git a/kotlinx-serialization-flf/src/commonMain/kotlin/app/softwork/serialization/flf/FixedLengthFormat.kt b/kotlinx-serialization-flf/src/commonMain/kotlin/app/softwork/serialization/flf/FixedLengthFormat.kt index 8dbf144..3e13948 100644 --- a/kotlinx-serialization-flf/src/commonMain/kotlin/app/softwork/serialization/flf/FixedLengthFormat.kt +++ b/kotlinx-serialization-flf/src/commonMain/kotlin/app/softwork/serialization/flf/FixedLengthFormat.kt @@ -29,9 +29,9 @@ public sealed class FixedLengthFormat( ) { @JvmOverloads public operator fun invoke( - serializersModule: SerializersModule = EmptySerializersModule(), lineSeparator: String = "\n", - fillLeadingZeros: Boolean = true + fillLeadingZeros: Boolean = true, + serializersModule: SerializersModule = EmptySerializersModule(), ): FixedLengthFormat = Custom(serializersModule, lineSeparator, fillLeadingZeros) } diff --git a/kotlinx-serialization-flf/src/jvmTest/kotlin/app/softwork/serialization/flf/FlfFormatTest.kt b/kotlinx-serialization-flf/src/jvmTest/kotlin/app/softwork/serialization/flf/FlfFormatTest.kt deleted file mode 100644 index 82df2ee..0000000 --- a/kotlinx-serialization-flf/src/jvmTest/kotlin/app/softwork/serialization/flf/FlfFormatTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package app.softwork.serialization.flf - -import app.softwork.serialization.flf.Ebcdic.Format.* -import kotlinx.serialization.* -import kotlinx.serialization.json.* -import kotlinx.serialization.modules.* -import kotlin.test.* - -@ExperimentalSerializationApi -class FlfFormatTest