chore: Use ifEmpty and ifBlank to simplify code

Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@bosch.com>
oss-review-toolkit · Sep 7, 2024 · 714996c · 714996c
1 parent 146f9a0
commit 714996c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/plugins/commands/analyzer/src/main/kotlin/AnalyzerCommand.kt b/plugins/commands/analyzer/src/main/kotlin/AnalyzerCommand.kt
@@ -184,7 +184,7 @@ class AnalyzerCommand : OrtCommand(
                 echo("Found ${files.size} $manager definition file(s) at:")
 
                 files.forEach { file ->
-                    val relativePath = file.toRelativeString(inputDir).takeIf { it.isNotEmpty() } ?: "."
+                    val relativePath = file.toRelativeString(inputDir).ifEmpty { "." }
                     echo("\t$relativePath")
                 }
             }

diff --git a/plugins/package-managers/python/src/main/kotlin/utils/PythonInspectorExtensions.kt b/plugins/package-managers/python/src/main/kotlin/utils/PythonInspectorExtensions.kt
@@ -100,7 +100,7 @@ private fun PythonInspector.Result.resolveIdentifier(
         else -> PackageManager.getFallbackProjectName(analysisRoot, definitionFile)
     }
 
-    val projectVersion = setupVersion.takeIf { it.isNotEmpty() } ?: requirementsVersion
+    val projectVersion = setupVersion.ifEmpty { requirementsVersion }
 
     return Identifier(
         type = managerName,

diff --git a/plugins/reporters/opossum/src/main/kotlin/OpossumReporter.kt b/plugins/reporters/opossum/src/main/kotlin/OpossumReporter.kt
@@ -249,7 +249,7 @@ class OpossumReporter : Reporter {
             if (idFromPath in baseUrlsForSources) return
 
             if (VcsHost.GITHUB.isApplicable(vcs)) {
-                val revision = vcs.revision.takeIf { it.isNotBlank() } ?: "HEAD"
+                val revision = vcs.revision.ifBlank { "HEAD" }
                 val baseUrl = vcs.url
                     .replace("ssh://git@github.com/", "https://github.com/")
                     .replace(Regex("\\.git$"), "")