TOSCA Consolidation Data - Refactoring Part 4

Some additional minor changes 2

Change-Id: Ie8ab6bdd9e396904a2ba2eea3c6b03f0a0ed466b
Issue-ID: SDC-1330
Signed-off-by: eleonorali <eleonoral@amdocs.com>

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
index 4054537..9c21c9c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
@@ -666,14 +666,8 @@ public class HeatToToscaUtil {
         HeatOrchestrationTemplate nestedHeatOrchestrationTemplate = new YamlUtil().yamlToObject(
                 context.getFileContent(nestedHeatFileName.get()), HeatOrchestrationTemplate.class);
         Map<String, Resource> resources = nestedHeatOrchestrationTemplate.getResources();
-        if (Objects.nonNull(resources)) {
-            for (Resource innerResource : resources.values()) {
-                if (ConsolidationDataUtil.isComputeResource(innerResource)) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return Objects.nonNull(resources) && resources.values().stream()
+                     .anyMatch(ConsolidationDataUtil::isComputeResource);
     }
 
     /**