From 9b3f84e4006f69bb93cb1400e17951dc9e7eadb1 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 28 Jan 2021 10:42:12 +0000 Subject: Add copy constructors to concepts Copy constructors for ToscaServiceTemplate and ToscaTopologyTemplate. Issue-ID: POLICY-2971 Change-Id: Idb4abf8bce40593e0bf18614b8c647688dd5748d Signed-off-by: liamfallon --- .../authorative/concepts/ToscaServiceTemplate.java | 39 +++++++++++++++++++++- .../concepts/ToscaTopologyTemplate.java | 22 +++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) (limited to 'models-tosca/src/main/java') 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 e83d173de..36434bd91 100644 --- 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 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 a243b1688..eca1bea16 100644 --- 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 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 + } } -- cgit 1.2.3-korg