Rename DependencyInjectionFramework to SpringModule and stop implementing CodeGenerationSettingItem as it's not a setting

Author: IlyaMuravjov

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/Domain.kt

@@ -711,44 +711,29 @@ enum class ProjectType {
     JavaScript,
 }
 
-abstract class DependencyInjectionFramework(
-    override val id: String,
-    override val displayName: String,
-    override val description: String = "Use $displayName as dependency injection framework",
+abstract class SpringModule(
     val testFrameworkDisplayName: String,
     /**
      * Generation Spring specific tests requires special spring test framework being installed,
      * so we can use `TestContextManager` from `spring-test` to configure test context in
      * spring-analyzer and to run integration tests.
      */
     var testFrameworkInstalled: Boolean = false
-) : CodeGenerationSettingItem {
+) {
     var isInstalled = false
 
-    companion object : CodeGenerationSettingBox {
-        override val defaultItem: DependencyInjectionFramework get() = SpringBoot
-        override val allItems: List<DependencyInjectionFramework> get() = listOf(SpringBoot, SpringBeans)
+    companion object {
+        val allItems: List<SpringModule> get() = listOf(SpringBoot, SpringBeans)
 
         val installedItems get() = allItems.filter { it.isInstalled }
-
-        /**
-         * Generation Spring specific tests requires special spring test framework being installed,
-         * so we can use `TestContextManager` from `spring-test` to configure test context in
-         * spring-analyzer and to run integration tests.
-         */
-        var testFrameworkInstalled: Boolean = false
     }
 }
 
-object SpringBeans : DependencyInjectionFramework(
-    id = "spring-beans",
-    displayName = "Spring Beans",
+object SpringBeans : SpringModule(
     testFrameworkDisplayName = "spring-test",
 )
 
-object SpringBoot : DependencyInjectionFramework(
-    id = "spring-boot",
-    displayName = "Spring Boot",
+object SpringBoot : SpringModule(
     testFrameworkDisplayName = "spring-boot-test",
 )
 

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

@@ -1,6 +1,6 @@
 package org.utbot.framework.plugin.api.utils
 
-import org.utbot.framework.codegen.domain.DependencyInjectionFramework
+import org.utbot.framework.codegen.domain.SpringModule
 import org.utbot.framework.codegen.domain.Junit4
 import org.utbot.framework.codegen.domain.Junit5
 import org.utbot.framework.codegen.domain.SpringBeans
@@ -61,7 +61,7 @@ fun MockFramework.patterns(): Patterns {
     return Patterns(moduleLibraryPatterns, libraryPatterns)
 }
 
-fun DependencyInjectionFramework.patterns(): Patterns {
+fun SpringModule.patterns(): Patterns {
     val moduleLibraryPatterns = when (this) {
         SpringBoot -> springBootModulePatterns
         SpringBeans -> springBeansModulePatterns
@@ -76,7 +76,7 @@ fun DependencyInjectionFramework.patterns(): Patterns {
     return Patterns(moduleLibraryPatterns, libraryPatterns)
 }
 
-fun DependencyInjectionFramework.testPatterns(): Patterns {
+fun SpringModule.testPatterns(): Patterns {
     val moduleLibraryPatterns = when (this) {
         SpringBoot -> springBootTestModulePatterns
         SpringBeans -> springBeansTestModulePatterns

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt

@@ -78,7 +78,7 @@ import org.jetbrains.concurrency.Promise
 import org.jetbrains.concurrency.thenRun
 import org.utbot.common.PathUtil.toPath
 import org.utbot.framework.UtSettings
-import org.utbot.framework.codegen.domain.DependencyInjectionFramework
+import org.utbot.framework.codegen.domain.SpringModule
 import org.utbot.framework.codegen.domain.ForceStaticMocking
 import org.utbot.framework.codegen.domain.Junit4
 import org.utbot.framework.codegen.domain.Junit5
@@ -361,18 +361,18 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
         }
 
 
-        DependencyInjectionFramework.allItems.forEach {
+        SpringModule.allItems.forEach {
             it.isInstalled = findDependencyInjectionLibrary(model.srcModule, it) != null
         }
-        DependencyInjectionFramework.installedItems.forEach {
+        SpringModule.installedItems.forEach {
             it.testFrameworkInstalled = findDependencyInjectionTestLibrary(model.testModule, it) != null
         }
 
         val isUtBotSpringRuntimePresent = this::class.java.classLoader.getResource("lib/utbot-spring-analyzer-shadow.jar") != null
 
         model.projectType =
             // TODO show some warning, when we see Spring project, but don't have `utBotSpringRuntime`
-            if (isUtBotSpringRuntimePresent && DependencyInjectionFramework.installedItems.isNotEmpty()) ProjectType.Spring
+            if (isUtBotSpringRuntimePresent && SpringModule.installedItems.isNotEmpty()) ProjectType.Spring
             else ProjectType.PureJvm
 
         // Configure notification urls callbacks
@@ -963,7 +963,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
     private fun configureSpringTestFrameworkIfRequired() {
         if (springConfig.item != NO_SPRING_CONFIGURATION_OPTION) {
 
-            DependencyInjectionFramework.installedItems
+            SpringModule.installedItems
                 .filter { it.isInstalled }
                 .forEach { configureSpringTestDependency(it) }
         }
@@ -992,11 +992,11 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
             .onError { selectedTestFramework.isInstalled = false }
     }
 
-    private fun configureSpringTestDependency(framework: DependencyInjectionFramework) {
+    private fun configureSpringTestDependency(springModule: SpringModule) {
         val frameworkLibrary =
-            findDependencyInjectionLibrary(model.srcModule, framework, LibrarySearchScope.Project)
+            findDependencyInjectionLibrary(model.srcModule, springModule, LibrarySearchScope.Project)
         val frameworkTestLibrary =
-            findDependencyInjectionTestLibrary(model.testModule, framework, LibrarySearchScope.Project)
+            findDependencyInjectionTestLibrary(model.testModule, springModule, LibrarySearchScope.Project)
 
         val frameworkVersionInProject = frameworkLibrary?.libraryName?.parseVersion()
             ?: error("Trying to install Spring test framework, but Spring framework is not found in module ${model.srcModule.name}")
@@ -1005,16 +1005,16 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
         if (frameworkTestVersionInProject == null ||
             !frameworkTestVersionInProject.isCompatibleWith(frameworkVersionInProject)
 ) {
-            val libraryDescriptor = when (framework) {
+            val libraryDescriptor = when (springModule) {
                 SpringBoot -> springBootTestLibraryDescriptor(frameworkVersionInProject)
                 SpringBeans -> springTestLibraryDescriptor(frameworkVersionInProject)
-                else -> error("Unsupported DI framework type $framework")
+                else -> error("Unsupported DI framework type $springModule")
             }
 
             model.preClasspathCollectionPromises += addDependency(model.testModule, libraryDescriptor)
         }
 
-        framework.testFrameworkInstalled = true
+        springModule.testFrameworkInstalled = true
     }
 
     private fun configureMockFramework() {
@@ -1308,7 +1308,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
             ) {
                 this.append(value.displayName, SimpleTextAttributes.REGULAR_ATTRIBUTES)
                 if (springConfig.item != NO_SPRING_CONFIGURATION_OPTION) {
-                    DependencyInjectionFramework.installedItems
+                    SpringModule.installedItems
                         // only first missing test framework is shown to avoid overflowing ComboBox
                         .firstOrNull { !it.testFrameworkInstalled }
                         ?.let { diFramework ->

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/LibraryMatcher.kt

@@ -4,7 +4,7 @@ import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.plugin.api.MockFramework
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.LibraryOrderEntry
-import org.utbot.framework.codegen.domain.DependencyInjectionFramework
+import org.utbot.framework.codegen.domain.SpringModule
 import org.utbot.framework.plugin.api.utils.Patterns
 import org.utbot.framework.plugin.api.utils.parametrizedTestsPatterns
 import org.utbot.framework.plugin.api.utils.patterns
@@ -30,15 +30,15 @@ fun findParametrizedTestsLibrary(
 
 fun findDependencyInjectionLibrary(
     module: Module,
-    springFrameworkType: DependencyInjectionFramework,
+    springModule: SpringModule,
     scope: LibrarySearchScope = LibrarySearchScope.Module
-): LibraryOrderEntry? = findMatchingLibraryOrNull(module, springFrameworkType.patterns(), scope)
+): LibraryOrderEntry? = findMatchingLibraryOrNull(module, springModule.patterns(), scope)
 
 fun findDependencyInjectionTestLibrary(
     module: Module,
-    springFrameworkType: DependencyInjectionFramework,
+    springModule: SpringModule,
     scope: LibrarySearchScope = LibrarySearchScope.Module
-): LibraryOrderEntry? = findMatchingLibraryOrNull(module, springFrameworkType.testPatterns(), scope)
+): LibraryOrderEntry? = findMatchingLibraryOrNull(module, springModule.testPatterns(), scope)
 
 private fun findMatchingLibraryOrNull(
     module: Module,