1 files changed, 35 insertions, 33 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RelationshipInstDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RelationshipInstDataDefinition.java
index 539914c496..8dd00c4370 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RelationshipInstDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RelationshipInstDataDefinition.java
@@ -17,14 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.openecomp.sdc.be.datatypes.elements;
 
-import java.util.List;
-import lombok.NoArgsConstructor;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
-@NoArgsConstructor
+import java.util.List;
+
 public class RelationshipInstDataDefinition extends ToscaDataDefinition {
 
     public RelationshipInstDataDefinition(RelationshipInstDataDefinition cdt) {
@@ -47,68 +47,71 @@ public class RelationshipInstDataDefinition extends ToscaDataDefinition {
         this.setCapability(cdt.getCapability());
     }
 
-    public String getRequirement() {
-        return (String) getToscaPresentationValue(JsonPresentationFields.REQUIREMENT);
-    }
-
     public void setRequirement(String requirement) {
         setToscaPresentationValue(JsonPresentationFields.REQUIREMENT, requirement);
     }
 
-    public String getCapability() {
-        return (String) getToscaPresentationValue(JsonPresentationFields.CAPABILITY);
+    public String getRequirement() {
+        return (String) getToscaPresentationValue(JsonPresentationFields.REQUIREMENT);
     }
 
     public void setCapability(String capability) {
         setToscaPresentationValue(JsonPresentationFields.CAPABILITY, capability);
     }
 
-    public String getToId() {
-        return (String) getToscaPresentationValue(JsonPresentationFields.TO_ID);
+    public String getCapability() {
+        return (String) getToscaPresentationValue(JsonPresentationFields.CAPABILITY);
     }
 
     public void setToId(Object toId) {
         setToscaPresentationValue(JsonPresentationFields.TO_ID, toId);
     }
 
-    public String getFromId() {
-        return (String) getToscaPresentationValue(JsonPresentationFields.FROM_ID);
-    }
-
     public void setFromId(Object fromId) {
         setToscaPresentationValue(JsonPresentationFields.FROM_ID, fromId);
     }
 
-    public String getRequirementId() {
-        return (String) getToscaPresentationValue(JsonPresentationFields.REQUIREMENT_ID);
+    public String getToId() {
+        return (String) getToscaPresentationValue(JsonPresentationFields.TO_ID);
+    }
+
+    public String getFromId() {
+        return (String) getToscaPresentationValue(JsonPresentationFields.FROM_ID);
     }
 
     public void setRequirementId(Object requirementId) {
         setToscaPresentationValue(JsonPresentationFields.REQUIREMENT_ID, requirementId);
     }
 
+    public void setCapabilityId(Object capabilityId) {
+        setToscaPresentationValue(JsonPresentationFields.CAPABILITY_ID, capabilityId);
+    }
+
+    public String getRequirementId() {
+        return (String) getToscaPresentationValue(JsonPresentationFields.REQUIREMENT_ID);
+    }
+
     public String getCapabilityId() {
         return (String) getToscaPresentationValue(JsonPresentationFields.CAPABILITY_ID);
     }
 
-    public void setCapabilityId(Object capabilityId) {
-        setToscaPresentationValue(JsonPresentationFields.CAPABILITY_ID, capabilityId);
+    public void setRequirementOwnerId(Object requirementOwnerId) {
+        setToscaPresentationValue(JsonPresentationFields.REQUIREMENT_OWNER_ID, requirementOwnerId);
     }
 
     public String getRequirementOwnerId() {
         return (String) getToscaPresentationValue(JsonPresentationFields.REQUIREMENT_OWNER_ID);
     }
 
-    public void setRequirementOwnerId(Object requirementOwnerId) {
-        setToscaPresentationValue(JsonPresentationFields.REQUIREMENT_OWNER_ID, requirementOwnerId);
+    public void setCapabilityOwnerId(Object capabilityOwnerId) {
+        setToscaPresentationValue(JsonPresentationFields.CAPABILTY_OWNER_ID, capabilityOwnerId);
     }
 
     public String getCapabilityOwnerId() {
         return (String) getToscaPresentationValue(JsonPresentationFields.CAPABILTY_OWNER_ID);
     }
 
-    public void setCapabilityOwnerId(Object capabilityOwnerId) {
-        setToscaPresentationValue(JsonPresentationFields.CAPABILTY_OWNER_ID, capabilityOwnerId);
+    public RelationshipInstDataDefinition() {
     }
 
     public String getUniqueId() {
@@ -130,12 +133,10 @@ public class RelationshipInstDataDefinition extends ToscaDataDefinition {
     /**
      * Identifies the type of the capability.
      */
-    @Override
     public String getType() {
         return (String) getToscaPresentationValue(JsonPresentationFields.TYPE);
     }
 
-    @Override
     public void setType(String type) {
         setToscaPresentationValue(JsonPresentationFields.TYPE, type);
     }
@@ -156,7 +157,6 @@ public class RelationshipInstDataDefinition extends ToscaDataDefinition {
         setToscaPresentationValue(JsonPresentationFields.VALID_TARGET_TYPES, validTargetTypes);
     }
 
-    @Override
     public String getVersion() {
         return (String) getToscaPresentationValue(JsonPresentationFields.VERSION);
     }
@@ -175,6 +175,7 @@ public class RelationshipInstDataDefinition extends ToscaDataDefinition {
 
     public Long getCreationTime() {
         return (Long) getToscaPresentationValue(JsonPresentationFields.CREATION_TIME);
+
     }
 
     public void setCreationTime(Long creationTime) {
@@ -189,15 +190,15 @@ public class RelationshipInstDataDefinition extends ToscaDataDefinition {
         setToscaPresentationValue(JsonPresentationFields.MODIFICATION_TIME, modificationTime);
     }
 
+    public void setInterfaces(final ListDataDefinition<InterfaceDataDefinition> operations) {
+        setToscaPresentationValue(JsonPresentationFields.INTERFACES, operations);
+    }
+
     @SuppressWarnings("unchecked")
     public ListDataDefinition<InterfaceDataDefinition> getInterfaces() {
         return (ListDataDefinition<InterfaceDataDefinition>) getToscaPresentationValue(JsonPresentationFields.INTERFACES);
     }
 
-    public void setInterfaces(final ListDataDefinition<InterfaceDataDefinition> operations) {
-        setToscaPresentationValue(JsonPresentationFields.INTERFACES, operations);
-    }
-
     @Override
     public String toString() {
         String uniqueId = getUniqueId();
@@ -208,8 +209,9 @@ public class RelationshipInstDataDefinition extends ToscaDataDefinition {
         Boolean originUI = isOriginUI();
         Long creationTime = getCreationTime();
         Long modificationTime = getModificationTime();
-        return "RelationshipTypeDataDefinition [uniqueId=" + uniqueId + ", description=" + description + ", type=" + type + ", validSourceTypes="
-            + validSourceTypes + ", version=" + version + ", originUI=" + originUI + ", creationTime=" + creationTime + ", modificationTime="
-            + modificationTime + "]";
+
+        return "RelationshipTypeDataDefinition [uniqueId=" + uniqueId + ", description=" + description + ", type=" + type + ", validSourceTypes=" + validSourceTypes
+                + ", version=" + version + ", originUI=" + originUI + ", creationTime=" + creationTime + ", modificationTime=" + modificationTime + "]";
     }
+
 }