X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ncmp-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fimpl%2Foperations%2FDmiRequestBody.java;fp=cps-ncmp-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fmodels%2FGenericRequestBody.java;h=13cfdcefe43aba1c28e5e73ce3c89809b23e6eb8;hb=20b4f9cf0b662de4a7665b2a82593ef0205f5e06;hp=3e1ba4a971c4e13c03e3a2c41e0660e200f87abc;hpb=bc742a1dbe39a3269abab9e62a9d489f460144b0;p=cps.git

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/GenericRequestBody.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java
similarity index 57%
rename from cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/GenericRequestBody.java
rename to cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java
index 3e1ba4a97..13cfdcefe 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/GenericRequestBody.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java
@@ -18,19 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.ncmp.api.models;
+package org.onap.cps.ncmp.api.impl.operations;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import lombok.Builder;
 import lombok.Getter;
+import org.onap.cps.ncmp.api.models.PersistenceCmHandle;
 
-@JsonInclude(Include.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Getter
 @Builder
-public class GenericRequestBody   {
+public class DmiRequestBody {
     public enum OperationEnum {
         READ("read"),
         CREATE("create"),
@@ -52,4 +55,25 @@ public class GenericRequestBody   {
     private String dataType;
     private String data;
     private Map<String, String> cmHandleProperties;
+
+    /**
+     * Set CmHandleProperties by converting a list of PersistenceCmHandle.AdditionalProperty objects.
+     *
+     * @param cmHandlePropertiesAsList the cm handle additional properties
+     */
+    public void asCmHandleProperties(
+        final List<PersistenceCmHandle.AdditionalProperty> cmHandlePropertiesAsList) {
+        final boolean isCmHandlePropertiesNullOrEmpty =
+            cmHandlePropertiesAsList == null || cmHandlePropertiesAsList.isEmpty();
+        if (isCmHandlePropertiesNullOrEmpty) {
+            cmHandleProperties = Collections.emptyMap();
+        } else {
+            cmHandleProperties = new LinkedHashMap<>();
+            for (final PersistenceCmHandle.AdditionalProperty additionalProperty : cmHandlePropertiesAsList) {
+                cmHandleProperties.put(additionalProperty.getName(),
+                    additionalProperty.getValue());
+            }
+        }
+    }
+
 }