simplify the dmn flow

Author: flinden68

product/src/main/kotlin/nl/nlportal/product/service/DmnService.kt

@@ -95,16 +95,16 @@ class DmnService(
             )
 
         sources?.forEach {
-            if (beslisTabelConfiguration.variabelen.containsKey(it.key)) {
-                variablesMapping.putAll(
-                    mapBeslisTabelVariablesWithSource(
-                        beslisTabelConfiguration.variabelen[it.key]!!,
-                        it.value,
-                    ),
-                )
-            } else {
-                logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
-            }
+            beslisTabelConfiguration.variabelen[it.key]?.let { variable ->
+                {
+                    variablesMapping.putAll(
+                        mapBeslisTabelVariablesWithSource(
+                            variable,
+                            it.value,
+                        ),
+                    )
+                }
+            } ?: logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
         }
 
         // handle the configured static variables
@@ -157,24 +157,18 @@ class DmnService(
 
         // loop through the sources and get the Object as Json and map with the variables
         sources?.forEach {
-            val source = productService.getSourceAsJson(it.key, it.value)
-
-            if (source == null) {
-                logger.warn("Could not find objects for key {} with uuid {}", it.key, it.value)
-            } else {
-                if (beslisTabelVariables.containsKey(it.key)) {
-                    if (beslisTabelVariables[it.key] != null) {
+            productService.getSourceAsJson(it.key, it.value)?.let { source ->
+                beslisTabelVariables[it.key]?.let { variable ->
+                    {
                         variablesMapping.putAll(
                             mapBeslisTabelVariablesWithSource(
-                                beslisTabelVariables[it.key]!!,
+                                variable,
                                 source,
                             ),
                         )
                     }
-                } else {
-                    logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
-                }
-            }
+                } ?: logger.warn(BESLISTABLE_NOT_FOUND_BY_KEY, it.key)
+            } ?: logger.warn("Could not find objects for key {} with uuid {}", it.key, it.value)
         }
 
         // check if the beslisTabelVariables contains a producttype configuration,