sealed class serialisation refactored
This commit is contained in:
AdrianLxM
parent
fa538f059c
commit
60f51cfab9
5 changed files with 104 additions and 110 deletions
|
|
@ -1,71 +0,0 @@
|
||||||
package info.nightscout.androidaps.utils
|
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.google.gson.GsonBuilder
|
|
||||||
import com.google.gson.TypeAdapter
|
|
||||||
import com.google.gson.TypeAdapterFactory
|
|
||||||
import com.google.gson.reflect.TypeToken
|
|
||||||
import com.google.gson.stream.JsonReader
|
|
||||||
import com.google.gson.stream.JsonWriter
|
|
||||||
import info.nightscout.androidaps.database.entities.XXXValueWithUnit
|
|
||||||
import kotlin.jvm.internal.Reflection
|
|
||||||
import kotlin.reflect.KClass
|
|
||||||
|
|
||||||
fun generateGson() = GsonBuilder().registerTypeAdapterFactory(
|
|
||||||
object : TypeAdapterFactory {
|
|
||||||
override fun <T : Any> create(gson: Gson, type: TypeToken<T>): TypeAdapter<T> {
|
|
||||||
val kclass = Reflection.getOrCreateKotlinClass(type.rawType)
|
|
||||||
return if (kclass.sealedSubclasses.any()) {
|
|
||||||
SealedClassTypeAdapter<T>(kclass, gson)
|
|
||||||
} else
|
|
||||||
gson.getDelegateAdapter(this, type)
|
|
||||||
}
|
|
||||||
}).create()
|
|
||||||
|
|
||||||
/*fun testSealedClass(): XXXValueWithUnit.SimpleString? {
|
|
||||||
|
|
||||||
val gson = generateGson()
|
|
||||||
val someValueWithUnit: Container = Container(XXXValueWithUnit.SimpleString("hello"))
|
|
||||||
val serialised = gson.toJson(someValueWithUnit)
|
|
||||||
|
|
||||||
val deserialised : Container = gson.fromJson(serialised, Container::class.java)
|
|
||||||
|
|
||||||
return deserialised.c as? XXXValueWithUnit.SimpleString
|
|
||||||
|
|
||||||
}*/
|
|
||||||
|
|
||||||
fun toSealedClassJson(list: List<XXXValueWithUnit>): String =
|
|
||||||
list.map { Container(it) }.let { generateGson().toJson(it) }
|
|
||||||
|
|
||||||
fun fromJson(string: String) : List<XXXValueWithUnit> {
|
|
||||||
val itemType = object : TypeToken<List<Container>>() {}.type
|
|
||||||
|
|
||||||
return generateGson().fromJson<List<Container>>(string, itemType).map { it.wrapped }
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Container(val wrapped: XXXValueWithUnit)
|
|
||||||
|
|
||||||
class SealedClassTypeAdapter<T : Any>(private val kclass: KClass<Any>, val gson: Gson) : TypeAdapter<T>() {
|
|
||||||
|
|
||||||
override fun read(jsonReader: JsonReader): T? {
|
|
||||||
jsonReader.beginObject() //start reading the object
|
|
||||||
val nextName = jsonReader.nextName() //get the name on the object
|
|
||||||
val innerClass = kclass.sealedSubclasses.firstOrNull {
|
|
||||||
it.simpleName!!.contains(nextName)
|
|
||||||
}
|
|
||||||
?: throw Exception("$nextName is not found to be a data class of the sealed class ${kclass.qualifiedName}")
|
|
||||||
val x = gson.fromJson<T>(jsonReader, innerClass.javaObjectType)
|
|
||||||
jsonReader.endObject()
|
|
||||||
//if there a static object, actually return that back to ensure equality and such!
|
|
||||||
return innerClass.objectInstance as T? ?: x
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun write(out: JsonWriter, value: T) {
|
|
||||||
val jsonString = gson.toJson(value)
|
|
||||||
out.beginObject()
|
|
||||||
val name = value.javaClass.canonicalName
|
|
||||||
out.name(name.splitToSequence(".").last()).jsonValue(jsonString)
|
|
||||||
out.endObject()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
package info.nightscout.androidaps.utils.serialisation
|
||||||
|
|
||||||
|
import com.google.gson.Gson
|
||||||
|
import com.google.gson.GsonBuilder
|
||||||
|
import com.google.gson.TypeAdapter
|
||||||
|
import com.google.gson.TypeAdapterFactory
|
||||||
|
import com.google.gson.reflect.TypeToken
|
||||||
|
import com.google.gson.stream.JsonReader
|
||||||
|
import com.google.gson.stream.JsonWriter
|
||||||
|
import kotlin.jvm.internal.Reflection
|
||||||
|
import kotlin.reflect.KClass
|
||||||
|
|
||||||
|
object SealedClassHelper {
|
||||||
|
|
||||||
|
val gson: Gson = GsonBuilder().registerTypeAdapterFactory(
|
||||||
|
object : TypeAdapterFactory {
|
||||||
|
override fun <T : Any> create(gson: Gson, type: TypeToken<T>): TypeAdapter<T> {
|
||||||
|
val kClass = Reflection.getOrCreateKotlinClass(type.rawType)
|
||||||
|
return if (kClass.sealedSubclasses.any()) {
|
||||||
|
SealedClassTypeAdapter<T>(kClass, gson)
|
||||||
|
} else
|
||||||
|
gson.getDelegateAdapter(this, type)
|
||||||
|
}
|
||||||
|
}).create()
|
||||||
|
|
||||||
|
private class SealedClassTypeAdapter<T : Any>(private val kClass: KClass<Any>, val gson: Gson) : TypeAdapter<T>() {
|
||||||
|
|
||||||
|
override fun read(jsonReader: JsonReader): T? {
|
||||||
|
jsonReader.beginObject() //start reading the object
|
||||||
|
val nextName = jsonReader.nextName() //get the name on the object
|
||||||
|
val innerClass = kClass.sealedSubclasses.firstOrNull {
|
||||||
|
it.simpleName!!.contains(nextName)
|
||||||
|
}
|
||||||
|
?: throw Exception("$nextName is not found to be a data class of the sealed class ${kClass.qualifiedName}")
|
||||||
|
val x = gson.fromJson<T>(jsonReader, innerClass.javaObjectType)
|
||||||
|
jsonReader.endObject()
|
||||||
|
//if there a static object, actually return that back to ensure equality and such!
|
||||||
|
return innerClass.objectInstance as T? ?: x
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun write(out: JsonWriter, value: T) {
|
||||||
|
val jsonString = gson.toJson(value)
|
||||||
|
out.beginObject()
|
||||||
|
val name = value.javaClass.canonicalName
|
||||||
|
out.name(name.splitToSequence(".").last()).jsonValue(jsonString)
|
||||||
|
out.endObject()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
package info.nightscout.androidaps.utils.serialisation
|
||||||
|
|
||||||
|
import com.google.gson.reflect.TypeToken
|
||||||
|
import info.nightscout.androidaps.database.entities.XXXValueWithUnit
|
||||||
|
import info.nightscout.androidaps.utils.ValueWithUnitWrapper
|
||||||
|
|
||||||
|
object ValueWithUnitSerialiser {
|
||||||
|
|
||||||
|
fun toSealedClassJson(list: List<XXXValueWithUnit>): String =
|
||||||
|
list.map { ValueWithUnitWrapper(it) }.let { SealedClassHelper.gson.toJson(it) }
|
||||||
|
|
||||||
|
fun fromJson(string: String): List<XXXValueWithUnit> {
|
||||||
|
val itemType = object : TypeToken<List<ValueWithUnitWrapper>>() {}.type
|
||||||
|
|
||||||
|
return SealedClassHelper.gson.fromJson<List<ValueWithUnitWrapper>>(string, itemType).map { it.wrapped }
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
package info.nightscout.androidaps.utils
|
|
||||||
|
|
||||||
import info.nightscout.androidaps.database.entities.XXXValueWithUnit
|
|
||||||
import org.junit.Assert.assertEquals
|
|
||||||
import org.junit.Assert.assertNotNull
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
class SealedClassHelperKtTest {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testSerialisationDeserization() {
|
|
||||||
|
|
||||||
val list = listOf<XXXValueWithUnit>(
|
|
||||||
XXXValueWithUnit.SimpleString("hello"),
|
|
||||||
XXXValueWithUnit.SimpleInt(5),
|
|
||||||
XXXValueWithUnit.UNKNOWN
|
|
||||||
)
|
|
||||||
|
|
||||||
val serialized = toSealedClassJson(list)
|
|
||||||
val deserialized = fromJson(serialized)
|
|
||||||
|
|
||||||
assertEquals(3, list.size)
|
|
||||||
assertEquals(list, deserialized)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testEmptyList() {
|
|
||||||
|
|
||||||
val list = listOf<XXXValueWithUnit>()
|
|
||||||
|
|
||||||
val serialized = toSealedClassJson(list)
|
|
||||||
val deserialized = fromJson(serialized)
|
|
||||||
|
|
||||||
assertEquals(0, list.size)
|
|
||||||
assertEquals(list, deserialized)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
package info.nightscout.androidaps.utils.serialisation
|
||||||
|
|
||||||
|
import info.nightscout.androidaps.database.entities.XXXValueWithUnit
|
||||||
|
import org.junit.Assert
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
internal class ValueWithUnitSerialiserTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testSerialisationDeserization() {
|
||||||
|
|
||||||
|
val list = listOf<XXXValueWithUnit>(
|
||||||
|
XXXValueWithUnit.SimpleString("hello"),
|
||||||
|
XXXValueWithUnit.SimpleInt(5),
|
||||||
|
XXXValueWithUnit.UNKNOWN
|
||||||
|
)
|
||||||
|
|
||||||
|
val serialized = ValueWithUnitSerialiser.toSealedClassJson(list)
|
||||||
|
val deserialized = ValueWithUnitSerialiser.fromJson(serialized)
|
||||||
|
|
||||||
|
Assert.assertEquals(3, list.size)
|
||||||
|
Assert.assertEquals(list, deserialized)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testEmptyList() {
|
||||||
|
|
||||||
|
val list = listOf<XXXValueWithUnit>()
|
||||||
|
|
||||||
|
val serialized = ValueWithUnitSerialiser.toSealedClassJson(list)
|
||||||
|
val deserialized = ValueWithUnitSerialiser.fromJson(serialized)
|
||||||
|
|
||||||
|
Assert.assertEquals(0, list.size)
|
||||||
|
Assert.assertEquals(list, deserialized)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue