Little refactoring

Author: EgorkaKulikov

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

@@ -1,5 +1,6 @@
 package org.utbot.framework.plugin.api.util
 
+import org.utbot.framework.plugin.api.BuiltinClassId
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.SpringRepositoryId
@@ -10,9 +11,15 @@ import org.utbot.framework.plugin.api.UtPrimitiveModel
 import org.utbot.framework.plugin.api.UtSpringContextModel
 
 object SpringModelUtils {
+ val autowiredClassId = ClassId("org.springframework.beans.factory.annotation.Autowired")
+
  val applicationContextClassId = ClassId("org.springframework.context.ApplicationContext")
  val crudRepositoryClassId = ClassId("org.springframework.data.repository.CrudRepository")
 
+ val springBootTestClassId = ClassId("org.springframework.boot.test.context.SpringBootTest")
+ val dirtiesContextClassId = ClassId("org.springframework.test.annotation.DirtiesContext")
+ val dirtiesContextClassModeClassId = ClassId("org.springframework.test.annotation.DirtiesContext.ClassMode")
+
  val getBeanMethodId = MethodId(
  classId = applicationContextClassId,
  name = "getBean",

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

@@ -1,7 +1,6 @@
 package org.utbot.framework.codegen.tree
 
 import org.utbot.framework.codegen.domain.builtin.TestClassUtilMethodProvider
-import org.utbot.framework.codegen.domain.builtin.autowiredClassId
 import org.utbot.framework.codegen.domain.builtin.injectMocksClassId
 import org.utbot.framework.codegen.domain.builtin.mockClassId
 import org.utbot.framework.codegen.domain.context.CgContext
@@ -19,6 +18,7 @@ import org.utbot.framework.codegen.domain.models.CgVariable
 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.util.SpringModelUtils.autowiredClassId
 import org.utbot.framework.plugin.api.util.id
 import java.lang.Exception
 

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

@@ -1,21 +1,15 @@
 package org.utbot.framework.codegen.tree
 
-import org.utbot.framework.codegen.domain.builtin.autowiredClassId
-import org.utbot.framework.codegen.domain.builtin.dirtiesContextClassId
-import org.utbot.framework.codegen.domain.builtin.dirtiesContextClassModeClassId
-import org.utbot.framework.codegen.domain.builtin.springBootTestClassId
 import org.utbot.framework.codegen.domain.context.CgContext
-import org.utbot.framework.codegen.domain.models.CgAnnotation
 import org.utbot.framework.codegen.domain.models.CgClass
 import org.utbot.framework.codegen.domain.models.CgEnumConstantAccess
 import org.utbot.framework.codegen.domain.models.CgFieldDeclaration
-import org.utbot.framework.codegen.domain.models.CgLiteral
 import org.utbot.framework.codegen.domain.models.CgMethodsCluster
-import org.utbot.framework.codegen.domain.models.CgNotNullAssertion
-import org.utbot.framework.codegen.domain.models.CgSingleArgAnnotation
-import org.utbot.framework.codegen.domain.models.CgValue
 import org.utbot.framework.codegen.domain.models.SpringTestClassModel
-import org.utbot.framework.plugin.api.util.stringClassId
+import org.utbot.framework.plugin.api.util.SpringModelUtils.autowiredClassId
+import org.utbot.framework.plugin.api.util.SpringModelUtils.dirtiesContextClassId
+import org.utbot.framework.plugin.api.util.SpringModelUtils.dirtiesContextClassModeClassId
+import org.utbot.framework.plugin.api.util.SpringModelUtils.springBootTestClassId
 
 class CgSpringIntegrationTestClassConstructor(context: CgContext) : CgAbstractSpringTestClassConstructor(context) {
  override fun constructTestClass(testClassModel: SpringTestClassModel): CgClass {