azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace @Optional with @Required

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializationUtil.kt
+2 -2
View File
@@ -85,8 +85,8 @@ val Annotations.serialNameValue: String?
return value return value
} }
val Annotations.serialOptional: Boolean val Annotations.serialRequired: Boolean
get() = hasAnnotation(SerializationAnnotations.serialOptionalFqName) get() = hasAnnotation(SerializationAnnotations.requiredAnnotationFqName)
val Annotations.serialTransient: Boolean val Annotations.serialTransient: Boolean
get() = hasAnnotation(SerializationAnnotations.serialTransientFqName) get() = hasAnnotation(SerializationAnnotations.serialTransientFqName)
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/NamingConventions.kt
+1 -1
View File
@@ -17,7 +17,7 @@ object SerializationAnnotations {
val serializableAnnotationFqName = FqName("kotlinx.serialization.Serializable") val serializableAnnotationFqName = FqName("kotlinx.serialization.Serializable")
val serializerAnnotationFqName = FqName("kotlinx.serialization.Serializer") val serializerAnnotationFqName = FqName("kotlinx.serialization.Serializer")
internal val serialNameAnnotationFqName = FqName("kotlinx.serialization.SerialName") 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 serialTransientFqName = FqName("kotlinx.serialization.Transient")
internal val serialInfoFqName = FqName("kotlinx.serialization.SerialInfo") internal val serialInfoFqName = FqName("kotlinx.serialization.SerialInfo")
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/SerializableProperty.kt
+1 -1
View File
@@ -37,7 +37,7 @@ class SerializableProperty(
val genericIndex = type.genericIndex val genericIndex = type.genericIndex
val module = descriptor.module val module = descriptor.module
val serializableWith = extractSerializableWith(descriptor.annotations) val serializableWith = extractSerializableWith(descriptor.annotations)
val optional = descriptor.declaresDefaultValue val optional = !descriptor.annotations.serialRequired && descriptor.declaresDefaultValue
val transient = descriptor.annotations.serialTransient || !hasBackingField val transient = descriptor.annotations.serialTransient || !hasBackingField
val annotationsWithArguments: List<Triple<ClassDescriptor, List<ValueArgument>, List<ValueParameterDescriptor>>> = val annotationsWithArguments: List<Triple<ClassDescriptor, List<ValueArgument>, List<ValueParameterDescriptor>>> =
descriptor.annotationsWithArguments() descriptor.annotationsWithArguments()