Improve autowired models naming (#2313)

Author: EgorkaKulikov

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

@@ -61,4 +61,13 @@ object SpringModelUtils {
 
     fun UtModel.isAutowiredFromContext(): Boolean =
         this is UtAssembleModel && this.instantiationCall.instance is UtSpringContextModel
+
+    fun UtModel.getBeanNameOrNull(): String? = if (isAutowiredFromContext()) {
+        this as UtAssembleModel
+        val beanNameParam = this.instantiationCall.params.single()
+        val paramValue = (beanNameParam as? UtPrimitiveModel)?.value
+        paramValue.toString()
+    } else {
+        null
+    }
 }

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

@@ -17,6 +17,7 @@ import org.utbot.framework.codegen.domain.models.SpringTestClassModel
 import org.utbot.framework.codegen.domain.models.builders.TypedModelWrappers
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.UtSpringContextModel
+import org.utbot.framework.plugin.api.util.SpringModelUtils.getBeanNameOrNull
 import org.utbot.framework.plugin.api.util.id
 import java.lang.Exception
 
@@ -90,8 +91,11 @@ abstract class CgAbstractSpringTestClassConstructor(context: CgContext):
 
         val constructedDeclarations = mutableListOf<CgFieldDeclaration>()
         for ((classId, listOfUtModels) in groupedModelsByClassId) {
-            val model = listOfUtModels.firstOrNull() ?: continue
-            val createdVariable = variableConstructor.getOrCreateVariable(model.model) as? CgVariable
+            val modelWrapper = listOfUtModels.firstOrNull() ?: continue
+            val model = modelWrapper.model
+            val baseVarName = model.getBeanNameOrNull()
+
+            val createdVariable = variableConstructor.getOrCreateVariable(model, baseVarName) as? CgVariable
                 ?: error("`UtCompositeModel` model was expected, but $model was found")
 
             val declaration = CgDeclaration(classId, variableName = createdVariable.name, initializer = null)

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

@@ -14,7 +14,6 @@ import org.utbot.framework.plugin.api.UtCompositeModel
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtSpringContextModel
 import org.utbot.framework.plugin.api.isMockModel
-import org.utbot.framework.plugin.api.util.SpringModelUtils.applicationContextClassId
 import org.utbot.framework.plugin.api.util.SpringModelUtils.isAutowiredFromContext
 import org.utbot.framework.plugin.api.util.stringClassId