Properly use ApplicationInstantiatorFacade from SpringApplicationAnalyzer (#2267)

Properly use ApplicationInstantiatorFacade from SpringApplicationAnalyzer

Author: IlyaMuravjov

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/SpringUtExecutionInstrumentation.kt

@@ -70,7 +70,6 @@ class SpringUtExecutionInstrumentation(
 
         // TODO: recreate context/app every time whenever we change method under test
         springContext = springFacadeInstance.instantiate(instantiationSettings)
-            ?: error("Failed to initialize Spring context")
     }
 
     override fun invoke(

utbot-spring-analyzer/src/main/kotlin/org/utbot/spring/analyzer/SpringApplicationAnalyzer.kt

@@ -1,6 +1,5 @@
 package org.utbot.spring.analyzer
 
-import org.utbot.framework.plugin.api.util.utContext
 import org.utbot.spring.api.instantiator.InstantiationSettings
 import org.utbot.spring.api.ApplicationData
 import org.utbot.spring.api.instantiator.ApplicationInstantiatorFacade
@@ -23,9 +22,11 @@ class SpringApplicationAnalyzer {
             .newInstance()
         springFacadeInstance as ApplicationInstantiatorFacade
 
-        return UtBotSpringShutdownException
-            .catch { springFacadeInstance.instantiate(instantiationSettings) }
-            .beanDefinitions
-            .toTypedArray()
+        return springFacadeInstance.instantiate(instantiationSettings) { instantiator ->
+            UtBotSpringShutdownException
+                .catch { instantiator.instantiate() }
+                .beanDefinitions
+                .toTypedArray()
+        }
     }
 }

utbot-spring-commons-api/src/main/kotlin/org/utbot/spring/api/instantiator/ApplicationInstantiatorFacade.kt

@@ -4,5 +4,10 @@ import org.utbot.spring.api.context.ContextWrapper
 
 
 interface ApplicationInstantiatorFacade {
-    fun instantiate(instantiationSettings: InstantiationSettings): ContextWrapper?
+    fun instantiate(instantiationSettings: InstantiationSettings): ContextWrapper
+
+    fun <T> instantiate(
+        instantiationSettings: InstantiationSettings,
+        instantiatorRunner: (ConfiguredApplicationInstantiator) -> T
+    ): T
 }

utbot-spring-commons-api/src/main/kotlin/org/utbot/spring/api/instantiator/ConfiguredApplicationInstantiator.kt

@@ -0,0 +1,7 @@
+package org.utbot.spring.api.instantiator
+
+import org.utbot.spring.api.context.ContextWrapper
+
+fun interface ConfiguredApplicationInstantiator {
+    fun instantiate(): ContextWrapper
+}

utbot-spring-commons/src/main/kotlin/org/utbot/spring/instantiator/SpringApplicationInstantiatorFacade.kt

@@ -8,14 +8,22 @@ import com.jetbrains.rd.util.getLogger
 import com.jetbrains.rd.util.info
 import org.springframework.boot.SpringBootVersion
 import org.springframework.core.SpringVersion
+import org.utbot.spring.api.context.ContextWrapper
 import org.utbot.spring.api.instantiator.ApplicationInstantiatorFacade
+import org.utbot.spring.api.instantiator.ConfiguredApplicationInstantiator
 import org.utbot.spring.context.SpringContextWrapper
 
 private val logger = getLogger<SpringApplicationInstantiatorFacade>()
 
 class SpringApplicationInstantiatorFacade : ApplicationInstantiatorFacade {
 
-    override fun instantiate(instantiationSettings: InstantiationSettings): SpringContextWrapper? {
+    override fun instantiate(instantiationSettings: InstantiationSettings): ContextWrapper =
+        instantiate(instantiationSettings) { it.instantiate() }
+
+    override fun <T> instantiate(
+        instantiationSettings: InstantiationSettings,
+        instantiatorRunner: (ConfiguredApplicationInstantiator) -> T
+    ): T {
         logger.info { "Current Java version is: " + System.getProperty("java.version") }
         logger.info { "Current Spring version is: " + runCatching { SpringVersion.getVersion() }.getOrNull() }
         logger.info { "Current Spring Boot version is: " + runCatching { SpringBootVersion.getVersion() }.getOrNull() }
@@ -26,14 +34,16 @@ class SpringApplicationInstantiatorFacade : ApplicationInstantiatorFacade {
             if (instantiator.canInstantiate()) {
                 logger.info { "Instantiating with $instantiator" }
                 try {
-                    val context = instantiator.instantiate(instantiationSettings.configurationClasses, environment)
-                    return SpringContextWrapper(context)
+                    return instantiatorRunner(ConfiguredApplicationInstantiator {
+                        val context = instantiator.instantiate(instantiationSettings.configurationClasses, environment)
+                        SpringContextWrapper(context)
+                    })
                 } catch (e: Throwable) {
                     logger.error("Instantiating with $instantiator failed", e)
                 }
             }
         }
 
-        return null
+        error("Failed to initialize Spring context")
     }
 }