Avoid when by projectType when choosing CgVariableConstructor

Author: IlyaMuravjov

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/generator/SpringCodeGenerator.kt

@@ -7,11 +7,14 @@ import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.RuntimeExceptionTestsBehaviour
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
+import org.utbot.framework.codegen.domain.context.CgContext
 import org.utbot.framework.codegen.domain.models.CgMethodTestSet
 import org.utbot.framework.codegen.domain.models.builders.SpringTestClassModelBuilder
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
 import org.utbot.framework.codegen.tree.CgSpringIntegrationTestClassConstructor
 import org.utbot.framework.codegen.tree.CgSpringUnitTestClassConstructor
+import org.utbot.framework.codegen.tree.CgSpringVariableConstructor
+import org.utbot.framework.codegen.tree.CgVariableConstructor
 import org.utbot.framework.codegen.tree.ututils.UtilClassKind
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
@@ -50,7 +53,11 @@ class SpringCodeGenerator(
     forceStaticMocking,
     generateWarningsForStaticMocking,
     codegenLanguage,
-    cgLanguageAssistant,
+    cgLanguageAssistant = object : CgLanguageAssistant by cgLanguageAssistant {
+        override fun getVariableConstructorBy(context: CgContext): CgVariableConstructor =
+            // TODO decorate original `cgLanguageAssistant.getVariableConstructorBy(context)`
+            CgSpringVariableConstructor(context)
+    },
     parameterizedTestSource,
     runtimeExceptionTestsBehaviour,
     hangingTestsTimeout,

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/language/CgLanguageAssistant.kt

@@ -1,6 +1,5 @@
 package org.utbot.framework.codegen.services.language
 
-import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.context.TestClassContext
 import org.utbot.framework.codegen.domain.context.CgContext
 import org.utbot.framework.codegen.renderer.CgPrinter
@@ -16,11 +15,10 @@ import org.utbot.framework.codegen.tree.CgMethodConstructor
 import org.utbot.framework.codegen.tree.CgStatementConstructor
 import org.utbot.framework.codegen.tree.CgStatementConstructorImpl
 import org.utbot.framework.codegen.tree.CgVariableConstructor
-import org.utbot.framework.codegen.tree.CgSpringVariableConstructor
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
 
-abstract class CgLanguageAssistant {
+interface CgLanguageAssistant {
 
     companion object {
         fun getByCodegenLanguage(language: CodegenLanguage) = when (language) {
@@ -30,31 +28,41 @@ abstract class CgLanguageAssistant {
         }
     }
 
-    open val outerMostTestClassContent: TestClassContext? = null
+    val outerMostTestClassContent: TestClassContext?
 
-    abstract val extension: String
+    val extension: String
 
-    abstract val languageKeywords: Set<String>
+    val languageKeywords: Set<String>
 
-    abstract fun testClassName(
+    fun testClassName(
         testClassCustomName: String?,
         testClassPackageName: String,
         classUnderTest: ClassId
     ): Pair<String, String>
 
-    open fun getNameGeneratorBy(context: CgContext): CgNameGenerator = CgNameGeneratorImpl(context)
-    open fun getCallableAccessManagerBy(context: CgContext): CgCallableAccessManager =
-        CgCallableAccessManagerImpl(context)
-    open fun getStatementConstructorBy(context: CgContext): CgStatementConstructor = CgStatementConstructorImpl(context)
+    fun getNameGeneratorBy(context: CgContext): CgNameGenerator
+    fun getCallableAccessManagerBy(context: CgContext): CgCallableAccessManager
+    fun getStatementConstructorBy(context: CgContext): CgStatementConstructor
 
-    open fun getVariableConstructorBy(context: CgContext): CgVariableConstructor = when (context.projectType) {
-            ProjectType.Spring -> CgSpringVariableConstructor(context)
-            else -> CgVariableConstructor(context)
-        }
+    fun getVariableConstructorBy(context: CgContext): CgVariableConstructor
+
+    fun getMethodConstructorBy(context: CgContext): CgMethodConstructor
+    fun getCgFieldStateManager(context: CgContext): CgFieldStateManager
+
+    fun getLanguageTestFrameworkManager(): LanguageTestFrameworkManager
+    fun cgRenderer(context: CgRendererContext, printer: CgPrinter): CgAbstractRenderer
+}
+
+abstract class AbstractCgLanguageAssistant : CgLanguageAssistant {
+    override val outerMostTestClassContent: TestClassContext? get() = null
+
+    override fun getNameGeneratorBy(context: CgContext): CgNameGenerator = CgNameGeneratorImpl(context)
+    override fun getCallableAccessManagerBy(context: CgContext): CgCallableAccessManager =
+        CgCallableAccessManagerImpl(context)
+    override fun getStatementConstructorBy(context: CgContext): CgStatementConstructor = CgStatementConstructorImpl(context)
 
-    open fun getMethodConstructorBy(context: CgContext): CgMethodConstructor = CgMethodConstructor(context)
-    open fun getCgFieldStateManager(context: CgContext): CgFieldStateManager = CgFieldStateManagerImpl(context)
+    override fun getVariableConstructorBy(context: CgContext): CgVariableConstructor = CgVariableConstructor(context)
 
-    abstract fun getLanguageTestFrameworkManager(): LanguageTestFrameworkManager
-    abstract fun cgRenderer(context: CgRendererContext, printer: CgPrinter): CgAbstractRenderer
+    override fun getMethodConstructorBy(context: CgContext): CgMethodConstructor = CgMethodConstructor(context)
+    override fun getCgFieldStateManager(context: CgContext): CgFieldStateManager = CgFieldStateManagerImpl(context)
 }

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/language/JavaCgLanguageAssistant.kt

@@ -8,7 +8,7 @@ import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.JVMTestFrameworkManager
 import org.utbot.framework.plugin.api.utils.testClassNameGenerator
 
-object JavaCgLanguageAssistant : CgLanguageAssistant() {
+object JavaCgLanguageAssistant : AbstractCgLanguageAssistant() {
 
     override val extension: String
         get() = ".java"

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/language/KotlinCgLanguageAssistant.kt

@@ -8,7 +8,7 @@ import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.JVMTestFrameworkManager
 import org.utbot.framework.plugin.api.utils.testClassNameGenerator
 
-object KotlinCgLanguageAssistant : CgLanguageAssistant() {
+object KotlinCgLanguageAssistant : AbstractCgLanguageAssistant() {
 
     override val extension: String
         get() = ".kt"

utbot-js/src/main/kotlin/framework/codegen/JsCgLanguageAssistant.kt

@@ -10,11 +10,11 @@ import org.utbot.framework.codegen.domain.context.TestClassContext
 import org.utbot.framework.codegen.renderer.CgAbstractRenderer
 import org.utbot.framework.codegen.renderer.CgPrinter
 import org.utbot.framework.codegen.renderer.CgRendererContext
-import org.utbot.framework.codegen.services.language.CgLanguageAssistant
+import org.utbot.framework.codegen.services.language.AbstractCgLanguageAssistant
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.utils.testClassNameGenerator
 
-object JsCgLanguageAssistant : CgLanguageAssistant() {
+object JsCgLanguageAssistant : AbstractCgLanguageAssistant() {
 
     override val outerMostTestClassContent: TestClassContext = TestClassContext()
 

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/PythonCgLanguageAssistant.kt

@@ -5,7 +5,7 @@ import org.utbot.framework.codegen.domain.models.CgVariable
 import org.utbot.framework.codegen.renderer.CgPrinter
 import org.utbot.framework.codegen.renderer.CgAbstractRenderer
 import org.utbot.framework.codegen.renderer.CgRendererContext
-import org.utbot.framework.codegen.services.language.CgLanguageAssistant
+import org.utbot.framework.codegen.services.language.AbstractCgLanguageAssistant
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.python.framework.api.python.PythonTree
 import org.utbot.python.framework.codegen.model.constructor.name.PythonCgNameGenerator
@@ -16,8 +16,7 @@ import org.utbot.python.framework.codegen.model.constructor.tree.PythonCgVariabl
 import org.utbot.python.framework.codegen.model.constructor.visitor.CgPythonRenderer
 import org.utbot.python.framework.codegen.model.services.access.PythonCgFieldStateManager
 
-object PythonCgLanguageAssistant : CgLanguageAssistant() {
-
+object PythonCgLanguageAssistant : AbstractCgLanguageAssistant() {
     override val extension: String
         get() = ".py"