DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

ListAdapter теперь понимает упрощение структуры при 1 элементе массива

Browse Source
This commit is contained in:
DBotThePony 2023-01-01 19:07:37 +07:00
parent c63308f37b
commit 78cdc2c886
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ListAdapter.kt
View File

@ -16,6 +16,11 @@ class ListAdapter<T : Any>(val elementAdapter: TypeAdapter<T>, val valueTransfor
constructor(type: Class<T>, valueTransformer: (T) -> T = { it }) : this(LazyTypeProvider(type), valueTransformer = valueTransformer) constructor(type: Class<T>, valueTransformer: (T) -> T = { it }) : this(LazyTypeProvider(type), valueTransformer = valueTransformer)
override fun write(out: JsonWriter, value: List<T>) { override fun write(out: JsonWriter, value: List<T>) {
if (value.size == 1) {
elementAdapter.write(out, value[0])
return
}
out.beginArray() out.beginArray()
for (v in value) { for (v in value) {
@ -26,6 +31,11 @@ class ListAdapter<T : Any>(val elementAdapter: TypeAdapter<T>, val valueTransfor
} }
override fun read(reader: JsonReader): List<T> { override fun read(reader: JsonReader): List<T> {
if (reader.peek() != JsonToken.BEGIN_ARRAY) {
// не массив, возможно упрощение структуры "a": [value] -> "a": value
return ImmutableList.of(elementAdapter.read(reader) ?: throw JsonSyntaxException("List does not accept nulls"))
}
reader.beginArray() reader.beginArray()
val builder = ImmutableList.builder<T>() val builder = ImmutableList.builder<T>()