From 24129c81026583ec7ff40c47d132b6d71d439ce7 Mon Sep 17 00:00:00 2001 From: Denis Savosin Date: Thu, 24 Oct 2024 12:50:35 +0700 Subject: [PATCH] move serializables to models package --- src/main/kotlin/com/github/dannecron/demo/models/City.kt | 4 ++-- src/main/kotlin/com/github/dannecron/demo/models/Customer.kt | 4 ++-- src/main/kotlin/com/github/dannecron/demo/models/Product.kt | 4 ++-- .../kotlin/com/github/dannecron/demo/models/order/Order.kt | 4 ++-- .../com/github/dannecron/demo/models/order/OrderProduct.kt | 4 ++-- .../serializables/OffsetDateTimeSerialization.kt | 4 ++-- .../{services => models}/serializables/UuidSerialization.kt | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename src/main/kotlin/com/github/dannecron/demo/{services => models}/serializables/OffsetDateTimeSerialization.kt (84%) rename src/main/kotlin/com/github/dannecron/demo/{services => models}/serializables/UuidSerialization.kt (84%) diff --git a/src/main/kotlin/com/github/dannecron/demo/models/City.kt b/src/main/kotlin/com/github/dannecron/demo/models/City.kt index 7db87c4..c9a7ef6 100644 --- a/src/main/kotlin/com/github/dannecron/demo/models/City.kt +++ b/src/main/kotlin/com/github/dannecron/demo/models/City.kt @@ -1,7 +1,7 @@ package com.github.dannecron.demo.models -import com.github.dannecron.demo.services.serializables.OffsetDateTimeSerialization -import com.github.dannecron.demo.services.serializables.UuidSerialization +import com.github.dannecron.demo.models.serializables.OffsetDateTimeSerialization +import com.github.dannecron.demo.models.serializables.UuidSerialization import kotlinx.serialization.Serializable import org.springframework.data.annotation.Id import org.springframework.data.relational.core.mapping.Column diff --git a/src/main/kotlin/com/github/dannecron/demo/models/Customer.kt b/src/main/kotlin/com/github/dannecron/demo/models/Customer.kt index 972ff37..02d19ba 100644 --- a/src/main/kotlin/com/github/dannecron/demo/models/Customer.kt +++ b/src/main/kotlin/com/github/dannecron/demo/models/Customer.kt @@ -1,7 +1,7 @@ package com.github.dannecron.demo.models -import com.github.dannecron.demo.services.serializables.OffsetDateTimeSerialization -import com.github.dannecron.demo.services.serializables.UuidSerialization +import com.github.dannecron.demo.models.serializables.OffsetDateTimeSerialization +import com.github.dannecron.demo.models.serializables.UuidSerialization import kotlinx.serialization.Serializable import org.springframework.data.annotation.Id import org.springframework.data.relational.core.mapping.Column diff --git a/src/main/kotlin/com/github/dannecron/demo/models/Product.kt b/src/main/kotlin/com/github/dannecron/demo/models/Product.kt index 52921e7..a4dc8bc 100644 --- a/src/main/kotlin/com/github/dannecron/demo/models/Product.kt +++ b/src/main/kotlin/com/github/dannecron/demo/models/Product.kt @@ -1,8 +1,8 @@ package com.github.dannecron.demo.models -import com.github.dannecron.demo.services.serializables.OffsetDateTimeSerialization -import com.github.dannecron.demo.services.serializables.UuidSerialization +import com.github.dannecron.demo.models.serializables.OffsetDateTimeSerialization +import com.github.dannecron.demo.models.serializables.UuidSerialization import com.github.dannecron.demo.utils.roundTo import kotlinx.serialization.Serializable import org.springframework.data.annotation.Id diff --git a/src/main/kotlin/com/github/dannecron/demo/models/order/Order.kt b/src/main/kotlin/com/github/dannecron/demo/models/order/Order.kt index dde54c3..7b9a57e 100644 --- a/src/main/kotlin/com/github/dannecron/demo/models/order/Order.kt +++ b/src/main/kotlin/com/github/dannecron/demo/models/order/Order.kt @@ -1,7 +1,7 @@ package com.github.dannecron.demo.models.order -import com.github.dannecron.demo.services.serializables.OffsetDateTimeSerialization -import com.github.dannecron.demo.services.serializables.UuidSerialization +import com.github.dannecron.demo.models.serializables.OffsetDateTimeSerialization +import com.github.dannecron.demo.models.serializables.UuidSerialization import kotlinx.serialization.Serializable import org.springframework.data.annotation.Id import org.springframework.data.relational.core.mapping.Column diff --git a/src/main/kotlin/com/github/dannecron/demo/models/order/OrderProduct.kt b/src/main/kotlin/com/github/dannecron/demo/models/order/OrderProduct.kt index 30df89c..334d072 100644 --- a/src/main/kotlin/com/github/dannecron/demo/models/order/OrderProduct.kt +++ b/src/main/kotlin/com/github/dannecron/demo/models/order/OrderProduct.kt @@ -1,7 +1,7 @@ package com.github.dannecron.demo.models.order -import com.github.dannecron.demo.services.serializables.OffsetDateTimeSerialization -import com.github.dannecron.demo.services.serializables.UuidSerialization +import com.github.dannecron.demo.models.serializables.OffsetDateTimeSerialization +import com.github.dannecron.demo.models.serializables.UuidSerialization import kotlinx.serialization.Serializable import org.springframework.data.annotation.Id import org.springframework.data.annotation.Transient diff --git a/src/main/kotlin/com/github/dannecron/demo/services/serializables/OffsetDateTimeSerialization.kt b/src/main/kotlin/com/github/dannecron/demo/models/serializables/OffsetDateTimeSerialization.kt similarity index 84% rename from src/main/kotlin/com/github/dannecron/demo/services/serializables/OffsetDateTimeSerialization.kt rename to src/main/kotlin/com/github/dannecron/demo/models/serializables/OffsetDateTimeSerialization.kt index b685ae5..46bed04 100644 --- a/src/main/kotlin/com/github/dannecron/demo/services/serializables/OffsetDateTimeSerialization.kt +++ b/src/main/kotlin/com/github/dannecron/demo/models/serializables/OffsetDateTimeSerialization.kt @@ -1,4 +1,4 @@ -package com.github.dannecron.demo.services.serializables +package com.github.dannecron.demo.models.serializables import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.PrimitiveKind @@ -8,7 +8,7 @@ import kotlinx.serialization.encoding.Encoder import java.time.OffsetDateTime import java.time.format.DateTimeFormatter -class OffsetDateTimeSerialization: KSerializer { +object OffsetDateTimeSerialization: KSerializer { override val descriptor = PrimitiveSerialDescriptor("Time", PrimitiveKind.STRING) override fun deserialize(decoder: Decoder): OffsetDateTime = OffsetDateTime.parse(decoder.decodeString()) diff --git a/src/main/kotlin/com/github/dannecron/demo/services/serializables/UuidSerialization.kt b/src/main/kotlin/com/github/dannecron/demo/models/serializables/UuidSerialization.kt similarity index 84% rename from src/main/kotlin/com/github/dannecron/demo/services/serializables/UuidSerialization.kt rename to src/main/kotlin/com/github/dannecron/demo/models/serializables/UuidSerialization.kt index 7348cda..a694fe0 100644 --- a/src/main/kotlin/com/github/dannecron/demo/services/serializables/UuidSerialization.kt +++ b/src/main/kotlin/com/github/dannecron/demo/models/serializables/UuidSerialization.kt @@ -1,4 +1,4 @@ -package com.github.dannecron.demo.services.serializables +package com.github.dannecron.demo.models.serializables import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.PrimitiveKind @@ -7,7 +7,7 @@ import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder import java.util.* -class UuidSerialization: KSerializer { +object UuidSerialization: KSerializer { override val descriptor = PrimitiveSerialDescriptor("UUID", PrimitiveKind.STRING) override fun deserialize(decoder: Decoder): UUID = UUID.fromString(decoder.decodeString())