From 2d975d74cbfebebb6c50d1b581019b5ebae54117 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 30 Jan 2017 20:16:07 +0300
Subject: [PATCH] Slightly refactor inline functions at serializationUtils.kt

Extract large bodies to separate functions, use KType.classifier instead of
KClass.createType
---
 .../kotlin/build/serializationUtils.kt        | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/build-common/src/org/jetbrains/kotlin/build/serializationUtils.kt b/build-common/src/org/jetbrains/kotlin/build/serializationUtils.kt
index aa9d093141d..5f52d1e47ba 100644
--- a/build-common/src/org/jetbrains/kotlin/build/serializationUtils.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/serializationUtils.kt
@@ -17,14 +17,14 @@
 package org.jetbrains.kotlin.build
 
 import kotlin.reflect.KClass
-import kotlin.reflect.KParameter
-import kotlin.reflect.full.createType
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.primaryConstructor
 
-inline fun <reified T : Any> serializeToPlainText(instance: T): String {
+inline fun <reified T : Any> serializeToPlainText(instance: T): String = serializeToPlainText(instance, T::class)
+
+fun <T : Any> serializeToPlainText(instance: T, klass: KClass<T>): String {
     val lines = ArrayList<String>()
-    for (property in T::class.memberProperties) {
+    for (property in klass.memberProperties) {
         val value = property.get(instance)
         if (value != null) {
             lines.add("${property.name}=$value")
@@ -33,18 +33,18 @@ inline fun <reified T : Any> serializeToPlainText(instance: T): String {
     return lines.joinToString("\n")
 }
 
-inline fun <reified T : Any> deserializeFromPlainText(str: String): T? {
+inline fun <reified T : Any> deserializeFromPlainText(str: String): T? = deserializeFromPlainText(str, T::class)
+
+fun <T : Any> deserializeFromPlainText(str: String, klass: KClass<T>): T? {
     val args = ArrayList<Any?>()
     val properties = str
             .split("\n")
             .filter(String::isNotBlank)
             .associate { it.substringBefore("=") to it.substringAfter("=") }
 
-    val primaryConstructor = T::class.primaryConstructor
-                             ?: throw IllegalStateException("Class ${T::class.java} does not have primary constructor")
-    val params = primaryConstructor.parameters
-    val sortedBy = params.sortedBy { it.index }
-    for (param in sortedBy) {
+    val primaryConstructor = klass.primaryConstructor
+                             ?: throw IllegalStateException("${klass.java} does not have primary constructor")
+    for (param in primaryConstructor.parameters.sortedBy { it.index }) {
         val argumentString = properties[param.name]
 
         if (argumentString == null) {
@@ -57,10 +57,10 @@ inline fun <reified T : Any> deserializeFromPlainText(str: String): T? {
             }
         }
 
-        val argument: Any? = when {
-            param.isTypeOrNullableType(Int::class) -> argumentString.toInt()
-            param.isTypeOrNullableType(Boolean::class) -> argumentString.toBoolean()
-            param.isTypeOrNullableType(String::class) -> argumentString
+        val argument: Any? = when (param.type.classifier) {
+            Int::class -> argumentString.toInt()
+            Boolean::class -> argumentString.toBoolean()
+            String::class -> argumentString
             else -> throw IllegalStateException("Unexpected property type: ${param.type}")
         }
 
@@ -69,9 +69,3 @@ inline fun <reified T : Any> deserializeFromPlainText(str: String): T? {
 
     return primaryConstructor.call(*args.toTypedArray())
 }
-
-@PublishedApi
-internal fun <T : Any> KParameter.isTypeOrNullableType(klass: KClass<T>): Boolean =
-        this.type == klass.createType(nullable = true) || this.type == klass.createType(nullable = false)
-
-