commit 5be1289bdded95df10c900d2d6f7596904287c91
author Chris André <chris.andre@yoppworks.com> Tue May 05 12:39:20 2020 -0400
committer Ofir Sonsino <ofir.sonsino@intl.att.com> Wed May 06 14:39:14 2020 +0000
tree 7b9f3bcc81959906ed198fae6053a83edb825877
parent 3b343466b5b4c7ca383d0ee281d158639f4eab2f

Make `collectNewCapabilities` return an empty Map

- Made `collectNewCapabilities` return an empty HashMap instead of a null value

Issue-ID: SDC-2924
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I58c35135be5a2614c3daeafbd766d53f401f917b

catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java
index a6538dc..ebaaf81 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java
@@ -232,10 +232,12 @@
      * @param oldCapabilities
      * @return
      */
-    private Map<String, CapabilityDefinition> collectNewCapabilities(Map<String, CapabilityDefinition> updatedGroupTypeCapabilities, Map<String, CapabilityDefinition> oldCapabilities) {
-        return updatedGroupTypeCapabilities != null? updatedGroupTypeCapabilities.entrySet().stream()
-                .filter(entry -> !oldCapabilities.containsKey(entry.getKey()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue) ): null;
+    private Map<String, CapabilityDefinition> collectNewCapabilities(
+        Map<String, CapabilityDefinition> updatedGroupTypeCapabilities,
+        Map<String, CapabilityDefinition> oldCapabilities) {
+        return updatedGroupTypeCapabilities != null ? updatedGroupTypeCapabilities.entrySet().stream()
+            .filter(entry -> !oldCapabilities.containsKey(entry.getKey()))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)) : new HashMap<>();
     }
 
     private JanusGraphOperationStatus createCapabilities(GroupTypeData groupTypeData, Map<String, CapabilityDefinition> groupCapabilities) {