1 files changed, 54 insertions, 37 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java
index a39221fe39..954fc63936 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/InterfaceDefinitionTemplate.java
@@ -16,59 +16,76 @@
 
 package org.onap.sdc.tosca.datatypes.model;
 
-import org.apache.commons.collections4.MapUtils;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
+import org.apache.commons.collections4.MapUtils;
+import org.onap.sdc.tosca.services.DataModelCloneUtil;
 
 public class InterfaceDefinitionTemplate extends InterfaceDefinition {
 
-  private Map<String, Object> inputs;
-  private Map<String, OperationDefinitionTemplate> operations;
+    private Map<String, Object> inputs;
+    private Map<String, OperationDefinitionTemplate> operations;
 
-  public Map<String, Object> getInputs() {
-    return inputs;
-  }
+    public InterfaceDefinitionTemplate() {
+    }
+
+    public InterfaceDefinitionTemplate(Object toscaInterfaceDefTemplateObj) {
+        InterfaceDefinitionTemplate interfaceDefinitionTemplate =
+                (InterfaceDefinitionTemplate) convertObjToInterfaceDefinition(toscaInterfaceDefTemplateObj);
+        this.setInputs(DataModelCloneUtil.cloneStringObjectMap(interfaceDefinitionTemplate.getInputs()));
+        this.setOperations(
+                DataModelCloneUtil.cloneStringOperationDefinitionMap(interfaceDefinitionTemplate.getOperations()));
+
+    }
 
-  public void setInputs(
-      Map<String, Object> inputs) {
-    this.inputs = inputs;
-  }
+    public Map<String, Object> getInputs() {
+        return inputs;
+    }
 
-  public Map<String, OperationDefinitionTemplate> getOperations() {
-    return operations;
-  }
+    public void setInputs(Map<String, Object> inputs) {
+        this.inputs = inputs;
+    }
 
-  public void addOperation(String operationName, OperationDefinitionTemplate operation) {
-    if(MapUtils.isEmpty(this.operations)) {
-      this.operations = new HashMap<>();
+    public Map<String, OperationDefinitionTemplate> getOperations() {
+        return operations;
     }
 
-    this.operations.put(operationName, operation);
-  }
+    public void setOperations(Map<String, OperationDefinitionTemplate> operations) {
+        this.operations = operations;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    @Override
+    public int hashCode() {
+        return Objects.hash(inputs, operations);
     }
-    if (!(o instanceof InterfaceDefinitionTemplate)) {
-      return false;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof InterfaceDefinitionTemplate)) {
+            return false;
+        }
+        InterfaceDefinitionTemplate that = (InterfaceDefinitionTemplate) o;
+        return Objects.equals(inputs, that.inputs) && Objects.equals(operations, that.operations);
     }
-    InterfaceDefinitionTemplate that = (InterfaceDefinitionTemplate) o;
-    return Objects.equals(inputs, that.inputs) &&
-        Objects.equals(operations, that.operations);
-  }
 
-  @Override
-  public int hashCode() {
+    @Override
+    public void addOperation(String operationName, OperationDefinition operationDefinition) {
+        addOperation(operationName, (OperationDefinitionTemplate) operationDefinition);
+    }
 
-    return Objects.hash(inputs, operations);
-  }
+    private void addOperation(String operationName, OperationDefinitionTemplate operation) {
+        if (MapUtils.isEmpty(this.operations)) {
+            this.operations = new HashMap<>();
+        }
+        this.operations.put(operationName, operation);
+    }
 
-  @Override
-  public void addOperation(String operationName, OperationDefinition operationDefinition) {
-    addOperation(operationName, (OperationDefinitionTemplate)operationDefinition);
-  }
+    public Optional<Object> convertInterfaceDefTemplateToToscaObj() {
+        return convertInterfaceToToscaInterfaceObj(this);
+    }
 }