Remove un-necessary null check 11/3511/1
authorMurali-P <murali.p@huawei.com>
Tue, 18 Apr 2017 06:46:07 +0000 (12:16 +0530)
committerMurali-P <murali.p@huawei.com>
Tue, 18 Apr 2017 06:46:07 +0000 (12:16 +0530)
1) getNodeTemplates function do not return null value
2) sonar blocker issue

Change-Id: Ifaa683819b0fed0d7910b33f9c979320afa58814
Signed-off-by: Murali-P <murali.p@huawei.com>
sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java

index 156b912..9ee3132 100644 (file)
@@ -372,14 +372,18 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
        public List<NodeTemplate> getAllottedResources() {
                List<NodeTemplate> nodeTemplates = null;
                nodeTemplates = toscaTemplate.getTopologyTemplate().getNodeTemplates();
-               if(nodeTemplates==null || nodeTemplates.size()==0 ){
+               if (nodeTemplates.isEmpty()) {
                        log.error("getAllottedResources nodeTemplates not exist");
                }
-               nodeTemplates = nodeTemplates.stream().filter(x -> x.getMetadata() != null && x.getMetadata().getValue("category").equals("Allotted Resources")).collect(Collectors.toList());
-               if(nodeTemplates==null || nodeTemplates.size()==0 ){
+               nodeTemplates = nodeTemplates.stream().filter(
+                               x -> x.getMetadata() != null && x.getMetadata().getValue("category").equals("Allotted Resources"))
+                               .collect(Collectors.toList());
+               if (nodeTemplates.isEmpty()) {
                        log.trace("getAllottedResources -  allotted resources not exist");
-               }else
+               } else {
                        log.trace("getAllottedResources - the allotted resources list is {}", nodeTemplates);
+               }
+
                return nodeTemplates;
        }
        @Override