Skip to content

Commit 4b95114

Browse files
committed
Use EngineProcessTask to call spring analyzer
1 parent ab4836a commit 4b95114

File tree

8 files changed

+73
-365
lines changed

8 files changed

+73
-365
lines changed

utbot-framework/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ plugins {
44

55
configurations {
66
fetchInstrumentationJar
7-
fetchSpringAnalyzerJar
87
}
98

109
dependencies {
@@ -47,18 +46,10 @@ dependencies {
4746
implementation group: 'com.github.UnitTestBot.ksmt', name: 'ksmt-z3', version: ksmtVersion
4847

4948
fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration: 'instrumentationArchive')
50-
51-
implementation project(':utbot-spring-commons-api')
52-
implementation project(':utbot-spring-analyzer')
53-
fetchSpringAnalyzerJar project(path: ':utbot-spring-analyzer', configuration: 'springAnalyzerJar')
5449
}
5550

5651
processResources {
5752
from(configurations.fetchInstrumentationJar) {
5853
into "lib"
5954
}
60-
61-
from(configurations.fetchSpringAnalyzerJar) {
62-
into "lib"
63-
}
6455
}

utbot-framework/src/main/kotlin/org/utbot/framework/process/EngineProcessMain.kt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,14 @@ import org.utbot.framework.plugin.api.util.method
2828
import org.utbot.framework.plugin.api.utils.ClassNameUtils
2929
import org.utbot.framework.plugin.services.JdkInfo
3030
import org.utbot.framework.process.generated.*
31-
import org.utbot.framework.process.generated.BeanAdditionalData
32-
import org.utbot.framework.process.generated.BeanDefinitionData
3331
import org.utbot.framework.process.kryo.KryoHelper
3432
import org.utbot.instrumentation.instrumentation.instrumenter.Instrumenter
3533
import org.utbot.rd.IdleWatchdog
3634
import org.utbot.rd.ClientProtocolBuilder
3735
import org.utbot.rd.RdSettingsContainerFactory
3836
import org.utbot.rd.generated.settingsModel
39-
import org.utbot.rd.terminateOnException
4037
import org.utbot.sarif.RdSourceFindingStrategyFacade
4138
import org.utbot.sarif.SarifReport
42-
import org.utbot.spring.process.SpringAnalyzerProcess
4339
import org.utbot.summary.summarizeAll
4440
import org.utbot.taint.TaintConfigurationProviderUserRules
4541
import java.io.File
@@ -90,27 +86,6 @@ private fun EngineProcessModel.setup(kryoHelper: KryoHelper, watchdog: IdleWatch
9086
)
9187
UtContext.setUtContext(UtContext(classLoader))
9288
}
93-
watchdog.measureTimeForActiveCall(getSpringBeanDefinitions, "Getting Spring bean definitions") { params ->
94-
try {
95-
val springAnalyzerProcess = SpringAnalyzerProcess.createBlocking(params.classpath.toList())
96-
val result = springAnalyzerProcess.terminateOnException { _ ->
97-
springAnalyzerProcess.getBeanDefinitions(
98-
kryoHelper.readObject(params.springSettings)
99-
)
100-
}
101-
springAnalyzerProcess.terminate()
102-
val beanDefinitions = result.beanDefinitions
103-
.map { data ->
104-
val additionalData = data.additionalData?.let { BeanAdditionalData(it.factoryMethodName, it.parameterTypes, it.configClassFqn) }
105-
BeanDefinitionData(data.beanName, data.beanTypeFqn, additionalData)
106-
}
107-
.toTypedArray()
108-
SpringAnalyzerResult(beanDefinitions)
109-
} catch (e: Exception) {
110-
logger.error(e) { "Spring Analyzer crashed, resorting to using empty bean list" }
111-
SpringAnalyzerResult(emptyArray())
112-
}
113-
}
11489
watchdog.measureTimeForActiveCall(createTestGenerator, "Creating Test Generator") { params ->
11590
AnalyticsConfigureUtil.configureML()
11691
Instrumenter.adapter = RdInstrumenter(realProtocol.rdInstrumenterAdapter)

0 commit comments

Comments
 (0)