Replace @Optional with @Required

This commit is contained in:
Leonid Startsev
2019-01-18 19:58:49 +03:00
parent 04706f4473
commit e02cfcb8ea
3 changed files with 4 additions and 4 deletions
@@ -85,8 +85,8 @@ val Annotations.serialNameValue: String?
return value
}
val Annotations.serialOptional: Boolean
get() = hasAnnotation(SerializationAnnotations.serialOptionalFqName)
val Annotations.serialRequired: Boolean
get() = hasAnnotation(SerializationAnnotations.requiredAnnotationFqName)
val Annotations.serialTransient: Boolean
get() = hasAnnotation(SerializationAnnotations.serialTransientFqName)
@@ -17,7 +17,7 @@ object SerializationAnnotations {
val serializableAnnotationFqName = FqName("kotlinx.serialization.Serializable")
val serializerAnnotationFqName = FqName("kotlinx.serialization.Serializer")
internal val serialNameAnnotationFqName = FqName("kotlinx.serialization.SerialName")
internal val serialOptionalFqName = FqName("kotlinx.serialization.Optional")
internal val requiredAnnotationFqName = FqName("kotlinx.serialization.Required")
internal val serialTransientFqName = FqName("kotlinx.serialization.Transient")
internal val serialInfoFqName = FqName("kotlinx.serialization.SerialInfo")
@@ -37,7 +37,7 @@ class SerializableProperty(
val genericIndex = type.genericIndex
val module = descriptor.module
val serializableWith = extractSerializableWith(descriptor.annotations)
val optional = descriptor.declaresDefaultValue
val optional = !descriptor.annotations.serialRequired && descriptor.declaresDefaultValue
val transient = descriptor.annotations.serialTransient || !hasBackingField
val annotationsWithArguments: List<Triple<ClassDescriptor, List<ValueArgument>, List<ValueParameterDescriptor>>> =
descriptor.annotationsWithArguments()