Apply review comments

Author: sofurihafe

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/ThrowableUtils.kt

@@ -1,12 +1,10 @@
 package org.utbot.framework.plugin.api.util
 
-import org.utbot.framework.plugin.api.ClassId
-
 val Throwable.description
     get() = message?.replace('\n', '\t') ?: "<Throwable with empty message>"
 
 val Throwable.isCheckedException
-    get() = !(this is RuntimeException|| this is Error)
+    get() = !(this is RuntimeException || this is Error)
 
-val ClassId.isCheckedException
-    get() = !(RuntimeException::class.java.isAssignableFrom(this.jClass) || Error::class.java.isAssignableFrom(this.jClass))
+val Class<*>.isCheckedException
+    get() = !(RuntimeException::class.java.isAssignableFrom(this) || Error::class.java.isAssignableFrom(this))

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt

@@ -54,11 +54,11 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.persistentSetOf
 import org.utbot.framework.codegen.model.constructor.builtin.streamsDeepEqualsMethodId
-import org.utbot.framework.plugin.api.util.isSubtypeOf
-import org.utbot.framework.plugin.api.util.isNotSubtypeOf
-import org.utbot.framework.plugin.api.util.isCheckedException
-import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.executableId
+import org.utbot.framework.plugin.api.util.id
+import org.utbot.framework.plugin.api.util.isCheckedException
+import org.utbot.framework.plugin.api.util.isSubtypeOf
+import org.utbot.framework.plugin.api.util.jClass
 
 /**
  * Interface for all code generation context aware entities
@@ -237,22 +237,19 @@ internal interface CgContextOwner {
     }
 
     fun addExceptionIfNeeded(exception: ClassId) {
-        when (exception) {
-            is BuiltinClassId -> {}
-            else -> {
-                if (exception isNotSubtypeOf Throwable::class.id) {
-                    error("Class $exception which is not a Throwable was passed")
-                }
+        if (exception !is BuiltinClassId) {
+            require(exception isSubtypeOf Throwable::class.id) {
+                "Class $exception which is not a Throwable was passed"
+            }
 
-                val isUnchecked = !exception.isCheckedException
-                val alreadyAdded =
-                    collectedExceptions.any { existingException -> exception isSubtypeOf existingException }
+            val isUnchecked = !exception.jClass.isCheckedException
+            val alreadyAdded =
+                collectedExceptions.any { existingException -> exception isSubtypeOf existingException }
 
-                if (isUnchecked || alreadyAdded) return
+            if (isUnchecked || alreadyAdded) return
 
-                collectedExceptions
-                    .removeIf { existingException -> existingException isSubtypeOf exception }
-            }
+            collectedExceptions
+                .removeIf { existingException -> existingException isSubtypeOf exception }
         }
 
         if (collectedExceptions.add(exception)) {