github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-15 13:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

JceStruct serialization: optional elements support

Browse Source
This commit is contained in:
Him188 2020-01-28 17:27:28 +08:00
parent 2e80d33048
commit 94502d446b
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/Jce.kt
View File

@ -330,6 +330,9 @@ class Jce private constructor(private val charset: JceCharset, context: SerialMo
override fun decodeTaggedString(tag: Int): String = input.readString(tag) override fun decodeTaggedString(tag: Int): String = input.readString(tag)
override fun decodeTaggedBoolean(tag: Int): Boolean = input.readBoolean(tag) override fun decodeTaggedBoolean(tag: Int): Boolean = input.readBoolean(tag)
override fun decodeTaggedEnum(tag: Int, enumDescription: SerialDescriptor): Int =
TODO()
/** /**
* 在 [KSerializer.serialize] 前 * 在 [KSerializer.serialize] 前
*/ */
@ -371,10 +374,20 @@ class Jce private constructor(private val charset: JceCharset, context: SerialMo
return NullReader(this.input) return NullReader(this.input)
} }
if (tag!=null) {
popTag()
}
return JceMapReader(input.readInt(0), this.input) return JceMapReader(input.readInt(0), this.input)
} }
} }
if (!input.input.endOfInput) {
val tag = currentTagOrNull
if (tag != null && input.peakHead().tag > tag) {
return NullReader(this.input)
}
}
if (desc.kind == StructureKind.CLASS || desc.kind == UnionKind.OBJECT) { if (desc.kind == StructureKind.CLASS || desc.kind == UnionKind.OBJECT) {
val tag = currentTagOrNull val tag = currentTagOrNull
if (tag != null) { if (tag != null) {
@ -390,18 +403,20 @@ class Jce private constructor(private val charset: JceCharset, context: SerialMo
return this // top-level return this // top-level
} }
if (!input.input.endOfInput) { return super.beginStructure(desc, *typeParams)
val tag = currentTagOrNull
if (tag != null && input.peakHead().tag > tag) {
return NullReader(this.input)
}
} }
return super.beginStructure(desc, *typeParams) override fun decodeTaggedNull(tag: Int): Nothing? {
return null
}
override fun decodeTaggedNotNullMark(tag: Int): Boolean {
return !input.input.endOfInput && input.peakHead().tag <= tag
} }
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
override fun <T : Any> decodeNullableSerializableValue(deserializer: DeserializationStrategy<T?>): T? { override fun <T : Any> decodeNullableSerializableValue(deserializer: DeserializationStrategy<T?>): T? {
println("decodeNullableSerializableValue: ${deserializer.getClassName()}")
if (deserializer is NullReader) { if (deserializer is NullReader) {
return null return null
} }
@ -421,6 +436,7 @@ class Jce private constructor(private val charset: JceCharset, context: SerialMo
) { ) {
return input.readByteArray(popTag()).toMutableList() as T return input.readByteArray(popTag()).toMutableList() as T
} }
return super.decodeSerializableValue(deserializer)
} }
is MapLikeDescriptor -> { is MapLikeDescriptor -> {
// 将 mapOf(k1 to v1, k2 to v2, ...) 转换为 listOf(k1, v1, k2, v2, ...) 以便于写入. // 将 mapOf(k1 to v1, k2 to v2, ...) 转换为 listOf(k1, v1, k2, v2, ...) 以便于写入.
@ -430,16 +446,18 @@ class Jce private constructor(private val charset: JceCharset, context: SerialMo
return setOfEntries.associateBy({ it.key }, { it.value }) as T return setOfEntries.associateBy({ it.key }, { it.value }) as T
} }
} }
return super.decodeSerializableValue(deserializer) val tag = currentTagOrNull ?: return deserializer.deserialize(this)
return if (this.decodeTaggedNotNullMark(tag)){
deserializer.deserialize(this)
} else {
null
}
} }
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
override fun <T> decodeSerializableValue(deserializer: DeserializationStrategy<T>): T { override fun <T> decodeSerializableValue(deserializer: DeserializationStrategy<T>): T {
return decodeNullableSerializableValue(deserializer as DeserializationStrategy<Any?>) as? T ?: error("value is not optional but cannot find") return decodeNullableSerializableValue(deserializer as DeserializationStrategy<Any?>) as? T ?: error("value is not optional but cannot find")
} }
override fun decodeTaggedEnum(tag: Int, enumDescription: SerialDescriptor): Int =
TODO()
} }

2
mirai-core-qqandroid/src/jvmTest/kotlin/net.mamoe.mirai.qqandroid.io.serialization/JceDecoderTest.kt
View File

@ -72,7 +72,7 @@ class JceDecoderTest {
writeJceStruct(TestSimpleJceStruct(), 10) writeJceStruct(TestSimpleJceStruct(), 10)
writeCollection(listOf(listOf(1, 2, 3), listOf(1, 2, 3)), 11) writeCollection(listOf(listOf(1, 2, 3), listOf(1, 2, 3)), 11)
}.readBytes().toUHexString(), }.readBytes().toUHexString(),
TestComplexJceStruct().toByteArray(TestComplexJceStruct.serializer()).toUHexString() TestComplexNullableJceStruct().toByteArray(TestComplexNullableJceStruct.serializer()).toUHexString()
) )
} }