-
Notifications
You must be signed in to change notification settings - Fork 620
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add @MetaSerializable annotation (#1979)
Co-authored-by: rsinukov <rxsinukov@gmail.com> Co-authored-by: Vsevolod Tolstopyatov <qwwdfsad@gmail.com>
- Loading branch information
1 parent
be99c0d
commit c232772
Showing
4 changed files
with
158 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
core/commonTest/src/kotlinx/serialization/MetaSerializableTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
package kotlinx.serialization | ||
|
||
import kotlinx.serialization.test.* | ||
import kotlin.reflect.KClass | ||
import kotlin.test.* | ||
|
||
class MetaSerializableTest { | ||
|
||
@MetaSerializable | ||
@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY) | ||
annotation class MySerializable | ||
|
||
@MetaSerializable | ||
@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY) | ||
annotation class MySerializableWithInfo( | ||
val value: Int, | ||
val kclass: KClass<*> | ||
) | ||
|
||
@MySerializable | ||
class Project1(val name: String, val language: String) | ||
|
||
@MySerializableWithInfo(123, String::class) | ||
class Project2(val name: String, val language: String) | ||
|
||
@MySerializableWithInfo(123, String::class) | ||
@Serializable | ||
class Project3(val name: String, val language: String) | ||
|
||
@Serializable | ||
class Wrapper( | ||
@MySerializableWithInfo(234, Int::class) val project: Project3 | ||
) | ||
|
||
@Test | ||
fun testMetaSerializable() = noJsLegacy { | ||
val serializer = serializer<Project1>() | ||
assertNotNull(serializer) | ||
} | ||
|
||
@Test | ||
fun testMetaSerializableWithInfo() = noJsLegacy { | ||
val info = serializer<Project2>().descriptor.annotations.filterIsInstance<MySerializableWithInfo>().first() | ||
assertEquals(123, info.value) | ||
assertEquals(String::class, info.kclass) | ||
} | ||
|
||
@Test | ||
fun testMetaSerializableOnProperty() = noJsLegacy { | ||
val info = serializer<Wrapper>().descriptor | ||
.getElementAnnotations(0).filterIsInstance<MySerializableWithInfo>().first() | ||
assertEquals(234, info.value) | ||
assertEquals(Int::class, info.kclass) | ||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
formats/json-tests/commonTest/src/kotlinx/serialization/features/MetaSerializableJsonTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
package kotlinx.serialization.features | ||
|
||
import kotlinx.serialization.* | ||
import kotlinx.serialization.json.* | ||
import kotlin.test.* | ||
|
||
class MetaSerializableJsonTest : JsonTestBase() { | ||
@MetaSerializable | ||
@Target(AnnotationTarget.PROPERTY, AnnotationTarget.CLASS) | ||
annotation class JsonComment(val comment: String) | ||
|
||
@JsonComment("class_comment") | ||
data class IntDataCommented(val i: Int) | ||
|
||
@Serializable | ||
data class Carrier( | ||
val plain: String, | ||
@JsonComment("string_comment") val commented: StringData, | ||
val intData: IntDataCommented | ||
) | ||
|
||
class CarrierSerializer : JsonTransformingSerializer<Carrier>(serializer()) { | ||
|
||
private val desc = Carrier.serializer().descriptor | ||
private fun List<Annotation>.comment(): String? = filterIsInstance<JsonComment>().firstOrNull()?.comment | ||
|
||
private val commentMap = (0 until desc.elementsCount).associateBy({ desc.getElementName(it) }, | ||
{ desc.getElementAnnotations(it).comment() ?: desc.getElementDescriptor(it).annotations.comment() }) | ||
|
||
// NB: we may want to add this to public API | ||
private fun JsonElement.editObject(action: (MutableMap<String, JsonElement>) -> Unit): JsonElement { | ||
val mutable = this.jsonObject.toMutableMap() | ||
action(mutable) | ||
return JsonObject(mutable) | ||
} | ||
|
||
override fun transformDeserialize(element: JsonElement): JsonElement { | ||
return element.editObject { result -> | ||
for ((key, value) in result) { | ||
commentMap[key]?.let { | ||
result[key] = value.editObject { | ||
it.remove("comment") | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
override fun transformSerialize(element: JsonElement): JsonElement { | ||
return element.editObject { result -> | ||
for ((key, value) in result) { | ||
commentMap[key]?.let { comment -> | ||
result[key] = value.editObject { | ||
it["comment"] = JsonPrimitive(comment) | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
@Test | ||
fun testMyJsonComment() { | ||
assertJsonFormAndRestored( | ||
CarrierSerializer(), | ||
Carrier("plain", StringData("string1"), IntDataCommented(42)), | ||
"""{"plain":"plain","commented":{"data":"string1","comment":"string_comment"},"intData":{"i":42,"comment":"class_comment"}}""" | ||
) | ||
} | ||
|
||
} |