From 7ccd72bc0e75170a4dc51bc1f82232f61798414f Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 29 May 2015 18:14:07 +0200
Subject: [PATCH] cleanup, load sourcemaps using sync request to avoid
 complexity

---
 .../protocol-reader/src/InterfaceReader.kt         | 14 +++++++-------
 .../protocol/protocol-reader/src/ReaderRoot.kt     |  7 ++-----
 .../src/ProtocolSchemaReader.kt                    |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt b/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
index 31bfca63b375..af392c72a9c7 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
@@ -59,7 +59,7 @@ val VOID_PARSER: ValueReader = object : ValueReader() {
 fun createHandler(typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<*>>, aClass: Class<*>): TypeWriter<*> {
   val reader = InterfaceReader(typeToTypeHandler)
   reader.processed.addAll(typeToTypeHandler.keySet())
-  reader.go(array(aClass))
+  reader.go(arrayOf(aClass))
   return typeToTypeHandler.get(aClass)
 }
 
@@ -69,7 +69,7 @@ class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<
   val subtypeCasters = ArrayList<SubtypeCaster>()
 
   fun go(): LinkedHashMap<Class<*>, TypeWriter<*>> {
-    return go(typeToTypeHandler.keySet().copyToArray())
+    return go(typeToTypeHandler.keySet().toTypedArray())
   }
 
   fun go(classes: Array<Class<*>>): LinkedHashMap<Class<*>, TypeWriter<*>> {
@@ -163,10 +163,10 @@ class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<
       else if (type == javaClass<String>()) {
         if (method != null) {
           val jsonField = method.getAnnotation<JsonField>(javaClass<JsonField>())
-          if (jsonField != null && jsonField.allowAnyPrimitiveValue()) {
+          if (jsonField != null && jsonField.allowAnyPrimitiveValue) {
             return RAW_STRING_PARSER
           }
-          else if ((jsonField != null && jsonField.optional()) || method.getAnnotation<JsonOptionalField>(javaClass<JsonOptionalField>()) != null) {
+          else if ((jsonField != null && jsonField.optional) || method.getAnnotation<JsonOptionalField>(javaClass<JsonOptionalField>()) != null) {
             return NULLABLE_STRING_PARSER
           }
         }
@@ -189,7 +189,7 @@ class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<
       }
       val ref = getTypeRef(type)
       if (ref != null) {
-        return ObjectValueReader(ref, isSubtyping, method?.getAnnotation<JsonField>(javaClass<JsonField>())?.primitiveValue())
+        return ObjectValueReader(ref, isSubtyping, method?.getAnnotation<JsonField>(javaClass<JsonField>())?.primitiveValue)
       }
       throw UnsupportedOperationException("Method return type " + type + " (simple class) not supported")
     }
@@ -198,7 +198,7 @@ class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<
       if (isList || type.getRawType() == javaClass<Map<Any, Any>>()) {
         var argumentType = type.getActualTypeArguments()[if (isList) 0 else 1]
         if (argumentType is WildcardType) {
-          val wildcard = argumentType as WildcardType
+          val wildcard = argumentType
           if (wildcard.getLowerBounds().size() == 0 && wildcard.getUpperBounds().size() == 1) {
             argumentType = wildcard.getUpperBounds()[0]
           }
@@ -235,7 +235,7 @@ class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<
         throw JsonProtocolModelParseException("Unexpected type of superclass " + param)
       }
       if (result != null) {
-        throw JsonProtocolModelParseException("Already has superclass " + result!!.typeClass.getName())
+        throw JsonProtocolModelParseException("Already has superclass " + result.typeClass.getName())
       }
       result = getTypeRef(param)
       if (result == null) {
diff --git a/platform/script-debugger/protocol/protocol-reader/src/ReaderRoot.kt b/platform/script-debugger/protocol/protocol-reader/src/ReaderRoot.kt
index 8b2b25b48cfd..3f993d6904bd 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/ReaderRoot.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/ReaderRoot.kt
@@ -45,7 +45,7 @@ class ReaderRoot<R>(public val type: Class<R>, private val typeToTypeHandler: Li
       var returnType = m.getGenericReturnType()
       var isList = false
       if (returnType is ParameterizedType) {
-        val parameterizedType = returnType as ParameterizedType
+        val parameterizedType = returnType
         if (parameterizedType.getRawType() == javaClass<List<Any>>()) {
           isList = true
           returnType = parameterizedType.getActualTypeArguments()[0]
@@ -56,9 +56,6 @@ class ReaderRoot<R>(public val type: Class<R>, private val typeToTypeHandler: Li
       var typeWriter: TypeWriter<*>? = typeToTypeHandler.get(returnType)
       if (typeWriter == null) {
         typeWriter = createHandler(typeToTypeHandler, m.getReturnType())
-        if (typeWriter == null) {
-          throw JsonProtocolModelParseException("Unknown return type in " + m)
-        }
       }
 
       val arguments = m.getGenericParameterTypes()
@@ -67,7 +64,7 @@ class ReaderRoot<R>(public val type: Class<R>, private val typeToTypeHandler: Li
       }
       val argument = arguments[0]
       if (argument == javaClass<JsonReaderEx>() || argument == javaClass<Any>()) {
-        methodMap.put(m, ReadDelegate(typeWriter!!, isList, arguments.size() != 1))
+        methodMap.put(m, ReadDelegate(typeWriter, isList, arguments.size() != 1))
       }
       else {
         throw JsonProtocolModelParseException("Unrecognized argument type in " + m)
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/ProtocolSchemaReader.kt b/platform/script-debugger/protocol/schema-reader-generator/src/ProtocolSchemaReader.kt
index c59e6c9c6ba8..ff226ae4a7c0 100644
--- a/platform/script-debugger/protocol/schema-reader-generator/src/ProtocolSchemaReader.kt
+++ b/platform/script-debugger/protocol/schema-reader-generator/src/ProtocolSchemaReader.kt
@@ -3,7 +3,7 @@ package org.jetbrains.jsonProtocol
 import org.jetbrains.io.JsonReaderEx
 import org.jetbrains.jsonProtocol.ProtocolMetaModel.Root
 
-public trait ProtocolSchemaReader {
+public interface ProtocolSchemaReader {
   JsonParseMethod
   public fun parseRoot(reader: JsonReaderEx): Root
 }
\ No newline at end of file