use let and fix formatting

opensrp · Mar 3, 2023 · 91500bb · 91500bb
1 parent fd41093
commit 91500bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt b/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
@@ -92,25 +92,23 @@ constructor(
           bundleName = LocalizationHelper.STRINGS_BASE_BUNDLE_NAME,
           locale = Locale.getDefault(),
           template = getConfigValueWithParam<T>(paramsMap, configKey, configsJsonMap)
-
-          // java.util.NoSuchElementException: Key application is missing in the map.
-          )
+        )
         .decodeJson(jsonInstance = json)
   }
 
   /**
-   * receives @paramsMap , @configKey and @ConfigJsonMap as inputs and
-   * interpolates the value if found and if paramsMap are not empty return the result
-   * return the value if key is found and paramsMap is empty
+   * receives @paramsMap , @configKey and @ConfigJsonMap as inputs and interpolates the value if
+   * found and if paramsMap are not empty return the result return the value if key is found and
+   * paramsMap is empty
    */
   inline fun <reified T : Configuration> getConfigValueWithParam(
     paramsMap: Map<String, String>?,
     configKey: String,
     configsJsonMap: Map<String, String>
   ) =
-    if (paramsMap?.isNullOrEmpty() == false)
-      configsJsonMap.getValue(configKey).interpolate(paramsMap)
-    else configsJsonMap.getValue(configKey)
+    configsJsonMap.getValue(configKey).let { jsonValue ->
+      if (paramsMap?.isNullOrEmpty() == false) jsonValue.interpolate(paramsMap) else jsonValue
+    }
 
   inline fun <reified T : Configuration> retrieveConfigurations(configType: ConfigType): List<T> =
     configsJsonMap.values

diff --git a/...test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt b/...test/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepositoryTest.kt
@@ -241,6 +241,7 @@ class RegisterRepositoryTest : RobolectricTest() {
       Assert.assertEquals(20, recordsCount)
     }
   }
+
   @Test
   fun loadRegisterDataWithParamsReturnsFilteredResources() = runTest {
     val group =