From cb8f1f46a4f66a363bc9da48c4bff82f1fe3d52c Mon Sep 17 00:00:00 2001
From: "Dmitriy.Panov" <Dmitriy.Panov@jetbrains.com>
Date: Tue, 3 Sep 2019 14:48:50 +0300
Subject: [PATCH] IDEA-CR-52030 unnecessary String cast is removed; JBR path
 through system property is not used anymore

GitOrigin-RevId: a86b01a3afb4136e96c5ff0f9aa951e7edd531dd
---
 .../build/impl/CompilationContextImpl.groovy         | 12 ++++++------
 .../jetbrains/intellij/build/impl/JdkUtils.groovy    | 10 ++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
index ae1aa03f57f4..92bfa0172c4b 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
@@ -65,7 +65,7 @@ class CompilationContextImpl implements CompilationContext {
 
     def dependenciesProjectDir = new File(communityHome, 'build/dependencies')
     logFreeDiskSpace(messages, projectHome, "before downloading dependencies")
-    def gradleJdk = toCanonicalPath(JdkUtils.computeJdkHome(messages, '1.8', "jdk8Home", null, "JDK_18_x64"))
+    def gradleJdk = toCanonicalPath(JdkUtils.computeJdkHome(messages, '1.8', null, "JDK_18_x64"))
     GradleRunner gradle = new GradleRunner(dependenciesProjectDir, projectHome, messages, gradleJdk)
     if (!options.isInDevelopmentMode) {
       setupCompilationDependencies(gradle, options)
@@ -89,21 +89,21 @@ class CompilationContextImpl implements CompilationContext {
   private static String defineJavaSdk(JpsModel model, String projectHome, BuildOptions options, BuildMessages messages) {
     def sdks = []
     def jbrDir = jbrDir(projectHome, options)
-    def jdk6Home = JdkUtils.computeJdkHome(messages, '1.6', "jdkHome", "$jbrDir/1.6", "JDK_16_x64")
+    def jdk6Home = JdkUtils.computeJdkHome(messages, '1.6', "$jbrDir/1.6", "JDK_16_x64")
     JdkUtils.defineJdk(model.global, "IDEA jdk", jdk6Home, messages)
     sdks << "IDEA jdk"
     def jbrVersionName = jbrVersionName(options)
     sdks << jbrVersionName
     def jbrDefaultDir = "$jbrDir/$jbrVersionName"
     def jbrEnvVar = "JDK_${options.jbrVersion < 9 ? "1$options.jbrVersion" : options.jbrVersion}_x64"
-    def jbrHome = toCanonicalPath(JdkUtils.computeJdkHome(messages, jbrVersionName, "jdk${options.jbrVersion}Home", jbrDefaultDir, jbrEnvVar))
+    def jbrHome = toCanonicalPath(JdkUtils.computeJdkHome(messages, jbrVersionName, jbrDefaultDir, jbrEnvVar))
     JdkUtils.defineJdk(model.global, jbrVersionName, jbrHome, messages)
     model.project.modules
       .collect { it.getSdkReference(JpsJavaSdkType.INSTANCE)?.sdkName }
       .findAll { it != null && !sdks.contains(it) }
       .toSet().each { sdkName ->
-      def sdkHome = JdkUtils.computeJdkHome(messages, sdkName, sdkName, "$jbrDir/$sdkName", null)?.with {
-        toCanonicalPath(it as String)
+      def sdkHome = JdkUtils.computeJdkHome(messages, sdkName, "$jbrDir/$sdkName", null)?.with {
+        toCanonicalPath(it)
       }
       if (sdkHome != null) {
         JdkUtils.defineJdk(model.global, sdkName, sdkHome, messages)
@@ -112,7 +112,7 @@ class CompilationContextImpl implements CompilationContext {
           def urls = jbr11.getRoots(JpsOrderRootType.COMPILED).collect { it.url }
           JdkUtils.readModulesFromReleaseFile(new File(sdkHome)).each {
             if (!urls.contains(it)) {
-              jbr11.addRoot(it as String, JpsOrderRootType.COMPILED)
+              jbr11.addRoot(it, JpsOrderRootType.COMPILED)
             }
           }
         }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy
index 13938a2904ab..7e4a498ef44d 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy
@@ -28,14 +28,8 @@ class JdkUtils {
     messages.info("'$jdkName' Java SDK set to $jdkHomePath")
   }
 
-  static String computeJdkHome(BuildMessages messages, String name, String propertyName, String defaultDir, String envVarName) {
+  static String computeJdkHome(BuildMessages messages, String name, String defaultDir, String envVarName) {
     String jdkDir
-    if (propertyName != null) {
-      jdkDir = System.getProperty(propertyName)
-      if (jdkDir != null) {
-        return jdkDir
-      }
-    }
     if (defaultDir != null) {
       jdkDir = SystemInfo.isMac ? "$defaultDir/Contents/Home" : defaultDir
       if (new File(jdkDir).exists()) {
@@ -45,7 +39,7 @@ class JdkUtils {
         jdkDir = null
       }
     }
-    messages.info("$name: property=$propertyName, dir=$defaultDir, env=$envVarName")
+    messages.info("$name: dir=$defaultDir, env=$envVarName")
     if (envVarName != null) {
       jdkDir = System.getenv(envVarName)
     }