diff options
author | Levente Csanyi <levente.csanyi@est.tech> | 2024-02-08 16:12:06 +0000 |
---|---|---|
committer | Levente Csanyi <levente.csanyi@est.tech> | 2024-02-08 16:12:06 +0000 |
commit | e190adf9b0e8e0bb9e5012dd40b712c97e45c9de (patch) | |
tree | ee069a78c5419a7001b6dd98399372a4066181a5 /cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java | |
parent | 67681820f2a7fea88cbc6cbe5b3d483dae506d55 (diff) |
Revert "Introduce Hazelcast for alternateId-cmHandle relation pt. 2 - error collection"
This reverts commit 67681820f2a7fea88cbc6cbe5b3d483dae506d55.
Reason for revert: does not work
Change-Id: I92c063b59261d25774ee34664d834399c269f0c2
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
Diffstat (limited to 'cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java')
-rwxr-xr-x | cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java | 31 |
1 files changed, 6 insertions, 25 deletions
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 ad1c5cdfb..05b83b98e 100755 --- 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,7 +24,6 @@ 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; @@ -501,35 +500,16 @@ public class NetworkCmProxyDataServiceImpl implements NetworkCmProxyDataService private List<CmHandleRegistrationResponse> registerNewCmHandles(final List<YangModelCmHandle> yangModelCmHandles, final Map<String, TrustLevel> initialTrustLevelPerCmHandleId) { - 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); - } - } + final Set<String> cmHandleIds = initialTrustLevelPerCmHandleId.keySet(); try { - lcmEventsCmHandleStateHandler.initiateStateAdvised(acceptedYangModelCmHandles); + lcmEventsCmHandleStateHandler.initiateStateAdvised(yangModelCmHandles); trustLevelManager.handleInitialRegistrationOfTrustLevels(initialTrustLevelPerCmHandleId); - final List<CmHandleRegistrationResponse> cmHandleRegistrationResponses = CmHandleRegistrationResponse - .createSuccessResponses(acceptedCmHandleIds); - cmHandleRegistrationResponses.addAll(failureResponses); - return cmHandleRegistrationResponses; + return CmHandleRegistrationResponse.createSuccessResponses(cmHandleIds); } catch (final AlreadyDefinedException alreadyDefinedException) { - final List<CmHandleRegistrationResponse> alreadyDefinedResponses = CmHandleRegistrationResponse - .createFailureResponses( + return CmHandleRegistrationResponse.createFailureResponses( alreadyDefinedException.getAlreadyDefinedObjectNames(), CM_HANDLE_ALREADY_EXIST); - failureResponses.addAll(alreadyDefinedResponses); - return failureResponses; } catch (final Exception exception) { - return CmHandleRegistrationResponse - .createFailureResponses(initialTrustLevelPerCmHandleId.keySet(), exception); + return CmHandleRegistrationResponse.createFailureResponses(cmHandleIds, exception); } } @@ -576,4 +556,5 @@ public class NetworkCmProxyDataServiceImpl implements NetworkCmProxyDataService } } } + } |