Merge "CPS-635 - Module Resource call does not include body"

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
index d536464..4560f8a 100755 (executable)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
@@ -248,7 +248,7 @@ public class NetworkCmProxyDataServiceImpl implements NetworkCmProxyDataService
 
     private static Map<String, String> getCmHandlePropertiesAsMap(final Collection<DataNode> cmHandlePropertiesList) {
         if (cmHandlePropertiesList == null || cmHandlePropertiesList.isEmpty()) {
-            return null;
+            return Collections.emptyMap();
         }
         final Map<String, String> cmHandlePropertiesMap = new LinkedHashMap<>();
         for (final var node: cmHandlePropertiesList) {