Use logger in utbot-spring-commons

Author: IlyaMuravjov

utbot-spring-commons/build.gradle.kts

@@ -1,6 +1,5 @@
 val springBootVersion: String by rootProject
-val kotlinLoggingVersion: String by rootProject
-val commonsIOVersion: String by rootProject
+val rdVersion: String by rootProject
 
 plugins {
     id("java")
@@ -15,7 +14,7 @@ java {
 dependencies {
     // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot
     compileOnly("org.springframework.boot:spring-boot:$springBootVersion")
-    compileOnly("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
-    compileOnly("commons-io:commons-io:$commonsIOVersion")
+
+    implementation("com.jetbrains.rd:rd-core:$rdVersion")
 }
 

utbot-spring-commons/src/main/kotlin/org/utbot/spring/environment/EnvironmentFactory.kt

@@ -1,13 +1,13 @@
 package org.utbot.spring.environment
 
-//import com.jetbrains.rd.util.getLogger
-//import com.jetbrains.rd.util.info
+import com.jetbrains.rd.util.getLogger
+import com.jetbrains.rd.util.info
 import org.springframework.core.env.ConfigurableEnvironment
 import org.springframework.core.env.StandardEnvironment
 import org.utbot.spring.context.InstantiationContext
 
 
-//private val logger = getLogger<EnvironmentFactory>()
+private val logger = getLogger<EnvironmentFactory>()
 
 class EnvironmentFactory(
     private val instantiationContext: InstantiationContext
@@ -24,7 +24,7 @@ class EnvironmentFactory(
         try {
             environment.setActiveProfiles(*profilesToActivate)
         } catch (e: Exception) {
-            //logger.info { "Setting ${applicationData.profileExpression} as active profiles failed with exception $e" }
+            logger.info { "Setting ${instantiationContext.profileExpression} as active profiles failed with exception $e" }
         }
 
         return environment

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

@@ -4,30 +4,31 @@ import org.springframework.context.ConfigurableApplicationContext
 import org.utbot.spring.context.InstantiationContext
 import org.utbot.spring.environment.EnvironmentFactory
 
-//import com.jetbrains.rd.util.error
-//import com.jetbrains.rd.util.getLogger
-//import com.jetbrains.rd.util.info
+import com.jetbrains.rd.util.error
+import com.jetbrains.rd.util.getLogger
+import com.jetbrains.rd.util.info
+import org.springframework.boot.SpringBootVersion
+import org.springframework.core.SpringVersion
 
-// private val logger = getLogger<SpringApplicationInstantiatorFacade>()
+private val logger = getLogger<SpringApplicationInstantiatorFacade>()
 
 class SpringApplicationInstantiatorFacade(private val instantiationContext: InstantiationContext) {
 
     fun instantiate(): ConfigurableApplicationContext? {
-        //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() }
+        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() }
 
         val environmentFactory = EnvironmentFactory(instantiationContext)
 
         val suitableInstantiator =
             listOf(SpringBootApplicationInstantiator(), PureSpringApplicationInstantiator())
                 .firstOrNull { it.canInstantiate() }
-                ?: error("All Spring analyzers failed, using empty bean list")
-                //logger.error { "All Spring analyzers failed, using empty bean list" }
+                ?: null.also { logger.error { "All Spring analyzers failed, using empty bean list" } }
 
-        //logger.info { "Analyzing with $suitableAnalyzer" }
+        logger.info { "Instantiating Spring application with $suitableInstantiator" }
 
-        return suitableInstantiator.instantiate(
+        return suitableInstantiator?.instantiate(
             instantiationContext.configurationClasses,
             environmentFactory.createEnvironment(),
         )