Removed null checks from ResourceRequestBuilder

Removed unnecessary null checks from ResourceRequestBuilder
according to comments from https://gerrit.onap.org/r/#/c/87001/

Change-Id: I21140d812982713229c322d772e6a10f7c7c044d
Issue-ID: SO-1498
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
index 0df25be..8aab4ec 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
@@ -151,13 +151,13 @@ public class ResourceRequestBuilder {
             Map<String, String> resourceInputData = getResourceInputStr(serviceVnfCust, resourceCustomizationUuid);
 
             // find match in network resource
-            if (resourceInputData != null && resourceInputData.isEmpty()) {
+            if (resourceInputData.isEmpty()) {
                 List<Map<String, Object>> serviceNetworkCust =
                         (List<Map<String, Object>>) serviceResources.get("serviceNetworks");
                 resourceInputData = getResourceInputStr(serviceNetworkCust, resourceCustomizationUuid);
 
                 // find match in AR resource
-                if (resourceInputData == null) {
+                if (resourceInputData.isEmpty()) {
                     List<Map<String, Object>> serviceArCust =
                             (List<Map<String, Object>>) serviceResources.get("serviceAllottedResources");
                     resourceInputData = getResourceInputStr(serviceArCust, resourceCustomizationUuid);
@@ -166,7 +166,7 @@ public class ResourceRequestBuilder {
 
             String resourceInputStr = null;
             ResourceLevel resourceLevel = null;
-            if (resourceInputData != null) {
+            if (!resourceInputData.isEmpty()) {
                 resourceInputStr = resourceInputData.get("resourceInput");
                 resourceLevel = ResourceLevel.valueOf(resourceInputData.get("nodeType"));
             }
@@ -200,7 +200,7 @@ public class ResourceRequestBuilder {
                 return resourceInputMap;
             }
         }
-        return null;
+        return new HashMap<>();
     }
 
     // this method combines resource input with service input