diff options
author | liamfallon <liam.fallon@est.tech> | 2021-01-13 10:04:43 +0000 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2021-01-14 20:48:19 +0000 |
commit | 1f0a46a681a28af0725b68299dbd3f9ec7f60b69 (patch) | |
tree | 4cdc5230ba51a8804603de5af25ecfc7ab058afd | |
parent | e6bea18abd1a1b4ddf7203508832e6a3f9380598 (diff) |
Add copy constructor to ToscaNodeTemplate
In order to support serialization and deserialization of
ToscaNodeTemplate objects onto DMaaP, we need a copy constructor on the
ToscaNodeTemplate object.
Issue-ID: POLICY-2971
Change-Id: If6dc6c54d5673cef46734a88d0a91ae868c11dcb
Signed-off-by: liamfallon <liam.fallon@est.tech>
2 files changed, 69 insertions, 1 deletions
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNodeTemplate.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNodeTemplate.java index 343eb8e2c..d470447e6 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNodeTemplate.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNodeTemplate.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP Policy Model * ================================================================================ - * Copyright (C) 2020 Nordix Foundation. + * 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. @@ -22,11 +22,14 @@ package org.onap.policy.models.tosca.authorative.concepts; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.NonNull; @Data @EqualsAndHashCode(callSuper = true) @@ -36,4 +39,19 @@ public class ToscaNodeTemplate extends ToscaEntity { private Map<String, Object> properties; private List<Map<String, ToscaRequirement>> requirements; private Map<String, ToscaCapabilityAssignment> capabilities; + + /** + * Copy constructor. + * + * @param copyObject the obejct to copy from. + */ + public ToscaNodeTemplate(@NonNull ToscaNodeTemplate copyObject) { + super(copyObject); + + this.type = copyObject.type; + + this.properties = (copyObject.properties != null ? new LinkedHashMap<>(copyObject.properties) : null); + this.requirements = (copyObject.requirements != null ? new ArrayList<>(copyObject.requirements) : null); + this.capabilities = (copyObject.capabilities != null ? new LinkedHashMap<>(copyObject.capabilities) : null); + } } diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNodeTemplateTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNodeTemplateTest.java new file mode 100644 index 000000000..5cfc864ae --- /dev/null +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNodeTemplateTest.java @@ -0,0 +1,50 @@ +/* + * ============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 ToscaNodeTemplateTest { + + @Test + public void testToscaNodeTemplate() { + assertThatThrownBy(() -> { + new ToscaNodeTemplate(null); + }).hasMessageMatching("copyObject is marked .*on.*ull but is null"); + + assertNotNull(new ToscaNodeTemplate(new ToscaNodeTemplate())); + + ToscaNodeTemplate origNt = new ToscaNodeTemplate(); + + assertEquals(origNt, new ToscaNodeTemplate(origNt)); + + origNt.setProperties(new HashMap<>()); + origNt.setCapabilities(new HashMap<>()); + origNt.setRequirements(new ArrayList<>()); + assertEquals(origNt, new ToscaNodeTemplate(origNt)); + } +} |