Extract utbot-spring-framework module from utbot-framework-module

Remove duplicated `include("utbot-spring-framework")` in `settings.gradle.kts`

Author: IlyaMuravjov

settings.gradle.kts

@@ -56,6 +56,7 @@ if (includeRiderInBuild.toBoolean()) {
 
 include("utbot-ui-commons")
 
+include("utbot-spring-framework")
 include("utbot-spring-commons-api")
 include("utbot-spring-commons")
 include("utbot-spring-analyzer")

utbot-framework/build.gradle

@@ -3,9 +3,8 @@ plugins {
 }
 
 configurations {
-    fetchSpringAnalyzerJar
-    fetchSpringCommonsJar
     fetchInstrumentationJar
+    fetchSpringAnalyzerJar
 }
 
 dependencies {
@@ -52,7 +51,6 @@ dependencies {
     implementation project(':utbot-spring-commons-api')
     implementation project(':utbot-spring-analyzer')
     fetchSpringAnalyzerJar project(path: ':utbot-spring-analyzer', configuration: 'springAnalyzerJar')
-    fetchSpringCommonsJar project(path: ':utbot-spring-commons', configuration: 'springCommonsJar')
 }
 
 processResources {
@@ -63,8 +61,4 @@ processResources {
     from(configurations.fetchSpringAnalyzerJar) {
         into "lib"
     }
-
-    from(configurations.fetchSpringCommonsJar) {
-        into "lib"
-    }
 }

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

@@ -20,21 +20,6 @@ internal val mockitoClassId = BuiltinClassId(
     simpleName = "Mockito",
 )
 
-internal val mockClassId = BuiltinClassId(
-    canonicalName = "org.mockito.Mock",
-    simpleName = "Mock",
-)
-
-internal val spyClassId = BuiltinClassId(
-    canonicalName = "org.mockito.Spy",
-    simpleName = "Spy"
-)
-
-internal val injectMocksClassId = BuiltinClassId(
-    canonicalName = "org.mockito.InjectMocks",
-    simpleName = "InjectMocks",
-)
-
 internal val ongoingStubbingClassId = BuiltinClassId(
     canonicalName = "org.mockito.stubbing.OngoingStubbing",
     simpleName = "OngoingStubbing",

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

@@ -278,7 +278,7 @@ internal class UtilClassFileMethodProvider(language: CodegenLanguage)
     val UTIL_CLASS_VERSION = "2.1"
 }
 
-internal class TestClassUtilMethodProvider(testClassId: ClassId) : UtilMethodProvider(testClassId)
+class TestClassUtilMethodProvider(testClassId: ClassId) : UtilMethodProvider(testClassId)
 
 internal fun selectUtilClassId(codegenLanguage: CodegenLanguage): ClassId =
     when (codegenLanguage) {

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/access/CgCallableAccessManager.kt

@@ -87,7 +87,7 @@ interface CgCallableAccessManager {
     operator fun ClassId.get(fieldId: FieldId): CgStaticFieldAccess
 }
 
-internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableAccessManager,
+class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableAccessManager,
     CgContextOwner by context {
 
     private val statementConstructor by lazy { getStatementConstructorBy(context) }

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

@@ -255,7 +255,7 @@ fun CgContextOwner.importIfNeeded(type: ClassId) {
     }
 }
 
-internal fun CgContextOwner.importIfNeeded(method: MethodId) {
+fun CgContextOwner.importIfNeeded(method: MethodId) {
     val name = method.name
     val packageName = method.classId.packageName
     method.takeIf { it.isStatic && packageName != testClassPackageName && packageName != "java.lang" }

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

@@ -120,7 +120,7 @@ sealed class UtilClassKind(
          * @return `null` if [CgContext.utilMethodProvider] is not [UtilClassFileMethodProvider],
          * because it means that util methods will be taken from some other provider (e.g. [TestClassUtilMethodProvider]).
          */
-        internal fun fromCgContextOrNull(context: CgContext): UtilClassKind? {
+        fun fromCgContextOrNull(context: CgContext): UtilClassKind? {
             if (context.requiredUtilMethods.isEmpty()) return null
             if (!context.mockFrameworkUsed) {
                 return RegularUtUtils(context.codegenLanguage)

utbot-intellij/build.gradle.kts

@@ -157,6 +157,7 @@ dependencies {
     implementation(group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version = jacksonVersion)
 
     implementation(project(":utbot-framework")) { exclude(group = "org.slf4j", module = "slf4j-api") }
+    implementation(project(":utbot-spring-framework")) { exclude(group = "org.slf4j", module = "slf4j-api") }
     implementation(project(":utbot-java-fuzzing"))
     //api(project(":utbot-analytics"))
     testImplementation("org.mock-server:mockserver-netty:5.4.1")

utbot-spring-framework/build.gradle.kts

@@ -0,0 +1,24 @@
+val kotlinLoggingVersion: String by rootProject
+val sootVersion: String by rootProject
+
+val fetchSpringCommonsJar: Configuration by configurations.creating {
+    isCanBeResolved = true
+    isCanBeConsumed = false
+}
+
+dependencies {
+    implementation(project(":utbot-framework"))
+    implementation(project(":utbot-spring-commons-api"))
+    implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
+    implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
+        exclude(group = "com.google.guava", module = "guava")
+    }
+
+    fetchSpringCommonsJar(project(":utbot-spring-commons", configuration = "springCommonsJar"))
+}
+
+tasks.processResources {
+    from(fetchSpringCommonsJar) {
+        into("lib")
+    }
+}

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

@@ -0,0 +1,18 @@
+package org.utbot.framework.codegen.domain.builtin
+
+import org.utbot.framework.plugin.api.BuiltinClassId
+
+internal val mockClassId = BuiltinClassId(
+    canonicalName = "org.mockito.Mock",
+    simpleName = "Mock",
+)
+
+internal val spyClassId = BuiltinClassId(
+    canonicalName = "org.mockito.Spy",
+    simpleName = "Spy"
+)
+
+internal val injectMocksClassId = BuiltinClassId(
+    canonicalName = "org.mockito.InjectMocks",
+    simpleName = "InjectMocks",
+)

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

@@ -1,8 +1,6 @@
 package org.utbot.framework.codegen.tree.fieldmanager
 
 import org.utbot.framework.codegen.domain.builtin.injectMocksClassId
-import org.utbot.framework.codegen.domain.builtin.mockClassId
-import org.utbot.framework.codegen.domain.builtin.spyClassId
 import org.utbot.framework.codegen.domain.context.CgContext
 import org.utbot.framework.codegen.domain.models.CgFieldDeclaration
 import org.utbot.framework.codegen.domain.models.CgValue

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/SpyFrameworkManager.kt renamed to utbot-spring-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/SpyFrameworkManager.kt

@@ -1,5 +1,6 @@
 dependencies {
     testImplementation(project(":utbot-framework"))
+    testImplementation(project(":utbot-spring-framework"))
     testImplementation project(':utbot-testing')
     testImplementation project(':utbot-spring-sample')