Cleanup

Author: iruizmar

firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/Polymorphic.kt

@@ -3,11 +3,9 @@ package dev.gitlive.firebase
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.CompositeDecoder
 import kotlinx.serialization.findPolymorphicSerializer
 import kotlinx.serialization.internal.AbstractPolymorphicSerializer
 
-
 @Suppress("UNCHECKED_CAST")
 internal fun <T> FirebaseEncoder.encodePolymorphically(
     serializer: SerializationStrategy<T>,
@@ -21,14 +19,10 @@ internal fun <T> FirebaseEncoder.encodePolymorphically(
     val casted = serializer as AbstractPolymorphicSerializer<Any>
     val baseClassDiscriminator = serializer.descriptor.classDiscriminator()
     val actualSerializer = casted.findPolymorphicSerializer(this, value as Any)
-//    validateIfSealed(casted, actualSerializer, baseClassDiscriminator)
-//    checkKind(actualSerializer.descriptor.kind)
     ifPolymorphic(baseClassDiscriminator)
     actualSerializer.serialize(this, value)
 }
 
-
-
 @Suppress("UNCHECKED_CAST")
 internal fun <T> FirebaseDecoder.decodeSerializableValuePolymorphic(
     value: Any?,
@@ -49,32 +43,6 @@ internal fun <T> FirebaseDecoder.decodeSerializableValuePolymorphic(
     return actualDeserializer.deserialize(this)
 }
 
-
-//private fun validateIfSealed(
-//    serializer: SerializationStrategy<*>,
-//    actualSerializer: SerializationStrategy<Any>,
-//    classDiscriminator: String
-//) {
-//    if (serializer !is SealedClassSerializer<*>) return
-//    @Suppress("DEPRECATION_ERROR")
-//    if (classDiscriminator in actualSerializer.descriptor.jsonCachedSerialNames()) {
-//        val baseName = serializer.descriptor.serialName
-//        val actualName = actualSerializer.descriptor.serialName
-//        error(
-//            "Sealed class '$actualName' cannot be serialized as base class '$baseName' because" +
-//                    " it has property name that conflicts with class discriminator '$classDiscriminator'. " +
-//                    "You can either change class discriminator with FirebaseClassDiscriminator annotation or " +
-//                    "rename property with @SerialName annotation"
-//        )
-//    }
-//}
-
-//internal fun checkKind(kind: SerialKind) {
-//    if (kind is SerialKind.ENUM) error("Enums cannot be serialized polymorphically with 'type' parameter. You can use 'JsonBuilder.useArrayPolymorphism' instead")
-//    if (kind is PrimitiveKind) error("Primitives cannot be serialized polymorphically with 'type' parameter. You can use 'JsonBuilder.useArrayPolymorphism' instead")
-//    if (kind is PolymorphicKind) error("Actual serializer for polymorphic cannot be polymorphic itself")
-//}
-
 internal fun SerialDescriptor.classDiscriminator(): String {
     // Plain loop is faster than allocation of Sequence or ArrayList
     // We can rely on the fact that only one FirebaseClassDiscriminator is present —

firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt

@@ -7,7 +7,6 @@ package dev.gitlive.firebase
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.json.JsonClassDiscriminator
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull