From 9d62ebad0bc597d6f514e6c511a5e5331cf4ffdd Mon Sep 17 00:00:00 2001
From: Dmitry Kichinsky <dmitry.kichinsky@jetbrains.com>
Date: Tue, 21 Jan 2025 09:59:23 +0100
Subject: [PATCH] [maven] IDEA-255308 simplify getCompilerLevel

GitOrigin-RevId: 84ec9226255dec4b3ca74fc64a8ae784e8564342
---
 .../jetbrains/idea/maven/importing/MavenImportUtil.kt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt
index 5bd592f7fa67..cae8dd30cd5e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt
@@ -395,24 +395,23 @@ object MavenImportUtil {
 
   private val MavenProject.testSourceLevel: String?
     get() {
-      return getCompilerLevel(true, "source")
+      return getCompilerLevel(true, "testSource")
     }
 
   private val MavenProject.testTargetLevel: String?
     get() {
-      return getCompilerLevel(true, "target")
+      return getCompilerLevel(true, "testTarget")
     }
 
   private val MavenProject.testReleaseLevel: String?
     get() {
-      return getCompilerLevel(true, "release")
+      return getCompilerLevel(true, "testRelease")
     }
 
   private fun MavenProject.getCompilerLevel(forTests: Boolean, level: String): String? {
     val configs = if (forTests) testCompilerConfigs else compilerConfigs
-    val finalLevel = if (forTests) "test${level.replaceFirstChar { it.titlecase() }}" else level
-    val fallbackProperty = "maven.compiler.$finalLevel"
-    val levels = configs.mapNotNull { LanguageLevel.parse(findChildValueByPath(it, finalLevel)) }
+    val fallbackProperty = "maven.compiler.$level"
+    val levels = configs.mapNotNull { LanguageLevel.parse(findChildValueByPath(it, level)) }
     val maxLevel = levels.maxWithOrNull(Comparator.naturalOrder())?.toJavaVersion()?.toFeatureString()
     return maxLevel ?: properties.getProperty(fallbackProperty)
   }