Deserialization to objects. Performance improvements

Author: iris2iris

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.5
+- Deserialization to objects
+- Performance improvements
+
 ## v0.4
 - JSON Proxy items added to imitate parsed JSON-nodes
 - Added setters

README.md

@@ -71,29 +71,47 @@ println("To Double: " + res.find("object.message.attachments[0].wall.id").asDoub
 ```
 
 ## Performance test
-Test code is in [iris/json/flow/test/performance_test.kt](https://github.com/iris2iris/iris-json-parser-kotlin/blob/master/src/iris/json/flow/test/performance_test.kt) file. 
+
+#### Array of 50 elements
+Test code is in [iris/json/flow/test/performance_array.kt](https://github.com/iris2iris/iris-json-parser-kotlin/blob/master/src/iris/json/flow/test/performance_array.kt) file. 
 
 Test JSON file is in [test_array.json](https://github.com/iris2iris/iris-json-parser-kotlin/blob/master/test_array.json) file.
 
-Testing access to first element of array and access to last element of array.
+Testing access to first element of array and access to last element of array. 100k iterations
 ```
 AVG[0]:
-org.json:   22611
-org.json.simple: 27232
-Iris Plain: 7110
-Iris Flow:  93
-Iris Proxy: 25
+org.json:   22363
+org.json.simple: 27080
+Iris Plain: 5394 // previous 7110
+Iris Flow:  564 // previous 93
+Iris Proxy: 27
 POJO:       11
 
 AVG[49]:
-org.json:   22631
-org.json.simple: 27161
-Iris Plain: 7067
-Iris Flow:  7498
-Iris Proxy: 23
+org.json:   22416
+org.json.simple: 26869
+Iris Plain: 5411 // previous 7067
+Iris Flow:  5870 // previous 7498
+Iris Proxy: 26
 POJO:       10
 ```
 
+#### Complex json-tree structure
+
+Test code is in [iris/json/flow/test/performance_object_tree.kt](https://github.com/iris2iris/iris-json-parser-kotlin/blob/master/src/iris/json/flow/test/performance_object_tree.kt) file. 
+
+Test JSON file is in [test.json](https://github.com/iris2iris/iris-json-parser-kotlin/blob/master/test.json) file.
+
+Testing access to `object.message.attachments[0].wall.id` and converting it to Long. 100k iterations
+```
+org.json:   9149
+org.json.simple: 11186
+Iris Plain: 2652
+Iris Flow:  617
+Iris Proxy: 53
+POJO:       21
+```
+
 Check out [CHANGELOG.md](https://github.com/iris2iris/iris-json-parser-kotlin/blob/master/CHANGELOG.md)
 
 ⭐ If this tool was useful for you, don't forget to give star.

src/iris/json/JsonItem.kt

@@ -1,5 +1,8 @@
 package iris.json
 
+import iris.json.serialization.NodeInfo
+import kotlin.reflect.KClass
+
 /**
  * @created 26.09.2020
  * @author [Ivan Ivanov](https://vk.com/irisism)
@@ -13,7 +16,6 @@ interface JsonItem {
 
 	fun obj(): Any?
 	fun <A: Appendable>joinTo(buffer: A): A
-	override fun toString(): String
 
 	fun iterable() : Iterable<JsonItem>
 
@@ -43,6 +45,10 @@ interface JsonItem {
 
 	fun asMap(): Map<String, Any?>
 
+	fun <T: Any>asObject(d: KClass<T>): T
+
+	fun <T: Any>asObject(info: NodeInfo): T
+
 	fun asStringOrNull(): String?
 
 	fun asString(): String
@@ -62,4 +68,6 @@ interface JsonItem {
 	fun isObject(): Boolean
 
 	fun find(tree: String): JsonItem
+
+
 }

src/iris/json/JsonObject.kt

@@ -4,6 +4,9 @@ package iris.json
  * @created 26.09.2020
  * @author [Ivan Ivanov](https://vk.com/irisism)
  */
-interface JsonObject: JsonItem, Iterable<JsonObject.Entry> {
-	class Entry(val key: CharSequence, val value: JsonItem)
+
+typealias JsonEntry = Pair<CharSequence, JsonItem>
+
+interface JsonObject: JsonItem, Iterable<JsonEntry> {
+	//class Entry(val key: CharSequence, val value: JsonItem)
 }

src/iris/json/flow/FlowArray.kt

@@ -3,6 +3,8 @@ package iris.json.flow
 import iris.json.JsonArray
 import iris.json.JsonItem
 import iris.json.proxy.JsonProxyUtil
+import iris.json.serialization.ListInfo
+import iris.json.serialization.NodeInfo
 
 /**
  * @created 20.09.2020
@@ -117,7 +119,7 @@ class FlowArray(tokener: Tokener) : FlowItem(tokener), JsonArray {
 	override fun obj(): Any? {
 		return obj ?: run {
 			parse()
-			obj = items.mapTo(mutableListOf()) { it.obj() }
+			obj = items.mapTo(ArrayList(items.size)) { it.obj() }
 			obj
 		}
 	}
@@ -149,4 +151,9 @@ class FlowArray(tokener: Tokener) : FlowItem(tokener), JsonArray {
 			return get(pointer++)
 		}
 	}
+
+	override fun <T : Any> asObject(info: NodeInfo): T {
+		parse()
+		return (info as ListInfo).getObject(this.items) as T
+	}
 }

src/iris/json/flow/FlowObject.kt

@@ -1,46 +1,43 @@
 package iris.json.flow
 
+import iris.json.JsonEntry
 import iris.json.JsonItem
 import iris.json.JsonObject
-import iris.json.JsonObject.Entry
 import iris.json.plain.IrisJsonNull
 import iris.json.proxy.JsonProxyUtil
+import iris.json.serialization.ClassInfo
+import iris.json.serialization.NodeInfo
+import java.util.*
 
 /**
  * @created 20.09.2020
  * @author [Ivan Ivanov](https://vk.com/irisism)
  */
 class FlowObject(tokener: Tokener) : FlowItem(tokener), JsonObject {
 
-	/*private class Entry(val key: CharSequence, val value: JsonItem) {
-		override fun toString(): String {
-			return "\"$key\": $value"
-		}
-	}*/
-
 	override fun get(ind: Int): JsonItem {
 		return get(ind.toString())
 	}
 
-	private val entries = mutableListOf<Entry>()
+	private val entries = LinkedList<JsonEntry>()
 
 	private var isDone = false
 	private var needToParse: FlowItem? = null
 
 	override fun get(key: String): JsonItem {
 		for (e in entries) {
-			if (e.key == key)
-				return e.value
+			if (e.first == key)
+				return e.second
 		}
 		if (isDone) return IrisJsonNull.Null
 		testNeedToParse()
 		do {
 			val next = parseNext() ?: break
 			entries += next
-			val nextVal = next.value as FlowItem
-			if (next.key == key) {
+			val nextVal = next.second as FlowItem
+			if (next.first == key) {
 				this.needToParse = nextVal
-				return next.value
+				return next.second
 			}
 			nextVal.parse()
 		} while (true)
@@ -49,7 +46,7 @@ class FlowObject(tokener: Tokener) : FlowItem(tokener), JsonObject {
 		return IrisJsonNull.Null
 	}
 
-	private fun parseNext(): Entry? {
+	private fun parseNext(): JsonEntry? {
 		var char = tokener.nextChar()
 		if (char == '}') {
 			isDone = true
@@ -61,12 +58,12 @@ class FlowObject(tokener: Tokener) : FlowItem(tokener), JsonObject {
 		if (!(char == '"' || char == '\''))
 			throw tokener.exception("\" (quote) or \"'\" was expected")
 
-		val key = tokener.readString(char)
+		val key = tokener.readFieldName(char)
 		char = tokener.nextChar()
 		if (char != ':')
 			throw tokener.exception("\":\" was expected")
 		val value = JsonFlowParser.readItem(tokener)
-		return Entry(key, value)
+		return JsonEntry(key, value)
 	}
 
 	private var obj: MutableMap<String, Any?>? = null
@@ -75,21 +72,21 @@ class FlowObject(tokener: Tokener) : FlowItem(tokener), JsonObject {
 		if (obj != null)
 			return obj
 		parse()
-		val res = mutableMapOf<String, Any?>()
+		val res = HashMap<String, Any?>(entries.size)
 		for (it in entries)
-			res[it.key.toString()] = it.value.obj()
+			res[it.first.toString()] = it.second.obj()
 		obj = res
 		return res
 	}
 
 	override fun set(key: String, value: Any?): JsonItem {
 		val el = entries
-		val index = el.indexOfFirst { it.key == key }
+		val index = el.indexOfFirst { it.first == key }
 		val wrapValue = JsonProxyUtil.wrap(value)
 		if (index == -1)
-			el += Entry(key, wrapValue)
+			el += JsonEntry(key, wrapValue)
 		else
-			el[index] = Entry(key, wrapValue)
+			el[index] = JsonEntry(key, wrapValue)
 		val obj = obj
 		if (obj != null) {
 			obj[key] = value
@@ -107,9 +104,8 @@ class FlowObject(tokener: Tokener) : FlowItem(tokener), JsonObject {
 		do {
 			val next = parseNext() ?: break
 			entries += next
-			(next.value as FlowItem).parse()
+			(next.second as FlowItem).parse()
 		} while (true)
-
 		isDone = true
 	}
 
@@ -131,34 +127,38 @@ class FlowObject(tokener: Tokener) : FlowItem(tokener), JsonObject {
 			else
 				firstDone = true
 			buffer.append("\"")
-			buffer.append(entry.key)
+			buffer.append(entry.first)
 			buffer.append("\": ")
-			entry.value.joinTo(buffer)
+			entry.second.joinTo(buffer)
 
 		}
 		buffer.append('}')
 		return buffer
 	}
 
+	override fun <T : Any> asObject(info: NodeInfo): T {
+		parse()
+		return (info as ClassInfo).getObject(entries)
+	}
+
 	override fun isObject() = true
 
-	override fun iterator(): Iterator<Entry> {
+	override fun iterator(): Iterator<JsonEntry> {
 		// TODO: Надо бы тут парсить по мере итератора, а не всё сразу
 		parse()
 		return Iter()
 	}
 
-	inner class Iter : Iterator<Entry> {
+	inner class Iter : Iterator<JsonEntry> {
 
 		private val iterator = entries.iterator()
 
 		override fun hasNext(): Boolean {
 			return iterator.hasNext()
 		}
 
-		override fun next(): Entry {
-			val e = iterator.next()
-			return Entry(e.key, e.value)
+		override fun next(): JsonEntry {
+			return iterator.next()
 		}
 	}
 }

src/iris/json/flow/FlowString.kt

@@ -3,6 +3,7 @@ package iris.json.flow
 import iris.json.JsonString
 import iris.json.plain.IrisJsonItem
 import iris.json.plain.IrisJsonNull
+import iris.json.serialization.NodeInfo
 import iris.sequence.IrisSequence
 
 /**
@@ -11,13 +12,10 @@ import iris.sequence.IrisSequence
  */
 class FlowString(tokener: Tokener, val quote: Char) : FlowItem(tokener), JsonString {
 
-	private val data: CharSequence by lazy(LazyThreadSafetyMode.NONE) { this.tokener.readString(quote) }
-
-	override fun toString(): String {
-		return '"' + data.toString() + '"'
-	}
+	private var data: CharSequence? = null
 
 	override fun <A : Appendable> joinTo(buffer: A): A {
+		parse()
 		buffer.append('"')
 		(data as? IrisSequence)?.joinTo(buffer) ?: buffer.append(data)
 		buffer.append('"')
@@ -33,13 +31,16 @@ class FlowString(tokener: Tokener, val quote: Char) : FlowItem(tokener), JsonStr
 	}
 
 	override fun parse() {
-		data
+		if (data == null)
+			data = tokener.readString(quote)
 	}
 
-	private val ready by lazy(LazyThreadSafetyMode.NONE) { init() }
+	private var ready: String? = null// by lazy(LazyThreadSafetyMode.NONE) { init() }
 
 	private fun init(): String {
+		parse()
 		val res = StringBuilder()
+		val data = data!!
 		val len = data.length
 		if (len == 0)
 			return ""
@@ -88,7 +89,16 @@ class FlowString(tokener: Tokener, val quote: Char) : FlowItem(tokener), JsonStr
 		}
 	}
 
-	override fun obj() = ready
+	override fun obj(): String {
+		if (ready != null)
+			return ready!!
+		ready = init()
+		return ready!!
+	}
+
+	override fun <T : Any> asObject(info: NodeInfo): T {
+		return obj() as T
+	}
 
 	override fun isPrimitive() = true
 }