X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-tosca%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Ftosca%2Fauthorative%2Fconcepts%2FToscaServiceTemplate.java;h=1914280ffe32098fab9cedddafc2646707bf7f73;hb=80311ac0dedb0868d3837029c6e4b5fcb984efb2;hp=17391964e5568901f14cae47d2051240efc904db;hpb=b0e460abe43d40528da4856f2f3d5ee162ac1830;p=policy%2Fmodels.git

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 17391964e..1914280ff 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 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.
@@ -24,10 +24,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,29 +38,67 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class ToscaServiceTemplate extends ToscaEntity {
-
-    @ApiModelProperty(name = "tosca_definitions_version")
     @SerializedName("tosca_definitions_version")
     private String toscaDefinitionsVersion;
 
-    @ApiModelProperty(name = "topology_template")
-    @SerializedName("topology_template")
-    private ToscaTopologyTemplate toscaTopologyTemplate;
+    @SerializedName("data_types")
+    private Map<String, ToscaDataType> dataTypes;
+
+    @SerializedName("capability_types")
+    private Map<String, ToscaCapabilityType> capabilityTypes;
+
+    @SerializedName("node_types")
+    private Map<String, ToscaNodeType> nodeTypes;
+
+    @SerializedName("relationship_types")
+    private Map<String, ToscaRelationshipType> relationshipTypes;
 
-    @ApiModelProperty(name = "policy_types")
     @SerializedName("policy_types")
     private Map<String, ToscaPolicyType> policyTypes;
 
-    @ApiModelProperty(name = "data_types")
-    @SerializedName("data_types")
-    private Map<String, ToscaDataType> dataTypes;
+    @SerializedName("topology_template")
+    private ToscaTopologyTemplate toscaTopologyTemplate;
+
+    public Map<ToscaEntityKey, ToscaDataType> getDataTypesAsMap() {
+        return ToscaEntity.getEntityMapAsMap(dataTypes);
+    }
 
     public Map<ToscaEntityKey, ToscaPolicyType> getPolicyTypesAsMap() {
         return ToscaEntity.getEntityMapAsMap(policyTypes);
     }
 
-    public Map<ToscaEntityKey, ToscaDataType> getDataTypesAsMap() {
-        return ToscaEntity.getEntityMapAsMap(dataTypes);
+    /**
+     * 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);
     }
-}
\ No newline at end of file
+}