CHANGELOG.md v0.5.2

Author: iris2iris

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.5.2
+- `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`
+
 ## v0.5.1
 - Deserialization improvements
 - `.asObject<ClassName>()` instead of `.asObject(ClassName::class)`

src/iris/json/JsonArray.kt

@@ -4,4 +4,6 @@ package iris.json
  * @created 26.09.2020
  * @author [Ivan Ivanov](https://vk.com/irisism)
  */
-interface JsonArray: JsonItem, Iterable<JsonItem>
+interface JsonArray: JsonItem, Iterable<JsonItem> {
+	fun getList(): Collection<JsonItem>
+}

src/iris/json/JsonItem.kt

@@ -1,8 +1,6 @@
 package iris.json
 
-import iris.json.serialization.Deserializer
 import iris.json.serialization.DeserializerCache
-import kotlin.reflect.KClass
 import kotlin.reflect.typeOf
 
 /**
@@ -47,11 +45,6 @@ interface JsonItem {
 
 	fun asMap(): Map<String, Any?>
 
-	@Deprecated("Use JsonItem.asObject<T>() instead")
-	fun <T: Any>asObject(d: KClass<T>): T
-
-	fun <T: Any>asObject(info: Deserializer): T
-
 	fun asStringOrNull(): String?
 
 	fun asString(): String
@@ -75,5 +68,5 @@ interface JsonItem {
 
 inline fun <reified T>JsonItem.asObject(): T {
 	val deserializer = DeserializerCache.getDeserializer(typeOf<T>())
-	return this.asObject(deserializer)
+	return deserializer.deserialize(this)
 }

src/iris/json/JsonObject.kt

@@ -8,5 +8,5 @@ package iris.json
 typealias JsonEntry = Pair<CharSequence, JsonItem>
 
 interface JsonObject: JsonItem, Iterable<JsonEntry> {
-	//class Entry(val key: CharSequence, val value: JsonItem)
+	fun getEntries(): Collection<JsonEntry>
 }

src/iris/json/flow/FlowArray.kt

@@ -3,8 +3,6 @@ package iris.json.flow
 import iris.json.JsonArray
 import iris.json.JsonItem
 import iris.json.proxy.JsonProxyUtil
-import iris.json.serialization.Deserializer
-import iris.json.serialization.DeserializerCollection
 
 /**
  * @created 20.09.2020
@@ -102,6 +100,11 @@ class FlowArray(tokener: Tokener) : FlowItem(tokener), JsonArray {
 		return get(ind)
 	}
 
+	override fun getList(): Collection<JsonItem> {
+		parse()
+		return items
+	}
+
 	override fun set(ind: Int, value: Any?): JsonItem {
 		items[ind] = JsonProxyUtil.wrap(value)
 		val obj = this.obj
@@ -151,9 +154,4 @@ class FlowArray(tokener: Tokener) : FlowItem(tokener), JsonArray {
 			return get(pointer++)
 		}
 	}
-
-	override fun <T : Any> asObject(info: Deserializer): T {
-		parse()
-		return (info as DeserializerCollection).getObject(this.items) as T
-	}
 }

src/iris/json/flow/FlowObject.kt

@@ -5,8 +5,6 @@ import iris.json.JsonItem
 import iris.json.JsonObject
 import iris.json.plain.IrisJsonNull
 import iris.json.proxy.JsonProxyUtil
-import iris.json.serialization.Deserializer
-import iris.json.serialization.DeserializerClass
 import java.util.*
 
 /**
@@ -136,9 +134,8 @@ class FlowObject(tokener: Tokener) : FlowItem(tokener), JsonObject {
 		return buffer
 	}
 
-	override fun <T : Any> asObject(info: Deserializer): T {
-		parse()
-		return (info as DeserializerClass).getObject(entries)
+	override fun getEntries(): Collection<JsonEntry> {
+		return entries
 	}
 
 	override fun isObject() = true

src/iris/json/flow/FlowString.kt

@@ -3,7 +3,6 @@ package iris.json.flow
 import iris.json.JsonString
 import iris.json.plain.IrisJsonItem
 import iris.json.plain.IrisJsonNull
-import iris.json.serialization.Deserializer
 import iris.sequence.IrisSequence
 
 /**
@@ -96,9 +95,5 @@ class FlowString(tokener: Tokener, val quote: Char) : FlowItem(tokener), JsonStr
 		return ready!!
 	}
 
-	override fun <T : Any> asObject(info: Deserializer): T {
-		return obj() as T
-	}
-
 	override fun isPrimitive() = true
 }

src/iris/json/flow/FlowValue.kt

@@ -4,8 +4,6 @@ import iris.json.IrisJson
 import iris.json.JsonValue
 import iris.json.plain.IrisJsonItem
 import iris.json.plain.IrisJsonNull
-import iris.json.serialization.Deserializer
-import iris.json.serialization.DeserializerPrimitive
 import iris.sequence.*
 
 /**
@@ -37,8 +35,8 @@ class FlowValue(tokener: Tokener) : FlowItem(tokener), JsonValue {
 		return when (data.type) {
             IrisJson.ValueType.Constant -> when (s) {
                 "null" -> null
-                "true" -> true
-                "false" -> false
+                "true", "1" -> true
+                "false", "0" -> false
                 else -> s.toString()
             }
             IrisJson.ValueType.Integer -> s.toLong()
@@ -144,10 +142,5 @@ class FlowValue(tokener: Tokener) : FlowItem(tokener), JsonValue {
 		data = this.tokener.readPrimitive()
 	}
 
-	override fun <T : Any> asObject(info: Deserializer): T {
-		parse()
-		return (info as DeserializerPrimitive).getValue(this) as T
-	}
-
 	override fun isPrimitive() = true
 }

src/iris/json/plain/IrisJsonArray.kt

@@ -3,8 +3,6 @@ package iris.json.plain
 import iris.json.JsonArray
 import iris.json.JsonItem
 import iris.json.proxy.JsonProxyUtil
-import iris.json.serialization.Deserializer
-import iris.json.serialization.DeserializerCollectionImpl
 
 /**
  * @created 14.04.2020
@@ -28,6 +26,10 @@ class IrisJsonArray(private val items: List<IrisJsonItem>) : IrisJsonItem(), Jso
 		return get(ind)
 	}
 
+	override fun getList(): Collection<JsonItem> {
+		return items
+	}
+
 	override fun set(ind: Int, value: Any?): JsonItem {
 		(items as MutableList<Any?>)[ind] = JsonProxyUtil.wrap(value)
 		val obj = this.obj
@@ -75,8 +77,4 @@ class IrisJsonArray(private val items: List<IrisJsonItem>) : IrisJsonItem(), Jso
 			return item
 		}
 	}
-
-	override fun <T : Any> asObject(info: Deserializer): T {
-		return (info as DeserializerCollectionImpl).getObject(this.items) as T
-	}
 }

src/iris/json/plain/IrisJsonItem.kt

@@ -1,8 +1,6 @@
 package iris.json.plain
 
 import iris.json.JsonItem
-import iris.json.serialization.DeserializerCache
-import kotlin.reflect.KClass
 
 /**
  * @created 14.04.2020
@@ -158,8 +156,4 @@ abstract class IrisJsonItem() : JsonItem {
 	override fun isArray() = false
 
 	override fun isObject() = false
-
-	override fun <T : Any> asObject(d: KClass<T>): T {
-		return asObject(DeserializerCache.getDeserializer(d))
-	}
 }