replace if / else with let in evaluateEnvVariablesInGitRepoURI

znsio · May 12, 2024 · d415b0e · d415b0e
1 parent 0af1429
commit d415b0e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/core/src/main/kotlin/in/specmatic/core/git/GitOperations.kt b/core/src/main/kotlin/in/specmatic/core/git/GitOperations.kt
@@ -119,13 +119,11 @@ fun evaluateEnvVariablesInGitRepoURI(gitRepositoryURI: String, environmentVariab
     val envVariableMatches = envVariableRegex.findAll(gitRepositoryURI)
     envVariableMatches.forEach { matchResult ->
         val envVariable = matchResult.groupValues[1]
-        if (environmentVariables.containsKey(envVariable)) {
-            val envVariableValue = environmentVariables.getValue(envVariable)
+        environmentVariables[envVariable]?.let { envVariableValue ->
             logger.log("Evaluating $envVariable in $gitRepositoryURI")
             evaluatedGitRepoUrl = evaluatedGitRepoUrl.replace("\${$envVariable}", envVariableValue)
-        } else {
-            logger.log("$envVariable in $gitRepositoryURI resembles an environment variable, but it is not available in the environment variables. Skipping evaluation.")
         }
+            ?: logger.log("$envVariable in $gitRepositoryURI resembles an environment variable, but skipping evaluation since value for the same is not set.")
     }
     return evaluatedGitRepoUrl
 }