Introduce Hazelcast for alternateId-cmHandle relation pt. 2 - error collection

[cps.git] / cps-ncmp-service / src / main / java / org / onap / cps / ncmp / api / impl / NetworkCmProxyDataServiceImpl.java

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 05b83b9..ad1c5cd 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
@@ -24,6 +24,7 @@
 
 package org.onap.cps.ncmp.api.impl;
 
+import static org.onap.cps.ncmp.api.NcmpResponseStatus.ALTERNATE_ID_ALREADY_ASSOCIATED;
 import static org.onap.cps.ncmp.api.NcmpResponseStatus.CM_HANDLES_NOT_FOUND;
 import static org.onap.cps.ncmp.api.NcmpResponseStatus.CM_HANDLES_NOT_READY;
 import static org.onap.cps.ncmp.api.NcmpResponseStatus.CM_HANDLE_ALREADY_EXIST;
@@ -500,16 +501,35 @@ public class NetworkCmProxyDataServiceImpl implements NetworkCmProxyDataService
     private List<CmHandleRegistrationResponse> registerNewCmHandles(final List<YangModelCmHandle> yangModelCmHandles,
                                                                     final Map<String, TrustLevel>
                                                                             initialTrustLevelPerCmHandleId) {
-        final Set<String> cmHandleIds = initialTrustLevelPerCmHandleId.keySet();
+        final List<CmHandleRegistrationResponse> failureResponses = new ArrayList<>();
+        final List<YangModelCmHandle> acceptedYangModelCmHandles = new ArrayList<>(yangModelCmHandles.size());
+        final Set<String> acceptedCmHandleIds = new HashSet<>(yangModelCmHandles.size());
+        for (final YangModelCmHandle yangModelCmHandle : yangModelCmHandles) {
+            if (cmHandleIdMapper.isDuplicateId(yangModelCmHandle.getId(), yangModelCmHandle.getAlternateId())) {
+                initialTrustLevelPerCmHandleId.remove(yangModelCmHandle.getId());
+                failureResponses.add(CmHandleRegistrationResponse.createFailureResponse(
+                        yangModelCmHandle.getId(), ALTERNATE_ID_ALREADY_ASSOCIATED));
+            } else {
+                acceptedCmHandleIds.add(yangModelCmHandle.getId());
+                acceptedYangModelCmHandles.add(yangModelCmHandle);
+            }
+        }
         try {
-            lcmEventsCmHandleStateHandler.initiateStateAdvised(yangModelCmHandles);
+            lcmEventsCmHandleStateHandler.initiateStateAdvised(acceptedYangModelCmHandles);
             trustLevelManager.handleInitialRegistrationOfTrustLevels(initialTrustLevelPerCmHandleId);
-            return CmHandleRegistrationResponse.createSuccessResponses(cmHandleIds);
+            final List<CmHandleRegistrationResponse> cmHandleRegistrationResponses = CmHandleRegistrationResponse
+                    .createSuccessResponses(acceptedCmHandleIds);
+            cmHandleRegistrationResponses.addAll(failureResponses);
+            return cmHandleRegistrationResponses;
         } catch (final AlreadyDefinedException alreadyDefinedException) {
-            return CmHandleRegistrationResponse.createFailureResponses(
+            final List<CmHandleRegistrationResponse> alreadyDefinedResponses = CmHandleRegistrationResponse
+                    .createFailureResponses(
                     alreadyDefinedException.getAlreadyDefinedObjectNames(), CM_HANDLE_ALREADY_EXIST);
+            failureResponses.addAll(alreadyDefinedResponses);
+            return failureResponses;
         } catch (final Exception exception) {
-            return CmHandleRegistrationResponse.createFailureResponses(cmHandleIds, exception);
+            return CmHandleRegistrationResponse
+                    .createFailureResponses(initialTrustLevelPerCmHandleId.keySet(), exception);
         }
     }
 
@@ -556,5 +576,4 @@ public class NetworkCmProxyDataServiceImpl implements NetworkCmProxyDataService
             }
         }
     }
-
 }