Kotlin coding

Author: vcarluer

scenario/src/main/kotlin/com/cosmotech/scenario/azure/ScenarioServiceImpl.kt

@@ -233,7 +233,7 @@ internal class ScenarioServiceImpl(
             ?.filter { parameterGroup ->
               runTemplate?.parameterGroups?.contains(parameterGroup.id) == true
             }
-            ?.flatMap { parameterGroup -> parameterGroup?.parameters ?: mutableListOf() }
+            ?.flatMap { parameterGroup -> parameterGroup.parameters ?: mutableListOf() }
     if (!runTemplateParametersIds.isNullOrEmpty()) {
       val parentParameters = parent.parametersValues?.associate { it.parameterId to it }
       val scenarioParameters = scenario.parametersValues?.associate { it.parameterId to it }

scenariorun/src/main/kotlin/com/cosmotech/scenariorun/ContainerFactory.kt

@@ -114,7 +114,7 @@ internal const val SCENARIO_DATA_DOWNLOAD_ARTIFACT_NAME = "downloadUrl"
 private const val EVENT_HUB_SCENARIO_RUN_NAME = "scenariorun"
 private const val EVENT_HUB_PROBES_MEASURES_NAME = "probesmeasures"
 
-public const val CSM_DAG_ROOT = "DAG_ROOT"
+const val CSM_DAG_ROOT = "DAG_ROOT"
 
 @Component
 @Suppress("LargeClass", "TooManyFunctions")
@@ -1008,9 +1008,7 @@ internal class ContainerFactory(
   }
 
   private fun getRunTemplate(solution: Solution, runTemplateId: String): RunTemplate {
-    return (solution.runTemplates ?: mutableListOf()).find { runTemplate ->
-      runTemplate.id == runTemplateId
-    }
+    return solution.runTemplates?.find { runTemplate -> runTemplate.id == runTemplateId }
         ?: throw IllegalStateException(
             "runTemplateId $runTemplateId not found in Solution ${solution.id}")
   }
@@ -1251,10 +1249,10 @@ internal class ContainerFactory(
       }
 
   private fun getImageName(registry: String, repository: String?, version: String? = null): String {
-    if (repository == null) throw IllegalStateException("Solution repository is not defined")
-    val repo = repository ?: "ERROR"
-    val repoVersion = if (version == null) repo else "${repo}:${version}"
-    return if (registry != "") "${registry}/${repoVersion}" else repoVersion
+    val repoVersion =
+        repository.let { if (version == null) it else "${it}:${version}" }
+            ?: throw IllegalStateException("Solution repository is not defined")
+    return if (registry.isNotEmpty()) "${registry}/${repoVersion}" else repoVersion
   }
 }
 

scenariorun/src/main/kotlin/com/cosmotech/scenariorun/dataset/DatasetUtils.kt

@@ -32,7 +32,7 @@ internal fun findDatasetsAndConnectors(
     addDatasetAndConnector(
         datasetService, connectorService, organizationId, datasetId, datasets, connectors)
   }
-  val parameterGroupIds = runTemplate.parameterGroups ?: listOf()
+  val parameterGroupIds = runTemplate.parameterGroups
   if (parameterGroupIds != null) {
     val parametersIds =
         (solution.parameterGroups?.filter { it.id in parameterGroupIds }?.map {

solution/src/main/kotlin/com/cosmotech/solution/azure/SolutionServiceImpl.kt

@@ -154,7 +154,7 @@ internal class SolutionServiceImpl(
       runTemplateId: String
   ) {
     val existingSolution = findSolutionById(organizationId, solutionId)
-    if (!(existingSolution.runTemplates?.removeIf { it.id == runTemplateId } ?: true)) {
+    if (existingSolution.runTemplates?.removeIf { it.id == runTemplateId } == false) {
       throw CsmResourceNotFoundException("Run Template '$runTemplateId' *not* found")
     }
     cosmosTemplate.upsert("${organizationId}_solutions", existingSolution)
@@ -200,8 +200,7 @@ internal class SolutionServiceImpl(
     val existingSolution = findSolutionById(organizationId, solutionId)
     val runTemplates =
         existingSolution.runTemplates?.filter { it.id == runTemplateId }?.toMutableList()
-            ?: mutableListOf()
-    if (runTemplates.isEmpty()) {
+    if (runTemplates == null || runTemplates.isEmpty()) {
       throw CsmResourceNotFoundException("Run Template '$runTemplateId' *not* found")
     }
     var hasChanged = false
@@ -263,20 +262,19 @@ internal class SolutionServiceImpl(
             "${solutionId.sanitizeForAzureStorage()}/$runTemplateId/${handlerId.value}.zip")
         .upload(body.inputStream, body.contentLength(), overwrite)
 
-    val runTemplate = solution.runTemplates?.findLast { it.id == runTemplateId }
-    if (runTemplate == null) {
-      throw CsmResourceNotFoundException("Run Template '$runTemplateId' *not* found")
-    }
+    val runTemplate =
+        solution.runTemplates?.findLast { it.id == runTemplateId }
+            ?: throw CsmResourceNotFoundException("Run Template '$runTemplateId' *not* found")
     when (handlerId) {
       RunTemplateHandlerId.parameters_handler ->
-          runTemplate!!.parametersHandlerSource = RunTemplateStepSource.cloud
+          runTemplate.parametersHandlerSource = RunTemplateStepSource.cloud
       RunTemplateHandlerId.validator ->
-          runTemplate!!.datasetValidatorSource = RunTemplateStepSource.cloud
-      RunTemplateHandlerId.prerun -> runTemplate!!.preRunSource = RunTemplateStepSource.cloud
-      RunTemplateHandlerId.engine -> runTemplate!!.runSource = RunTemplateStepSource.cloud
-      RunTemplateHandlerId.postrun -> runTemplate!!.postRunSource = RunTemplateStepSource.cloud
+          runTemplate.datasetValidatorSource = RunTemplateStepSource.cloud
+      RunTemplateHandlerId.prerun -> runTemplate.preRunSource = RunTemplateStepSource.cloud
+      RunTemplateHandlerId.engine -> runTemplate.runSource = RunTemplateStepSource.cloud
+      RunTemplateHandlerId.postrun -> runTemplate.postRunSource = RunTemplateStepSource.cloud
       RunTemplateHandlerId.scenariodata_transform ->
-          runTemplate!!.scenariodataTransformSource = RunTemplateStepSource.cloud
+          runTemplate.scenariodataTransformSource = RunTemplateStepSource.cloud
     }.run {
       // This trick forces Kotlin to raise an error at compile time if the "when" statement is not
       // exhaustive
@@ -313,8 +311,8 @@ internal class SolutionServiceImpl(
       runTemplateId: String,
   ): Solution {
     val solution = findSolutionById(organizationId, solutionId)
-    val validRunTemplateIds = solution.runTemplates?.map { it.id }?.toSet() ?: setOf()
-    if (validRunTemplateIds.isEmpty()) {
+    val validRunTemplateIds = solution.runTemplates?.map { it.id }?.toSet()
+    if (validRunTemplateIds == null || validRunTemplateIds.isEmpty()) {
       throw IllegalArgumentException(
           "Solution $solutionId does not declare any run templates. " +
               "It is therefore not possible to upload run template handlers. " +