1 files changed, 39 insertions, 52 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java
index cb09411337..40b1f31eda 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinition.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,101 +20,88 @@
 
 package org.openecomp.sdc.be.datatypes.elements;
 
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-
+import com.fasterxml.jackson.annotation.JsonCreator;
 import java.io.Serializable;
-import java.util.Map;
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
 public class OperationDataDefinition extends ToscaDataDefinition implements Serializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1951516966187326915L;
-
-	private String uniqueId;
-
-	/**
-	 * Timestamp of the resource (artifact) creation
-	 */
-	private Long creationDate;
-
-	/**
-	 * Timestamp of the last resource (artifact) creation
-	 */
-	private Long lastUpdateDate;
-
-	/** Description of the operation. */
-	private String description;
-	/** Implementation artifact for the interface. */
-	private ArtifactDataDefinition implementation;
-
-	/**
-	 * This OPTIONAL property contains a list of one or more input parameter
-	 * definitions.
-	 */
-	// @JsonDeserialize(contentUsing = OperationParameterDeserializer.class)
-	private Map<String, PropertyDataDefinition> inputs;
+
+	@JsonCreator
 	public OperationDataDefinition() {
 		super();
 	}
 
 	public OperationDataDefinition(String description) {
 		super();
-		this.description = description;
+		setDescription(description);
 	}
 
 	public OperationDataDefinition(OperationDataDefinition p) {
-		this.uniqueId = p.uniqueId;
-		this.description = p.description;
-		this.implementation = p.implementation;
-		this.inputs = p.inputs;
+		setDescription(p.getDescription());
+		setImplementation(p.getImplementation());
+		setInputs(p.getInputs());
+		setName(p.getName());
+		setUniqueId(p.getUniqueId());
 	}
 
+
 	public String getUniqueId() {
-		return uniqueId;
+		return (String) getToscaPresentationValue(JsonPresentationFields.UNIQUE_ID);
 	}
 
 	public void setUniqueId(String uniqueId) {
-		this.uniqueId = uniqueId;
+		setToscaPresentationValue(JsonPresentationFields.UNIQUE_ID, uniqueId);
 	}
 
+
 	public Long getCreationDate() {
-		return creationDate;
+		return (Long) getToscaPresentationValue(JsonPresentationFields.CREATION_DATE);
 	}
 
 	public void setCreationDate(Long creationDate) {
-		this.creationDate = creationDate;
+		setToscaPresentationValue(JsonPresentationFields.CREATION_DATE, creationDate);
 	}
 
 	public Long getLastUpdateDate() {
-		return lastUpdateDate;
+		return (Long) getToscaPresentationValue(JsonPresentationFields.LAST_UPDATE_DATE);
 	}
 
 	public void setLastUpdateDate(Long lastUpdateDate) {
-		this.lastUpdateDate = lastUpdateDate;
+		setToscaPresentationValue(JsonPresentationFields.LAST_UPDATE_DATE, lastUpdateDate);
 	}
 
 	public String getDescription() {
-		return description;
+		return (String) getToscaPresentationValue(JsonPresentationFields.DESCRIPTION);
 	}
 
 	public void setDescription(String description) {
-		this.description = description;
+		setToscaPresentationValue(JsonPresentationFields.DESCRIPTION, description);
 	}
+
 	public ArtifactDataDefinition getImplementation() {
-		return implementation;
+		return (ArtifactDataDefinition) getToscaPresentationValue(JsonPresentationFields.OPERATION_IMPLEMENTATION);
 	}
 
 	public void setImplementation(ArtifactDataDefinition implementation) {
-		this.implementation = implementation;
+		setToscaPresentationValue(JsonPresentationFields.OPERATION_IMPLEMENTATION, implementation);
+	}
+
+	public ListDataDefinition<OperationInputDefinition> getInputs() {
+		return (ListDataDefinition<OperationInputDefinition>)
+			getToscaPresentationValue(JsonPresentationFields.OPERATION_INPUT);
+	}
+
+	public void setInputs(ListDataDefinition<OperationInputDefinition> inputs) {
+		setToscaPresentationValue(JsonPresentationFields.OPERATION_INPUT,inputs);
 	}
 
-	public Map<String, PropertyDataDefinition> getInputs() {
-		return inputs;
+	public String getName() {
+		return (String) getToscaPresentationValue(JsonPresentationFields.NAME);
 	}
 
-	public void setInputs(Map<String, PropertyDataDefinition> inputs) {
-		this.inputs = inputs;
+	public void setName(String name) {
+		setToscaPresentationValue(JsonPresentationFields.NAME, name);
 	}
 }