From: Bruno Sakoto <bruno.sakoto@bell.ca>
Date: Tue, 5 Apr 2022 12:30:00 +0000 (+0000)
Subject: Merge "Structured Exception details for DMI"
X-Git-Tag: 3.1.0~153
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6fb6f7742ec1d94ea3a265f476ddbddb0156c64f;p=cps.git

Merge "Structured Exception details for DMI"
---

6fb6f7742ec1d94ea3a265f476ddbddb0156c64f
diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
index 39641442a0,69e9c7ba1c..1a69e45d30
--- 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
@@@ -143,11 -148,9 +143,10 @@@ public class NetworkCmProxyDataServiceI
                                                                 final OperationEnum operation,
                                                                 final String requestData,
                                                                 final String dataType) {
 +        CpsValidator.validateNameCharacters(cmHandleId);
          return handleResponse(
-             dmiDataOperations.writeResourceDataPassThroughRunningFromDmi(
-                 cmHandleId, resourceIdentifier, operation, requestData, dataType),
-             "Not able to " + operation + " resource data.");
+                 dmiDataOperations.writeResourceDataPassThroughRunningFromDmi(cmHandleId, resourceIdentifier, operation,
+                         requestData, dataType), operation);
      }
  
  
@@@ -213,23 -214,17 +212,22 @@@
       * THis method registers a cm handle and initiates modules sync.
       *
       * @param dmiPluginRegistration dmi plugin registration information.
 -     * @throws JsonProcessingException thrown if json is malformed or missing.
 +     * @return cm-handle registration response for create cm-handle requests.
       */
 -    public void parseAndCreateCmHandlesInDmiRegistrationAndSyncModules(
 -        final DmiPluginRegistration dmiPluginRegistration) throws JsonProcessingException {
 -        final YangModelCmHandlesList createdYangModelCmHandlesList =
 -            getUpdatedYangModelCmHandlesList(dmiPluginRegistration,
 -                dmiPluginRegistration.getCreatedCmHandles());
 -        registerAndSyncNewCmHandles(createdYangModelCmHandlesList);
 +    public List<CmHandleRegistrationResponse> parseAndCreateCmHandlesInDmiRegistrationAndSyncModules(
 +        final DmiPluginRegistration dmiPluginRegistration) {
 +        return dmiPluginRegistration.getCreatedCmHandles().stream()
 +            .map(cmHandle ->
 +                YangModelCmHandle.toYangModelCmHandle(
 +                    dmiPluginRegistration.getDmiPlugin(),
 +                    dmiPluginRegistration.getDmiDataPlugin(),
 +                    dmiPluginRegistration.getDmiModelPlugin(), cmHandle)
 +            )
 +            .map(this::registerAndSyncNewCmHandle)
 +            .collect(Collectors.toList());
      }
  
-     private static Object handleResponse(final ResponseEntity<?> responseEntity,
-                                          final String exceptionMessage) {
+     private static Object handleResponse(final ResponseEntity<?> responseEntity, final OperationEnum operation) {
          if (responseEntity.getStatusCode().is2xxSuccessful()) {
              return responseEntity.getBody();
          } else {