Add copy constructors to concepts

Copy constructors for ToscaServiceTemplate and ToscaTopologyTemplate.

Issue-ID: POLICY-2971
Change-Id: Idb4abf8bce40593e0bf18614b8c647688dd5748d
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java
index e83d173..36434bd 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java
@@ -3,7 +3,7 @@
  * ONAP Policy Model
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,12 @@ package org.onap.policy.models.tosca.authorative.concepts;
 
 import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 /**
  * Class to represent TOSCA service template matching input/output from/to client.
@@ -36,6 +39,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class ToscaServiceTemplate extends ToscaEntity {
     @ApiModelProperty(name = "tosca_definitions_version")
     @SerializedName("tosca_definitions_version")
@@ -72,4 +76,37 @@ public class ToscaServiceTemplate extends ToscaEntity {
     public Map<ToscaEntityKey, ToscaPolicyType> getPolicyTypesAsMap() {
         return ToscaEntity.getEntityMapAsMap(policyTypes);
     }
+
+    /**
+     * Copy constructor.
+     *
+     * @param copyObject the obejct to copy from.
+     */
+    public ToscaServiceTemplate(@NonNull ToscaServiceTemplate copyObject) {
+        super(copyObject);
+
+        this.toscaDefinitionsVersion = copyObject.toscaDefinitionsVersion;
+
+        // @formatter:off
+        this.dataTypes         = (copyObject.dataTypes         != null
+                ? new LinkedHashMap<>(copyObject.dataTypes)
+                : null);
+        this.capabilityTypes   = (copyObject.capabilityTypes   != null
+                ? new LinkedHashMap<>(copyObject.capabilityTypes)
+                : null);
+        this.nodeTypes         = (copyObject.nodeTypes         != null
+                ? new LinkedHashMap<>(copyObject.nodeTypes)
+                : null);
+        this.relationshipTypes = (copyObject.relationshipTypes != null
+                ? new LinkedHashMap<>(copyObject.relationshipTypes)
+                : null);
+        this.policyTypes       = (copyObject.policyTypes       != null
+                ? new LinkedHashMap<>(copyObject.policyTypes)
+                : null);
+        // @formatter:on
+
+        this.toscaTopologyTemplate =
+                (copyObject.toscaTopologyTemplate != null ? new ToscaTopologyTemplate(copyObject.toscaTopologyTemplate)
+                        : null);
+    }
 }

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java
index a243b16..eca1bea 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java
@@ -3,7 +3,7 @@
  * ONAP Policy Model
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,13 @@ package org.onap.policy.models.tosca.authorative.concepts;
 
 import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 /**
  * Class to represent TOSCA topology template matching input/output from/to client.
@@ -35,6 +39,7 @@ import lombok.Data;
  * @author Chenfei Gao (cgao@research.att.com)
  */
 @Data
+@NoArgsConstructor
 public class ToscaTopologyTemplate {
     private String description;
 
@@ -49,4 +54,19 @@ public class ToscaTopologyTemplate {
     public Map<ToscaEntityKey, ToscaPolicy> getPoliciesAsMap() {
         return ToscaEntity.getEntityListMapAsMap(policies);
     }
+
+    /**
+     * Copy constructor.
+     *
+     * @param copyObject the obejct to copy from.
+     */
+    public ToscaTopologyTemplate(@NonNull ToscaTopologyTemplate copyObject) {
+        this.description = copyObject.description;
+
+        // @formatter:off
+        this.inputs        = (copyObject.inputs        != null ? new LinkedHashMap<>(copyObject.inputs)        : null);
+        this.nodeTemplates = (copyObject.nodeTemplates != null ? new LinkedHashMap<>(copyObject.nodeTemplates) : null);
+        this.policies      = (copyObject.policies      != null ? new ArrayList<>(copyObject.policies)          : null);
+        // @formatter:on
+    }
 }

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplateTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplateTest.java
new file mode 100644 (file)
index 0000000..46ec090
--- /dev/null
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplateTest.java
@@ -0,0 +1,55 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Models
+ * ================================================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.tosca.authorative.concepts;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.HashMap;
+import org.junit.Test;
+
+public class ToscaServiceTemplateTest {
+
+    @Test
+    public void testToscServiceTemplate() {
+        assertThatThrownBy(() -> {
+            new ToscaServiceTemplate(null);
+        }).hasMessageMatching("copyObject is marked .*on.*ull but is null");
+
+        assertNotNull(new ToscaServiceTemplate(new ToscaServiceTemplate()));
+
+        ToscaServiceTemplate origSt = new ToscaServiceTemplate();
+
+        assertEquals(origSt, new ToscaServiceTemplate(origSt));
+
+        origSt.setCapabilityTypes(new HashMap<>());
+        origSt.setDataTypes(new HashMap<>());
+        origSt.setNodeTypes(new HashMap<>());
+        origSt.setPolicyTypes(new HashMap<>());
+        origSt.setRelationshipTypes(new HashMap<>());
+        origSt.setToscaTopologyTemplate(new ToscaTopologyTemplate());
+        assertEquals(origSt, new ToscaServiceTemplate(origSt));
+
+        assertEquals(origSt.getDataTypesAsMap(), new ToscaServiceTemplate(origSt).getDataTypesAsMap());
+        assertEquals(origSt.getPolicyTypesAsMap(), new ToscaServiceTemplate(origSt).getPolicyTypesAsMap());
+    }
+}

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplateTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplateTest.java
new file mode 100644 (file)
index 0000000..55ec39d
--- /dev/null
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplateTest.java
@@ -0,0 +1,53 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Models
+ * ================================================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.tosca.authorative.concepts;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import org.junit.Test;
+
+public class ToscaTopologyTemplateTest {
+
+    @Test
+    public void testToscTopologyTemplate() {
+        assertThatThrownBy(() -> {
+            new ToscaTopologyTemplate(null);
+        }).hasMessageMatching("copyObject is marked .*on.*ull but is null");
+
+        assertNotNull(new ToscaTopologyTemplate(new ToscaTopologyTemplate()));
+
+        ToscaTopologyTemplate origTt = new ToscaTopologyTemplate();
+
+        assertEquals(origTt, new ToscaTopologyTemplate(origTt));
+
+        origTt.setDescription("A Description");
+        origTt.setInputs(new HashMap<>());
+        origTt.setNodeTemplates(new HashMap<>());
+        origTt.setPolicies(new ArrayList<>());
+        assertEquals(origTt, new ToscaTopologyTemplate(origTt));
+
+        assertEquals(origTt.getPoliciesAsMap(), new ToscaTopologyTemplate(origTt).getPoliciesAsMap());
+    }
+}