Updated loop to iterate over the "entrySet" instead of the "keySet". 77/128277/2
authorsharath reddy <bs.reddy@huawei.com>
Mon, 4 Apr 2022 13:20:11 +0000 (18:50 +0530)
committersharath reddy <bs.reddy@huawei.com>
Mon, 4 Apr 2022 13:26:12 +0000 (18:56 +0530)
Issue-ID: CLI-439

report: tested weather-report, execution-list

Signed-off-by: sharath reddy <bs.reddy@huawei.com>
Change-Id: I68295df76db1ed4015958fd1933fd5a6ac05dcd1
Signed-off-by: sharath reddy <bs.reddy@huawei.com>
framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java

index 7e0d40e..d8f2980 100644 (file)
@@ -77,9 +77,10 @@ public class OnapCommandSchemaMerger {
     public static void mergeYamlMap(Map<String, Object> mergedResult, Map<String, Object> yamlContents) {
         if (yamlContents == null) return;
 
-        for (String key : yamlContents.keySet()) {
+        for (Map.Entry<String,Object> entry : yamlContents.entrySet()) {
 
-            Object yamlValue = yamlContents.get(key);
+            String key = entry.getKey();
+            Object yamlValue = entry.getValue();
             if (yamlValue == null) {
                 mergedResult.put(key, yamlValue);
                 continue;