chore(package-managers): Simplify code to get javaHome a bit

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Sep 27, 2024 · f9a91f9 · f9a91f9
1 parent 407d287
commit f9a91f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt b/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt
@@ -180,16 +180,13 @@ class GradleInspector(
                         addProgressListener(ProgressListener { logger.debug(it.displayName) })
                     }
 
-                    val javaHome = options[OPTION_JAVA_VERSION]?.let {
-                        if (!JavaBootstrapper.isRunningOnJdk(it)) {
+                    val javaHome = options[OPTION_JAVA_VERSION]
+                        ?.takeUnless { JavaBootstrapper.isRunningOnJdk(it) }
+                        ?.let {
                             JavaBootstrapper.installJdk("TEMURIN", it)
-                                .onFailure { e ->
-                                    issues += createAndLogIssue(managerName, e.collectMessages())
-                                }.getOrNull()
-                        } else {
-                            null
-                        }
-                    } ?: options[OPTION_JAVA_HOME]?.let { File(it) }
+                                .onFailure { e -> issues += createAndLogIssue(managerName, e.collectMessages()) }
+                                .getOrNull()
+                        } ?: options[OPTION_JAVA_HOME]?.let { File(it) }
 
                     javaHome?.also {
                         logger.info { "Setting Java home for project analysis to '$it'." }

diff --git a/plugins/package-managers/sbt/src/main/kotlin/Sbt.kt b/plugins/package-managers/sbt/src/main/kotlin/Sbt.kt
@@ -125,16 +125,13 @@ class Sbt(
 
         // TODO: Consider auto-detecting the Java version based on the SBT version. See:
         //       https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html#build-tool-compatibility-table
-        val javaHome = options[OPTION_JAVA_VERSION]?.let {
-            if (!JavaBootstrapper.isRunningOnJdk(it)) {
+        val javaHome = options[OPTION_JAVA_VERSION]
+            ?.takeUnless { JavaBootstrapper.isRunningOnJdk(it) }
+            ?.let {
                 JavaBootstrapper.installJdk("TEMURIN", it)
-                    .onFailure { e ->
-                        logger.error { "Failed to bootstrap JDK version $it: ${e.collectMessages()}" }
-                    }.getOrNull()
-            } else {
-                null
-            }
-        } ?: options[OPTION_JAVA_HOME]?.let { File(it) }
+                    .onFailure { e -> logger.error { "Failed to bootstrap JDK version $it: ${e.collectMessages()}" } }
+                    .getOrNull()
+            } ?: options[OPTION_JAVA_HOME]?.let { File(it) }
 
         javaHome?.also {
             logger.info { "Setting Java home for project analysis to '$it'." }