Fix: review comments

Author: sergeypospelov

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

@@ -473,7 +473,7 @@ data class UtArrayModel(
  *
  * The default constructor is made private to enforce using a safe constructor.
  *
- * @param instantiationCall is an [UtExecutableCallModel] to instantiate represented object.
+ * @param instantiationCall is an [UtExecutableCallModel] to instantiate represented object. It **must** not return `null`.
  * @param modificationsChain is a chain of [UtStatementModel] to construct object state.
  */
 data class UtAssembleModel private constructor(

utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt

@@ -1,12 +1,11 @@
 package org.utbot.examples.codegen.deepequals
 
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.utbot.tests.infrastructure.DoNotCalculate
-import org.utbot.tests.infrastructure.UtValueTestCaseChecker
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.testcheckers.eq
 import org.utbot.tests.infrastructure.CodeGeneration
+import org.utbot.tests.infrastructure.DoNotCalculate
+import org.utbot.tests.infrastructure.UtValueTestCaseChecker
 
 class ClassWithCrossReferenceRelationshipTest : UtValueTestCaseChecker(
     testClass = ClassWithCrossReferenceRelationship::class,

utbot-framework/src/main/kotlin/org/utbot/engine/ObjectWrappers.kt

@@ -242,9 +242,9 @@ data class ThrowableWrapper(val throwable: Throwable) : WrapperInterface {
         val modelName = nextModelName(throwable.javaClass.simpleName.decapitalize())
 
         val instantiationCall = when (val message = throwable.message) {
-            null -> UtExecutableCallModel(null, constructorId(classId), emptyList())
+            null -> UtExecutableCallModel(instance = null, constructorId(classId), emptyList())
             else -> UtExecutableCallModel(
-                null,
+                instance = null,
                 constructorId(classId, stringClassId),
                 listOf(UtPrimitiveModel(message))
             )

utbot-framework/src/main/kotlin/org/utbot/engine/OptionalWrapper.kt

@@ -106,7 +106,8 @@ class OptionalWrapper(private val utOptionalClass: UtOptionalClass) : BaseOverri
         }
         return if (!isPresent) {
             UtExecutableCallModel(
-                null, MethodId(
+                instance = null,
+                MethodId(
                     classId,
                     "empty",
                     classId,
@@ -115,7 +116,8 @@ class OptionalWrapper(private val utOptionalClass: UtOptionalClass) : BaseOverri
             )
         } else {
             UtExecutableCallModel(
-                null, MethodId(
+                instance = null,
+                MethodId(
                     classId,
                     "of",
                     classId,

utbot-framework/src/main/kotlin/org/utbot/engine/Resolver.kt

@@ -550,7 +550,7 @@ class Resolver(
             val baseModelName = primitiveClassId.name
             val constructorId = constructorId(classId, primitiveClassId)
             val valueModel = fields[FieldId(classId, "value")] ?: primitiveClassId.defaultValueModel()
-            val instantiationCall = UtExecutableCallModel(null, constructorId, listOf(valueModel))
+            val instantiationCall = UtExecutableCallModel(instance = null, constructorId, listOf(valueModel))
             UtAssembleModel(addr, classId, nextModelName(baseModelName), instantiationCall)
         }
     }

utbot-framework/src/main/kotlin/org/utbot/engine/SecurityManagerWrapper.kt

@@ -29,7 +29,7 @@ class SecurityManagerWrapper : BaseOverriddenWrapper(utSecurityManagerClass.name
         val modelName = nextModelName(baseModelName)
 
         val instantiationCall = UtExecutableCallModel(
-            null,
+            instance = null,
             System::getSecurityManager.executableId,
             emptyList()
         )

utbot-framework/src/main/kotlin/org/utbot/engine/Strings.kt

@@ -329,12 +329,12 @@ sealed class UtAbstractStringBuilderWrapper(className: String) : BaseOverriddenW
         val charValues = CharArray(length) { (values.stores[it] as UtPrimitiveModel).value as Char }
         val stringModel = UtPrimitiveModel(String(charValues))
         val constructorId = constructorId(wrapper.type.classId, STRING_TYPE.classId)
-        val instantiationChain = UtExecutableCallModel(
+        val instantiationCall = UtExecutableCallModel(
             instance = null,
             constructorId,
             listOf(stringModel)
         )
-        return UtAssembleModel(addr, wrapper.type.classId, modelName, instantiationChain)
+        return UtAssembleModel(addr, wrapper.type.classId, modelName, instantiationCall)
     }
 
     private val SootClass.valueField: SootField

utbot-framework/src/main/kotlin/org/utbot/framework/assemble/AssembleModelGenerator.kt

@@ -291,7 +291,7 @@ class AssembleModelGenerator(private val methodPackageName: String) {
             modelBefore.modelName,
             assembleExecutableCallModel(modelBefore.instantiationCall),
             modelBefore.origin
-        ).apply {
+        ) {
             instantiatedModels[modelBefore] = this
             modelBefore.modificationsChain.map { assembleStatementModel(it) }
         }
@@ -361,7 +361,7 @@ class AssembleModelGenerator(private val methodPackageName: String) {
                 assembleModel(fieldModel)
             }
 
-        return UtExecutableCallModel(null, constructorInfo.constructorId, constructorParams)
+        return UtExecutableCallModel(instance = null, constructorInfo.constructorId, constructorParams)
     }
 
     /**

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt

@@ -201,8 +201,8 @@ internal class CgVariableConstructor(val context: CgContext) :
     }
 
     private fun constructAssemble(model: UtAssembleModel, baseName: String?): CgValue {
-        val instantiationExecutableCall = model.instantiationCall
-        processInstantiationStatement(model, instantiationExecutableCall, baseName)
+        val instantiationCall = model.instantiationCall
+        processInstantiationStatement(model, instantiationCall, baseName)
 
         for (statementModel in model.modificationsChain) {
             when (statementModel) {

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/IterableConstructors.kt

@@ -19,7 +19,7 @@ internal class CollectionConstructor : UtAssembleModelConstructorBase() {
         @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
         value as java.util.Collection<*>
 
-        // If [valueToConstructFrom] constructed incorrectly (some inner transient fields are null, etc.) this may fail.
+        // If [value] constructed incorrectly (some inner transient fields are null, etc.) this may fail.
         // This value will be constructed as UtCompositeModel.
         val models = value.map { internalConstructor.construct(it, valueToClassId(it)) }
 

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/PrimitiveWrapperConstructor.kt

@@ -19,7 +19,7 @@ internal class PrimitiveWrapperConstructor : UtAssembleModelConstructorBase() {
         checkClassCast(classId.jClass, value::class.java)
 
         return UtExecutableCallModel(
-            null,
+            instance = null,
             constructorId(classId, classId.unbox()),
             listOf(UtPrimitiveModel(value))
         )

utbot-framework/src/main/kotlin/org/utbot/fuzzer/FallbackModelProvider.kt

@@ -98,7 +98,7 @@ open class FallbackModelProvider(
                     id = idGenerator.createId(),
                     kclass.id,
                     kclass.id.toString(),
-                    UtExecutableCallModel(null, defaultConstructor.executableId, listOf())
+                    UtExecutableCallModel(instance = null, defaultConstructor.executableId, listOf())
                 )
             }
             else -> {

utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/objects/AssembleModelUtils.kt

@@ -15,7 +15,7 @@ fun ModelProvider.assembleModel(id: Int, constructorId: ConstructorId, params: L
         id,
         constructorId.classId,
         "${constructorId.classId.name}${constructorId.parameters}#" + id.hex(),
-        UtExecutableCallModel(null, constructorId, params.map { it.model })
+        UtExecutableCallModel(instance = null, constructorId, params.map { it.model })
     ).fuzzed {
         summary = "%var% = ${constructorId.classId.simpleName}(${constructorId.parameters.joinToString { it.simpleName }})"
     }

utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/CollectionModelProvider.kt

@@ -92,7 +92,7 @@ class CollectionModelProvider(
     private fun Class<*>.methodCall(methodName: String, returnType: Class<*>, params: List<Class<*>> = emptyList()) = MethodId(id, methodName, returnType.id, params.map { it.id })
 
     private fun Class<*>.createdBy(init: ExecutableId, params: List<UtModel> = emptyList()): UtAssembleModel {
-        val instantiationCall = UtExecutableCallModel(null, init, params)
+        val instantiationCall = UtExecutableCallModel(instance = null, init, params)
         val genId = idGenerator.createId()
         return UtAssembleModel(
             genId,