Implement 'Update Service by importing Tosca Template'-story

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / tosca / model / ToscaNodeTemplate.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTemplate.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTemplate.java
index d757cec..eb34732 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTemplate.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTemplate.java
@@ -17,28 +17,30 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.tosca.model;
 
-import org.apache.commons.collections.MapUtils;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.collections.CollectionUtils;
-
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 
 @Getter
 @Setter
+@NoArgsConstructor
 public class ToscaNodeTemplate {
 
     private String type;
+    private List<Object> occurrences;
+    private Map<String, String> instance_count;
     private List<String> directives;
-    private ToscaMetadata metadata;
+    private Map<String, Object> metadata;
     private String description;
     private Map<String, Object> properties;
+    private Map<String, Object> attributes;
     private List<Map<String, ToscaTemplateRequirement>> requirements;
     private Map<String, ToscaTemplateCapability> capabilities;
     private Map<String, ToscaTemplateArtifact> artifacts;
@@ -46,19 +48,13 @@ public class ToscaNodeTemplate {
     private Map<String, Object> interfaces;
 
     public void setDirectives(List<String> directives) {
-        if (CollectionUtils.isEmpty(directives)) {
-            this.directives = null;
-            return;
-        }
-        this.directives = directives;
+        this.directives = CollectionUtils.isEmpty(directives) ? null : directives;
     }
 
     public void addInterface(String interfaceName, Object interfaceDataDefinition) {
         if (MapUtils.isEmpty(this.interfaces)) {
             this.interfaces = new HashMap<>();
         }
-
         this.interfaces.put(interfaceName, interfaceDataDefinition);
     }
 }
-