fix review

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

@@ -12,7 +12,7 @@ fun buildAnswer(
     methodToValues: Map<out ExecutableId, List<Any?>>
 ) : Answer<Any?> {
     val pointers = methodToValues.mapValues { (_, _) -> 0 }.toMutableMap()
-    return Answer { invocation ->
+    val answer = Answer { invocation ->
         with(invocation.method) {
             pointers[executableId].let { pointer ->
                 methodToValues[executableId].let { values ->
@@ -28,4 +28,5 @@ fun buildAnswer(
             }
         }
     }
+    return answer
 }

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

@@ -199,7 +199,7 @@ class MockValueConstructor : Closeable {
         return classInstance
     }
 
-    private fun generateMockitoAnswer(methodToValues: Map<out ExecutableId, List<UtModel>>): Answer<*> {
+    private fun generateMockitoAnswer(methodToValues: Map<ExecutableId, List<UtModel>>): Answer<*> {
         val concreteValues = methodToValues.mapValues { (_, models) ->
             models.map { model ->
                 val mockId = MockId("mock${++mockCounter}")
@@ -215,15 +215,15 @@ class MockValueConstructor : Closeable {
         return Mockito.mock(clazz, generateMockitoAnswer(mocks))
     }
 
-    private fun <T : ExecutableId> computeConcreteValuesForMethods(
-        methodToValues: Map<T, List<UtModel>>,
-    ): Map<T, List<Any?>> = methodToValues.mapValues { (_, models) ->
+    private fun computeConcreteValuesForMethods(
+        methodToValues: Map<ExecutableId, List<UtModel>>,
+    ): Map<ExecutableId, List<Any?>> = methodToValues.mapValues { (_, models) ->
         models.map { mockAndGet(it) }
     }
 
-    private fun <T : ExecutableId> groupByClass(
-        methodToModels: Map<T, List<UtModel>>
-    ): Map<ClassId, Map<T, List<UtModel>>> =
+    private fun groupByClass(
+        methodToModels: Map<ExecutableId, List<UtModel>>
+    ): Map<ClassId, Map<ExecutableId, List<UtModel>>> =
         methodToModels
             .asIterable()
             .groupBy { it.key.classId }
@@ -237,10 +237,10 @@ class MockValueConstructor : Closeable {
     fun mockStaticMethods(
         instrumentations: List<UtStaticMethodInstrumentation>,
     ) {
-        val methodToModels = instrumentations.associate { it.methodId to it.values }
+        val methodToModels = instrumentations.associate { (it.methodId as ExecutableId) to it.values }
         val methodToModelsGroupedByClass = groupByClass(methodToModels)
-        controllers += methodToModelsGroupedByClass.map { (classId, m2m) ->
-            val methodToValues = computeConcreteValuesForMethods(m2m)
+        controllers += methodToModelsGroupedByClass.map { (classId, method2modelValues) ->
+            val methodToValues = computeConcreteValuesForMethods(method2modelValues)
             StaticMethodMockController(classId.jClass, methodToValues)
         }
     }

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

@@ -15,7 +15,7 @@ import org.utbot.framework.plugin.api.ExecutableId
  */
 class StaticMethodMockController(
     private val clazz: Class<*>,
-    private val methodToValues: Map<out ExecutableId, List<Any?>>
+    private val methodToValues: Map<ExecutableId, List<Any?>>
 ) : MockController {
 
     override fun init() {