CHANGELOG.md v0.5.2

Author: iris2iris

CHANGELOG.md

@@ -4,6 +4,7 @@
 - `Deserializer` reformat. `JsonItem` instances now don't need to know deserializers types except `Deserializer` itself.
 - `@JsonField` support to let json-fields be named in other way than in deserialized object
 - Added `DeserializerJsonItem` to support instances of `JsonItem`
+- `DeserializerFactory.registerDeserializer()` added to register custom deserializers
 
 ## v0.5.1
 - Deserialization improvements

src/iris/json/JsonItem.kt

@@ -1,6 +1,6 @@
 package iris.json
 
-import iris.json.serialization.DeserializerCache
+import iris.json.serialization.DeserializerFactory
 import kotlin.reflect.typeOf
 
 /**
@@ -67,6 +67,6 @@ interface JsonItem {
 }
 
 inline fun <reified T>JsonItem.asObject(): T {
-	val deserializer = DeserializerCache.getDeserializer(typeOf<T>())
+	val deserializer = DeserializerFactory.getDeserializer(typeOf<T>())
 	return deserializer.deserialize(this)
 }

src/iris/json/serialization/Deserializer.kt

@@ -7,6 +7,6 @@ import iris.json.JsonItem
  * @author [Ivan Ivanov](https://vk.com/irisism)
  */
 interface Deserializer {
-	fun <T: Any>deserialize(item: JsonItem): T
+	fun <T>deserialize(item: JsonItem): T
 }
 

src/iris/json/serialization/DeserializerClassImpl.kt

@@ -25,7 +25,7 @@ class DeserializerClassImpl(private val constructorFunction: KFunction<*>, priva
 					   , val polymorphInfo: PolymorphInfo? = null
 	)
 
-	override fun <T : Any> deserialize(item: JsonItem): T {
+	override fun <T> deserialize(item: JsonItem): T {
 		return getObject((item as JsonObject).getEntries())
 	}
 

src/iris/json/serialization/DeserializerCollectionImpl.kt

@@ -16,7 +16,7 @@ class DeserializerCollectionImpl(val typeDeserializer: Deserializer) : Deseriali
 		return res
 	}
 
-	override fun <T : Any> deserialize(item: JsonItem): T {
+	override fun <T> deserialize(item: JsonItem): T {
 		return getObject((item as JsonArray).getList()) as T
 	}
 }

…/json/serialization/DeserializerCache.kt …son/serialization/DeserializerFactory.ktsrc/iris/json/serialization/DeserializerCache.kt renamed to src/iris/json/serialization/DeserializerFactory.kt src/iris/json/serialization/DeserializerCache.kt renamed to src/iris/json/serialization/DeserializerFactory.kt

@@ -12,14 +12,32 @@ import kotlin.reflect.jvm.jvmErasure
  * @author [Ivan Ivanov](https://vk.com/irisism)
  */
 
-object DeserializerCache {
+object DeserializerFactory {
 	private val cache = mutableMapOf<KClass<*>, Deserializer>()
 	private val typeCache = mutableMapOf<KType, Deserializer>()
 
 	fun getDeserializer(d: KClass<*>): Deserializer {
 		return cache.getOrPut(d) { buildInstance(d) }
 	}
 
+	fun registerDeserializer(d: KClass<*>, deserializer: Deserializer, force: Boolean = false) {
+		cache[d] = deserializer
+		val supers = d.superclasses
+		if (supers.isEmpty())
+			return
+		val lastDes = if (force) null else cache[supers.last()]
+		if (lastDes == null) {
+			for (c in supers)
+				cache[c] = deserializer
+		} else {
+			for (c in supers) {
+				if (cache.contains(c))
+					break
+				cache[c] = deserializer
+			}
+		}
+	}
+
 	fun getDeserializer(type: KType): Deserializer {
 		return typeCache.getOrPut(type) {
 			DeserializerPrimitiveImpl.convertType(type, null)
@@ -43,7 +61,7 @@ object DeserializerCache {
 	private fun getMapType(type: KType): KType {
 		val (key, value) = type.arguments
 		if (!key.type!!.isSubtypeOf(CharSequence::class.starProjectedType))
-			throw IllegalStateException("Map key cannot be not CharSequence inherited")
+			throw IllegalStateException("Map key cannot be non CharSequence inherited")
 		return value.type!!
 	}
 

src/iris/json/serialization/DeserializerJsonItem.kt

@@ -7,7 +7,7 @@ import iris.json.JsonItem
  * @author [Ivan Ivanov](https://vk.com/irisism)
  */
 class DeserializerJsonItem : Deserializer {
-	override fun <T : Any> deserialize(item: JsonItem): T {
+	override fun <T> deserialize(item: JsonItem): T {
 		return item as T
 	}
 }

src/iris/json/serialization/DeserializerMapImpl.kt

@@ -15,7 +15,7 @@ class DeserializerMapImpl(val valueDeserializer: Deserializer) : DeserializerMap
 		}
 	}
 
-	override fun <T : Any> deserialize(item: JsonItem): T {
+	override fun <T> deserialize(item: JsonItem): T {
 		return getMap<Map<String, *>>((item as JsonObject).getEntries()) as T
 	}
 }

src/iris/json/serialization/DeserializerPrimitive.kt

@@ -7,5 +7,5 @@ import iris.json.JsonItem
  * @author [Ivan Ivanov](https://vk.com/irisism)
  */
 internal interface DeserializerPrimitive : Deserializer {
-	fun getValue(value: JsonItem): Any?
+	fun getValue(item: JsonItem): Any?
 }

src/iris/json/serialization/DeserializerPrimitiveImpl.kt

@@ -56,24 +56,24 @@ class DeserializerPrimitiveImpl(val type: Type) : DeserializerPrimitive {
 		}
 	}
 
-	override fun <T : Any> deserialize(item: JsonItem): T {
+	override fun <T> deserialize(item: JsonItem): T {
 		return getValue(item) as T
 	}
 
-	override fun getValue(value: JsonItem): Any? {
+	override fun getValue(item: JsonItem): Any? {
 		return when (type) {
-			Type.INTEGER -> value.asIntOrNull()
-			Type.LONG -> value.asLongOrNull()
-			Type.DOUBLE -> value.asDoubleOrNull()
-			Type.FLOAT ->  value.asFloatOrNull()
-			Type.BOOLEAN ->  value.asBooleanOrNull()
-			Type.STRING ->  value.asStringOrNull()
-			Type.DATE ->  when (val obj = value.obj()) {
+			Type.INTEGER -> item.asIntOrNull()
+			Type.LONG -> item.asLongOrNull()
+			Type.DOUBLE -> item.asDoubleOrNull()
+			Type.FLOAT ->  item.asFloatOrNull()
+			Type.BOOLEAN ->  item.asBooleanOrNull()
+			Type.STRING ->  item.asStringOrNull()
+			Type.DATE ->  when (val obj = item.obj()) {
 				is Number -> Date(obj.toLong()*1000L)
 				is String -> format.parse(obj)
 				else -> obj
 			}
-			//else -> value.obj()
+			//else -> item.obj()
 		}
 	}
 }