Use ClassId in UtClassRefModel (#2314)

Author: IlyaMuravjov

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

@@ -456,7 +456,7 @@ data class UtEnumConstantModel(
 data class UtClassRefModel(
     override val id: Int,
     override val classId: ClassId,
-    val value: Class<*>
+    val value: ClassId
 ) : UtReferenceModel(id, classId) {
     // Model id is included for debugging purposes
     override fun toString(): String = "$value@$id"

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

@@ -187,7 +187,7 @@ class ValueConstructor {
             is UtNullModel -> UtConcreteValue(null, model.classId.jClass)
             is UtPrimitiveModel -> UtConcreteValue(model.value, model.classId.jClass)
             is UtEnumConstantModel -> UtConcreteValue(model.value)
-            is UtClassRefModel -> UtConcreteValue(model.value)
+            is UtClassRefModel -> UtConcreteValue(model.value.jClass)
             is UtCompositeModel -> UtConcreteValue(constructObject(model), model.classId.jClass)
             is UtArrayModel -> UtConcreteValue(constructArray(model))
             is UtAssembleModel -> UtConcreteValue(constructFromAssembleModel(model))

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

@@ -686,7 +686,7 @@ class Resolver(
         val modeledNumDimensions = holder.eval(numDimensionsArray.select(addrExpression)).intValue()
 
         val classRef = classRefByName(modeledType, modeledNumDimensions)
-        val model = UtClassRefModel(addr, CLASS_REF_CLASS_ID, classRef)
+        val model = UtClassRefModel(addr, CLASS_REF_CLASS_ID, classRef.id)
         addConstructedModel(addr, model)
 
         return model

utbot-framework/src/main/kotlin/org/utbot/external/api/UtModelFactory.kt

@@ -69,7 +69,7 @@ class UtModelFactory(
     fun produceClassRefModel(clazz: Class<*>) = UtClassRefModel(
         modelIdCounter.incrementAndGet(),
         classIdForType(clazz),
-        clazz
+        clazz.id
     )
 }
 

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

@@ -467,7 +467,7 @@ open class CgVariableConstructor(val context: CgContext) :
     }
 
     private fun constructClassRef(model: UtClassRefModel, baseName: String?): CgVariable {
-        val classId = model.value.id
+        val classId = model.value
         val init = if (classId.isAccessibleFrom(testClassPackageName)) {
             CgGetJavaClass(classId)
         } else {

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/constructors/MockValueConstructor.kt

@@ -105,7 +105,7 @@ class MockValueConstructor(
             is UtNullModel -> UtConcreteValue(null, model.classId.jClass)
             is UtPrimitiveModel -> UtConcreteValue(model.value, model.classId.jClass)
             is UtEnumConstantModel -> UtConcreteValue(constructEnum(model))
-            is UtClassRefModel -> UtConcreteValue(model.value)
+            is UtClassRefModel -> UtConcreteValue(model.value.jClass)
             is UtCompositeModel -> UtConcreteValue(constructObject(model), model.classId.jClass)
             is UtArrayModel -> UtConcreteValue(constructArray(model))
             is UtAssembleModel -> UtConcreteValue(constructFromAssembleModel(model), model.classId.jClass)

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/constructors/UtModelConstructor.kt

@@ -252,7 +252,7 @@ class UtModelConstructor(
 
     private fun constructFromClass(clazz: Class<*>): UtModel =
         constructedObjects.getOrElse(clazz) {
-            val utModel = UtClassRefModel(handleId(clazz), clazz::class.java.id, clazz)
+            val utModel = UtClassRefModel(handleId(clazz), clazz::class.java.id, clazz.id)
             constructedObjects[clazz] = utModel
             utModel
         }