Merge "Add memory usage to integration tests [UPDATED]"

[cps.git] / cps-ncmp-service / src / main / java / org / onap / cps / ncmp / api / models / NcmpServiceCmHandle.java

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/NcmpServiceCmHandle.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/NcmpServiceCmHandle.java
index 6811b59..0b50346 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/NcmpServiceCmHandle.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/models/NcmpServiceCmHandle.java
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2021-2022 Nordix Foundation
+ *  Copyright (C) 2021-2023 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,10 +23,12 @@ package org.onap.cps.ncmp.api.models;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.onap.cps.ncmp.api.impl.inventory.CompositeState;
 import org.springframework.validation.annotation.Validated;
 
 /**
@@ -47,4 +49,23 @@ public class NcmpServiceCmHandle {
     @JsonSetter(nulls = Nulls.AS_EMPTY)
     private Map<String, String> publicProperties = Collections.emptyMap();
 
+    @JsonSetter(nulls = Nulls.AS_EMPTY)
+    private CompositeState compositeState;
+
+    @JsonSetter(nulls = Nulls.AS_EMPTY)
+    private String moduleSetTag;
+
+    /**
+     * NcmpServiceCmHandle copy constructor.
+     *
+     * @param ncmpServiceCmHandle Ncmp Service CmHandle
+     */
+    public NcmpServiceCmHandle(final NcmpServiceCmHandle ncmpServiceCmHandle) {
+        this.cmHandleId = ncmpServiceCmHandle.getCmHandleId();
+        this.dmiProperties = new LinkedHashMap<>(ncmpServiceCmHandle.getDmiProperties());
+        this.publicProperties = new LinkedHashMap<>(ncmpServiceCmHandle.getPublicProperties());
+        this.compositeState = ncmpServiceCmHandle.getCompositeState() != null ? new CompositeState(
+                ncmpServiceCmHandle.getCompositeState()) : null;
+        this.moduleSetTag = ncmpServiceCmHandle.getModuleSetTag();
+    }
 }