Apply comment suggestions

Author: sofurihafe

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt

@@ -177,11 +177,9 @@ object UtTestsDialogProcessor {
         val springConfigClass =
             when (val config = model.springSettings?.configuration) {
                 is JavaConfiguration -> {
-                    // Converting binary name to fqn name
-                    val fqnName = config.classBinaryName.replace("$", ".")
                     PsiClassHelper
-                        .findClass(fqnName, project)
-                        ?: error("Cannot find configuration class $fqnName.")
+                        .findClass(config.classBinaryName, project)
+                        ?: error("Cannot find configuration class ${config.classBinaryName}.")
                 }
 
                 else -> null
@@ -479,14 +477,12 @@ object UtTestsDialogProcessor {
             val beanType = runReadAction {
                 val additionalData = bean.additionalData ?: return@runReadAction null
 
-                // Converting binary name to fqn name
-                val fqnName = additionalData.configClassName.replace("$", ".")
                 val configPsiClass =
                     PsiClassHelper
-                        .findClass(fqnName, project)
+                        .findClass(additionalData.configClassName, project)
                         ?: return@runReadAction null
                             .also {
-                                logger.warn("Cannot find configuration class ${additionalData.configClassName} with $fqnName name.")
+                                logger.warn("Cannot find configuration class ${additionalData.configClassName}.")
                             }
 
                 val beanPsiMethod =

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/SpringConfigurationsHelper.kt

@@ -42,7 +42,7 @@ class SpringConfigurationsHelper(val configType: SpringConfigurationType) {
             .values
             .singleOrNull { it.shortenedName == shortenedName }
             ?.fullName
-            ?: error("Full name of configuration file cannot be restored with shortened name $shortenedName")
+            ?: error("Full name of configuration file cannot be restored from shortened name $shortenedName")
 
     fun shortenSpringConfigNames(fullNames: Set<String>): Map<String, String> {
         fullNames.forEach { nameToInfo[it] = NameInfo(it) }
@@ -92,12 +92,13 @@ class SpringConfigurationsHelper(val configType: SpringConfigurationType) {
 
 }
 
+@Deprecated("To be deleted")
 enum class SpringConfigurationType(
     val separatorsToSplitBy: Array<String>,
     val separatorToConcatenateBy: String,
 ) {
     ClassConfiguration(
-        separatorsToSplitBy = arrayOf(".", "$"),
+        separatorsToSplitBy = arrayOf("."),
         separatorToConcatenateBy = ".",
     ),
 

utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt

@@ -109,8 +109,16 @@ val PsiClass.isVisible: Boolean
     get() = generateSequence(this) { it.containingClass }.none { it.isPrivateOrProtected }
 
 object PsiClassHelper {
-    fun findClass(name: String, project: Project): PsiClass? =
-        JavaPsiFacade
+    /**
+     * Finds [PsiClass].
+     *
+     * @param name binary name which is converted to canonical name.
+     */
+    fun findClass(name: String, project: Project): PsiClass? {
+        // Converting name to canonical name
+        val canonicalName = name.replace("$", ".")
+        return JavaPsiFacade
             .getInstance(project)
-            .findClass(name, GlobalSearchScope.projectScope(project))
+            .findClass(canonicalName, GlobalSearchScope.projectScope(project))
+    }
 }