From 9e58da232711237be806e583ef3373e74cd46673 Mon Sep 17 00:00:00 2001 From: Alexander Koval Date: Fri, 24 Mar 2023 17:36:07 +0200 Subject: [PATCH] Rename elasticmagic-serde-serialization-json module to elasticmagic-serde-kotlinx-json --- benchmarks/build.gradle.kts | 2 +- .../SerializationJsonBenchmark.kt | 2 +- docs/docs/index.md | 2 +- .../api/elasticmagic-serde-kotlinx-json.api | 56 +++++++++---------- .../build.gradle.kts | 0 .../serde/serialization/JsonDeserializer.kt | 2 +- .../serde/serialization/JsonSerde.kt | 2 +- .../serde/serialization/JsonSerializer.kt | 2 +- elasticmagic-transport-ktor/build.gradle.kts | 2 +- .../ElasticsearchKtorTransportTests.kt | 6 +- elasticmagic-transport/build.gradle.kts | 2 +- .../transport/TransportErrorTests.kt | 2 +- integ-tests/build.gradle.kts | 2 +- .../ElasticsearchTransportTests.kt | 2 +- .../kotlin/dev/evo/elasticmagic/serde.kt | 4 +- .../kotlin/dev/evo/elasticmagic/serde.kt | 4 +- .../kotlin/dev/evo/elasticmagic/serde.kt | 4 +- samples/build.gradle.kts | 2 +- .../kotlin/samples/started/Cluster.kt | 2 +- .../kotlin/samples/started/ClusterNative.kt | 2 +- settings.gradle.kts | 2 +- 21 files changed, 52 insertions(+), 52 deletions(-) rename elasticmagic-serde-serialization-json/api/elasticmagic-serde-serialization-json.api => elasticmagic-serde-kotlinx-json/api/elasticmagic-serde-kotlinx-json.api (77%) rename {elasticmagic-serde-serialization-json => elasticmagic-serde-kotlinx-json}/build.gradle.kts (100%) rename {elasticmagic-serde-serialization-json => elasticmagic-serde-kotlinx-json}/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonDeserializer.kt (99%) rename {elasticmagic-serde-serialization-json => elasticmagic-serde-kotlinx-json}/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerde.kt (86%) rename {elasticmagic-serde-serialization-json => elasticmagic-serde-kotlinx-json}/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerializer.kt (98%) diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 94cfeb957f..c7a67504e8 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { val commonMain by getting { dependencies { implementation("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.4.4") - implementation(project(":elasticmagic-serde-serialization-json")) + implementation(project(":elasticmagic-serde-kotlinx-json")) } } val jvmMain by getting { diff --git a/benchmarks/src/commonMain/kotlin/dev/evo/elasticmagic.serde/SerializationJsonBenchmark.kt b/benchmarks/src/commonMain/kotlin/dev/evo/elasticmagic.serde/SerializationJsonBenchmark.kt index 395ec4f66d..8c6119b8a7 100644 --- a/benchmarks/src/commonMain/kotlin/dev/evo/elasticmagic.serde/SerializationJsonBenchmark.kt +++ b/benchmarks/src/commonMain/kotlin/dev/evo/elasticmagic.serde/SerializationJsonBenchmark.kt @@ -1,6 +1,6 @@ package dev.evo.elasticmagic.serde -import dev.evo.elasticmagic.serde.serialization.JsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde import kotlinx.benchmark.BenchmarkTimeUnit import kotlinx.benchmark.OutputTimeUnit diff --git a/docs/docs/index.md b/docs/docs/index.md index 92730eafe9..090e5f50e0 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -24,7 +24,7 @@ dependencies { // Elasticmagic core api implementation("dev.evo.elasticmagic:elasticmagic:$elasticmagicVersion") // Json serialization using kotlinx.serialization - implementation("dev.evo.elasticmagic:elasticmagic-serde-serialization-json:$elasticmagicVersion") + implementation("dev.evo.elasticmagic:elasticmagic-serde-kotlinx-json:$elasticmagicVersion") // Transport that uses ktor http client implementation("dev.evo.elasticmagic:elasticmagic-transport-ktor:$elasticmagicVersion") diff --git a/elasticmagic-serde-serialization-json/api/elasticmagic-serde-serialization-json.api b/elasticmagic-serde-kotlinx-json/api/elasticmagic-serde-kotlinx-json.api similarity index 77% rename from elasticmagic-serde-serialization-json/api/elasticmagic-serde-serialization-json.api rename to elasticmagic-serde-kotlinx-json/api/elasticmagic-serde-kotlinx-json.api index 6ccbc27edc..65c438dc63 100644 --- a/elasticmagic-serde-serialization-json/api/elasticmagic-serde-serialization-json.api +++ b/elasticmagic-serde-kotlinx-json/api/elasticmagic-serde-kotlinx-json.api @@ -1,11 +1,11 @@ -public abstract class dev/evo/elasticmagic/serde/serialization/JsonDeserializer : dev/evo/elasticmagic/serde/Deserializer { - public static final field Companion Ldev/evo/elasticmagic/serde/serialization/JsonDeserializer$Companion; +public abstract class dev/evo/elasticmagic/serde/kotlinx/JsonDeserializer : dev/evo/elasticmagic/serde/Deserializer { + public static final field Companion Ldev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$Companion; public fun objFromString (Ljava/lang/String;)Ldev/evo/elasticmagic/serde/Deserializer$ObjectCtx; public fun objFromStringOrNull (Ljava/lang/String;)Ldev/evo/elasticmagic/serde/Deserializer$ObjectCtx; } -public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$ArrayCtx : dev/evo/elasticmagic/serde/Deserializer$ArrayCtx { - public static final synthetic fun box-impl (Lkotlinx/serialization/json/JsonArray;)Ldev/evo/elasticmagic/serde/serialization/JsonDeserializer$ArrayCtx; +public final class dev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ArrayCtx : dev/evo/elasticmagic/serde/Deserializer$ArrayCtx { + public static final synthetic fun box-impl (Lkotlinx/serialization/json/JsonArray;)Ldev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ArrayCtx; public static fun constructor-impl (Lkotlinx/serialization/json/JsonArray;)Lkotlinx/serialization/json/JsonArray; public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (Lkotlinx/serialization/json/JsonArray;Ljava/lang/Object;)Z @@ -19,7 +19,7 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$Arr public final synthetic fun unbox-impl ()Lkotlinx/serialization/json/JsonArray; } -public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$ArrayIterator : dev/evo/elasticmagic/serde/Deserializer$ArrayIterator { +public final class dev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ArrayIterator : dev/evo/elasticmagic/serde/Deserializer$ArrayIterator { public fun (Ljava/util/Iterator;)V public fun any ()Ljava/lang/Object; public fun anyOrNull ()Ljava/lang/Object; @@ -42,10 +42,10 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$Arr public fun stringOrNull ()Ljava/lang/String; } -public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$Companion : dev/evo/elasticmagic/serde/serialization/JsonDeserializer { +public final class dev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$Companion : dev/evo/elasticmagic/serde/kotlinx/JsonDeserializer { } -public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$ObjectCtx : dev/evo/elasticmagic/serde/Deserializer$ObjectCtx { +public final class dev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ObjectCtx : dev/evo/elasticmagic/serde/Deserializer$ObjectCtx { public fun any (Ljava/lang/String;)Ljava/lang/Object; public static fun any-impl (Lkotlinx/serialization/json/JsonObject;Ljava/lang/String;)Ljava/lang/Object; public fun anyOrNull (Ljava/lang/String;)Ljava/lang/Object; @@ -58,7 +58,7 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$Obj public static fun boolean-impl (Lkotlinx/serialization/json/JsonObject;Ljava/lang/String;)Z public fun booleanOrNull (Ljava/lang/String;)Ljava/lang/Boolean; public static fun booleanOrNull-impl (Lkotlinx/serialization/json/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; - public static final synthetic fun box-impl (Lkotlinx/serialization/json/JsonObject;)Ldev/evo/elasticmagic/serde/serialization/JsonDeserializer$ObjectCtx; + public static final synthetic fun box-impl (Lkotlinx/serialization/json/JsonObject;)Ldev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ObjectCtx; public static fun constructor-impl (Lkotlinx/serialization/json/JsonObject;)Lkotlinx/serialization/json/JsonObject; public fun double (Ljava/lang/String;)D public static fun double-impl (Lkotlinx/serialization/json/JsonObject;Ljava/lang/String;)D @@ -79,8 +79,8 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$Obj public fun intOrNull (Ljava/lang/String;)Ljava/lang/Integer; public static fun intOrNull-impl (Lkotlinx/serialization/json/JsonObject;Ljava/lang/String;)Ljava/lang/Integer; public synthetic fun iterator ()Ldev/evo/elasticmagic/serde/Deserializer$ObjectIterator; - public fun iterator ()Ldev/evo/elasticmagic/serde/serialization/JsonDeserializer$ObjectIterator; - public static fun iterator-impl (Lkotlinx/serialization/json/JsonObject;)Ldev/evo/elasticmagic/serde/serialization/JsonDeserializer$ObjectIterator; + public fun iterator ()Ldev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ObjectIterator; + public static fun iterator-impl (Lkotlinx/serialization/json/JsonObject;)Ldev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ObjectIterator; public fun long (Ljava/lang/String;)J public static fun long-impl (Lkotlinx/serialization/json/JsonObject;Ljava/lang/String;)J public fun longOrNull (Ljava/lang/String;)Ljava/lang/Long; @@ -98,7 +98,7 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$Obj public final synthetic fun unbox-impl ()Lkotlinx/serialization/json/JsonObject; } -public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$ObjectIterator : dev/evo/elasticmagic/serde/Deserializer$ObjectIterator { +public final class dev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$ObjectIterator : dev/evo/elasticmagic/serde/Deserializer$ObjectIterator { public fun (Ljava/util/Iterator;)V public fun any ()Ljava/lang/Object; public fun anyOrNull ()Ljava/lang/Object; @@ -122,23 +122,23 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonDeserializer$Obj public fun stringOrNull ()Ljava/lang/String; } -public final class dev/evo/elasticmagic/serde/serialization/JsonSerde : dev/evo/elasticmagic/serde/Serde$OneLineJson { - public static final field INSTANCE Ldev/evo/elasticmagic/serde/serialization/JsonSerde; +public final class dev/evo/elasticmagic/serde/kotlinx/JsonSerde : dev/evo/elasticmagic/serde/Serde$OneLineJson { + public static final field INSTANCE Ldev/evo/elasticmagic/serde/kotlinx/JsonSerde; public synthetic fun getDeserializer ()Ldev/evo/elasticmagic/serde/Deserializer; - public fun getDeserializer ()Ldev/evo/elasticmagic/serde/serialization/JsonDeserializer$Companion; + public fun getDeserializer ()Ldev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$Companion; public synthetic fun getSerializer ()Ldev/evo/elasticmagic/serde/Serializer; - public fun getSerializer ()Ldev/evo/elasticmagic/serde/serialization/JsonSerializer$Companion; + public fun getSerializer ()Ldev/evo/elasticmagic/serde/kotlinx/JsonSerializer$Companion; } -public abstract class dev/evo/elasticmagic/serde/serialization/JsonSerializer : dev/evo/elasticmagic/serde/Serializer { - public static final field Companion Ldev/evo/elasticmagic/serde/serialization/JsonSerializer$Companion; +public abstract class dev/evo/elasticmagic/serde/kotlinx/JsonSerializer : dev/evo/elasticmagic/serde/Serializer { + public static final field Companion Ldev/evo/elasticmagic/serde/kotlinx/JsonSerializer$Companion; public fun array (Lkotlin/jvm/functions/Function1;)Ldev/evo/elasticmagic/serde/Serializer$ArrayCtx; protected fun getJson ()Lkotlinx/serialization/json/Json; public fun obj (Lkotlin/jvm/functions/Function1;)Ldev/evo/elasticmagic/serde/Serializer$ObjectCtx; } -public final class dev/evo/elasticmagic/serde/serialization/JsonSerializer$ArrayCtx : dev/evo/elasticmagic/serde/Serializer$ArrayCtx { - public fun (Ldev/evo/elasticmagic/serde/serialization/JsonSerializer;)V +public final class dev/evo/elasticmagic/serde/kotlinx/JsonSerializer$ArrayCtx : dev/evo/elasticmagic/serde/Serializer$ArrayCtx { + public fun (Ldev/evo/elasticmagic/serde/kotlinx/JsonSerializer;)V public fun array (Lkotlin/jvm/functions/Function1;)V public final fun build ()Lkotlinx/serialization/json/JsonArray; public fun obj (Lkotlin/jvm/functions/Function1;)V @@ -159,11 +159,11 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonSerializer$Array public fun valueIfNotNull (Ljava/lang/String;)V } -public final class dev/evo/elasticmagic/serde/serialization/JsonSerializer$Companion : dev/evo/elasticmagic/serde/serialization/JsonSerializer { +public final class dev/evo/elasticmagic/serde/kotlinx/JsonSerializer$Companion : dev/evo/elasticmagic/serde/kotlinx/JsonSerializer { } -public final class dev/evo/elasticmagic/serde/serialization/JsonSerializer$ObjectCtx : dev/evo/elasticmagic/serde/Serializer$ObjectCtx { - public fun (Ldev/evo/elasticmagic/serde/serialization/JsonSerializer;)V +public final class dev/evo/elasticmagic/serde/kotlinx/JsonSerializer$ObjectCtx : dev/evo/elasticmagic/serde/Serializer$ObjectCtx { + public fun (Ldev/evo/elasticmagic/serde/kotlinx/JsonSerializer;)V public fun array (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public final fun build ()Lkotlinx/serialization/json/JsonObject; public fun field (Ljava/lang/String;Ljava/lang/Boolean;)V @@ -184,15 +184,15 @@ public final class dev/evo/elasticmagic/serde/serialization/JsonSerializer$Objec public fun serialize ()Ljava/lang/String; } -public final class dev/evo/elasticmagic/serde/serialization/PrettyJsonSerde : dev/evo/elasticmagic/serde/Serde$Json { - public static final field INSTANCE Ldev/evo/elasticmagic/serde/serialization/PrettyJsonSerde; +public final class dev/evo/elasticmagic/serde/kotlinx/PrettyJsonSerde : dev/evo/elasticmagic/serde/Serde$Json { + public static final field INSTANCE Ldev/evo/elasticmagic/serde/kotlinx/PrettyJsonSerde; public synthetic fun getDeserializer ()Ldev/evo/elasticmagic/serde/Deserializer; - public fun getDeserializer ()Ldev/evo/elasticmagic/serde/serialization/JsonDeserializer$Companion; + public fun getDeserializer ()Ldev/evo/elasticmagic/serde/kotlinx/JsonDeserializer$Companion; public synthetic fun getSerializer ()Ldev/evo/elasticmagic/serde/Serializer; - public fun getSerializer ()Ldev/evo/elasticmagic/serde/serialization/PrettyJsonSerializer; + public fun getSerializer ()Ldev/evo/elasticmagic/serde/kotlinx/PrettyJsonSerializer; } -public final class dev/evo/elasticmagic/serde/serialization/PrettyJsonSerializer : dev/evo/elasticmagic/serde/serialization/JsonSerializer { - public static final field INSTANCE Ldev/evo/elasticmagic/serde/serialization/PrettyJsonSerializer; +public final class dev/evo/elasticmagic/serde/kotlinx/PrettyJsonSerializer : dev/evo/elasticmagic/serde/kotlinx/JsonSerializer { + public static final field INSTANCE Ldev/evo/elasticmagic/serde/kotlinx/PrettyJsonSerializer; } diff --git a/elasticmagic-serde-serialization-json/build.gradle.kts b/elasticmagic-serde-kotlinx-json/build.gradle.kts similarity index 100% rename from elasticmagic-serde-serialization-json/build.gradle.kts rename to elasticmagic-serde-kotlinx-json/build.gradle.kts diff --git a/elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonDeserializer.kt b/elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonDeserializer.kt similarity index 99% rename from elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonDeserializer.kt rename to elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonDeserializer.kt index c7f4188b26..e6ba11a645 100644 --- a/elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonDeserializer.kt +++ b/elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonDeserializer.kt @@ -1,4 +1,4 @@ -package dev.evo.elasticmagic.serde.serialization +package dev.evo.elasticmagic.serde.kotlinx import dev.evo.elasticmagic.serde.DeserializationException import dev.evo.elasticmagic.serde.Deserializer diff --git a/elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerde.kt b/elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerde.kt similarity index 86% rename from elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerde.kt rename to elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerde.kt index 4e043ccdaf..4791338706 100644 --- a/elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerde.kt +++ b/elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerde.kt @@ -1,4 +1,4 @@ -package dev.evo.elasticmagic.serde.serialization +package dev.evo.elasticmagic.serde.kotlinx import dev.evo.elasticmagic.serde.Serde diff --git a/elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerializer.kt b/elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerializer.kt similarity index 98% rename from elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerializer.kt rename to elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerializer.kt index 1f2289a66e..6c34c9ab28 100644 --- a/elasticmagic-serde-serialization-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerializer.kt +++ b/elasticmagic-serde-kotlinx-json/src/commonMain/kotlin/dev/evo/elasticmagic/serde/serialization/JsonSerializer.kt @@ -1,4 +1,4 @@ -package dev.evo.elasticmagic.serde.serialization +package dev.evo.elasticmagic.serde.kotlinx import dev.evo.elasticmagic.serde.Serializer import kotlinx.serialization.json.Json diff --git a/elasticmagic-transport-ktor/build.gradle.kts b/elasticmagic-transport-ktor/build.gradle.kts index 2209bca986..5fd83375d8 100644 --- a/elasticmagic-transport-ktor/build.gradle.kts +++ b/elasticmagic-transport-ktor/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { val commonTest by getting { dependencies { implementation(Libs.ktorClient("mock")) - implementation(project(":elasticmagic-serde-serialization-json")) + implementation(project(":elasticmagic-serde-kotlinx-json")) } } } diff --git a/elasticmagic-transport-ktor/src/commonTest/kotlin/dev.evo.elasticmagic.transport/ElasticsearchKtorTransportTests.kt b/elasticmagic-transport-ktor/src/commonTest/kotlin/dev.evo.elasticmagic.transport/ElasticsearchKtorTransportTests.kt index 58a542b9c9..f9de321e4f 100644 --- a/elasticmagic-transport-ktor/src/commonTest/kotlin/dev.evo.elasticmagic.transport/ElasticsearchKtorTransportTests.kt +++ b/elasticmagic-transport-ktor/src/commonTest/kotlin/dev.evo.elasticmagic.transport/ElasticsearchKtorTransportTests.kt @@ -1,8 +1,8 @@ package dev.evo.elasticmagic.transport -import dev.evo.elasticmagic.serde.serialization.JsonDeserializer -import dev.evo.elasticmagic.serde.serialization.JsonSerde -import dev.evo.elasticmagic.serde.serialization.JsonSerializer +import dev.evo.elasticmagic.serde.kotlinx.JsonDeserializer +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerializer import dev.evo.elasticmagic.serde.toMap import io.kotest.assertions.throwables.shouldThrow diff --git a/elasticmagic-transport/build.gradle.kts b/elasticmagic-transport/build.gradle.kts index ae48a31b1a..b33c483389 100644 --- a/elasticmagic-transport/build.gradle.kts +++ b/elasticmagic-transport/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { getByName("commonTest") { dependencies { - api(project(":elasticmagic-serde-serialization-json")) + api(project(":elasticmagic-serde-kotlinx-json")) api(Libs.kotlinxSerialization("json")) } } diff --git a/elasticmagic-transport/src/commonTest/kotlin/dev/evo/elasticmagic/transport/TransportErrorTests.kt b/elasticmagic-transport/src/commonTest/kotlin/dev/evo/elasticmagic/transport/TransportErrorTests.kt index 4cdf47e046..7d118d725e 100644 --- a/elasticmagic-transport/src/commonTest/kotlin/dev/evo/elasticmagic/transport/TransportErrorTests.kt +++ b/elasticmagic-transport/src/commonTest/kotlin/dev/evo/elasticmagic/transport/TransportErrorTests.kt @@ -1,6 +1,6 @@ package dev.evo.elasticmagic.transport -import dev.evo.elasticmagic.serde.serialization.JsonDeserializer +import dev.evo.elasticmagic.serde.kotlinx.JsonDeserializer import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeInstanceOf diff --git a/integ-tests/build.gradle.kts b/integ-tests/build.gradle.kts index 4bd69077fd..d4bb74549f 100644 --- a/integ-tests/build.gradle.kts +++ b/integ-tests/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { dependencies { implementation(project(":elasticmagic")) - implementation(project(":elasticmagic-serde-serialization-json")) + implementation(project(":elasticmagic-serde-kotlinx-json")) implementation(project(":elasticmagic-transport-ktor")) implementation(Libs.ktorClient("core")) diff --git a/integ-tests/src/commonTest/kotlin/dev/evo/elasticmagic/ElasticsearchTransportTests.kt b/integ-tests/src/commonTest/kotlin/dev/evo/elasticmagic/ElasticsearchTransportTests.kt index 45f1a1a497..5e60d84753 100644 --- a/integ-tests/src/commonTest/kotlin/dev/evo/elasticmagic/ElasticsearchTransportTests.kt +++ b/integ-tests/src/commonTest/kotlin/dev/evo/elasticmagic/ElasticsearchTransportTests.kt @@ -1,6 +1,6 @@ package dev.evo.elasticmagic -import dev.evo.elasticmagic.serde.serialization.JsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde import dev.evo.elasticmagic.transport.CatRequest import dev.evo.elasticmagic.transport.ElasticsearchException import dev.evo.elasticmagic.transport.ElasticsearchKtorTransport diff --git a/integ-tests/src/jsTest/kotlin/dev/evo/elasticmagic/serde.kt b/integ-tests/src/jsTest/kotlin/dev/evo/elasticmagic/serde.kt index 9253631c7b..7c9c65cbec 100644 --- a/integ-tests/src/jsTest/kotlin/dev/evo/elasticmagic/serde.kt +++ b/integ-tests/src/jsTest/kotlin/dev/evo/elasticmagic/serde.kt @@ -1,8 +1,8 @@ package dev.evo.elasticmagic import dev.evo.elasticmagic.serde.Serde -import dev.evo.elasticmagic.serde.serialization.JsonSerde as SerializationJsonSerde -import dev.evo.elasticmagic.serde.serialization.PrettyJsonSerde as SerializationPrettyJsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde as SerializationJsonSerde +import dev.evo.elasticmagic.serde.kotlinx.PrettyJsonSerde as SerializationPrettyJsonSerde actual val apiSerdes: List = listOf( SerializationJsonSerde, diff --git a/integ-tests/src/jvmTest/kotlin/dev/evo/elasticmagic/serde.kt b/integ-tests/src/jvmTest/kotlin/dev/evo/elasticmagic/serde.kt index c6b90a982a..6c57b024a8 100644 --- a/integ-tests/src/jvmTest/kotlin/dev/evo/elasticmagic/serde.kt +++ b/integ-tests/src/jvmTest/kotlin/dev/evo/elasticmagic/serde.kt @@ -4,8 +4,8 @@ import dev.evo.elasticmagic.serde.Serde import dev.evo.elasticmagic.serde.jackson.JsonSerde as JacksonJsonSerde import dev.evo.elasticmagic.serde.jackson.JsonSerde as JacksonPrettyJsonSerde import dev.evo.elasticmagic.serde.jackson.YamlSerde as JacksonYamlSerde -import dev.evo.elasticmagic.serde.serialization.JsonSerde as SerializationJsonSerde -import dev.evo.elasticmagic.serde.serialization.PrettyJsonSerde as SerializationPrettyJsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde as SerializationJsonSerde +import dev.evo.elasticmagic.serde.kotlinx.PrettyJsonSerde as SerializationPrettyJsonSerde actual val apiSerdes = listOf( SerializationJsonSerde, diff --git a/integ-tests/src/nativeTest/kotlin/dev/evo/elasticmagic/serde.kt b/integ-tests/src/nativeTest/kotlin/dev/evo/elasticmagic/serde.kt index 9253631c7b..7c9c65cbec 100644 --- a/integ-tests/src/nativeTest/kotlin/dev/evo/elasticmagic/serde.kt +++ b/integ-tests/src/nativeTest/kotlin/dev/evo/elasticmagic/serde.kt @@ -1,8 +1,8 @@ package dev.evo.elasticmagic import dev.evo.elasticmagic.serde.Serde -import dev.evo.elasticmagic.serde.serialization.JsonSerde as SerializationJsonSerde -import dev.evo.elasticmagic.serde.serialization.PrettyJsonSerde as SerializationPrettyJsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde as SerializationJsonSerde +import dev.evo.elasticmagic.serde.kotlinx.PrettyJsonSerde as SerializationPrettyJsonSerde actual val apiSerdes: List = listOf( SerializationJsonSerde, diff --git a/samples/build.gradle.kts b/samples/build.gradle.kts index 120147ca4f..48b46d9235 100644 --- a/samples/build.gradle.kts +++ b/samples/build.gradle.kts @@ -23,7 +23,7 @@ configure { dependencies { implementation(project(":elasticmagic")) implementation(project(":elasticmagic-query-filters")) - implementation(project(":elasticmagic-serde-serialization-json")) + implementation(project(":elasticmagic-serde-kotlinx-json")) implementation(project(":elasticmagic-transport-ktor")) implementation(Libs.kotlinxCoroutines("core")) diff --git a/samples/src/commonMain/kotlin/samples/started/Cluster.kt b/samples/src/commonMain/kotlin/samples/started/Cluster.kt index 58754cf1b0..b82be79368 100644 --- a/samples/src/commonMain/kotlin/samples/started/Cluster.kt +++ b/samples/src/commonMain/kotlin/samples/started/Cluster.kt @@ -1,7 +1,7 @@ package samples.started import dev.evo.elasticmagic.ElasticsearchCluster -import dev.evo.elasticmagic.serde.serialization.JsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde import dev.evo.elasticmagic.transport.ElasticsearchKtorTransport const val DEFAULT_ELASTIC_URL = "http://localhost:9200" diff --git a/samples/src/nativeMain/kotlin/samples/started/ClusterNative.kt b/samples/src/nativeMain/kotlin/samples/started/ClusterNative.kt index e6b4217b14..ca209f5b3b 100644 --- a/samples/src/nativeMain/kotlin/samples/started/ClusterNative.kt +++ b/samples/src/nativeMain/kotlin/samples/started/ClusterNative.kt @@ -1,6 +1,6 @@ package samples.started -import dev.evo.elasticmagic.serde.serialization.JsonSerde +import dev.evo.elasticmagic.serde.kotlinx.JsonSerde import dev.evo.elasticmagic.transport.Auth import dev.evo.elasticmagic.transport.ElasticsearchKtorTransport diff --git a/settings.gradle.kts b/settings.gradle.kts index f294fb62d4..5f2e6062ad 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ include( "elasticmagic-serde", "elasticmagic-serde-jackson-json", "elasticmagic-serde-jackson-yaml", - "elasticmagic-serde-serialization-json", + "elasticmagic-serde-kotlinx-json", "elasticmagic-transport", "elasticmagic-transport-ktor", "integ-tests",