1 files changed, 52 insertions, 0 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
new file mode 100644
index 0000000000..63a7a1b3a0
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
@@ -0,0 +1,52 @@
+package org.openecomp.sdc.be.components.merge.property;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+/**
+ * A POJO which represents an instance property data definition (a {@link org.openecomp.sdc.be.model.ComponentInstanceProperty} or {@link org.openecomp.sdc.be.model.ComponentInstanceInput})
+ * that its value needs to be merged during an upgrade of a VSP.
+ *
+ */
+public class MergePropertyData {
+
+    /*The previous state of the instance property to merge */
+    private PropertyDataDefinition oldProp;
+    /*The new state of the instance property to merge */
+    private PropertyDataDefinition newProp;
+
+    private List<String> getInputNamesToMerge = new ArrayList<>();
+
+    public PropertyDataDefinition getOldProp() {
+        return oldProp;
+    }
+
+    public MergePropertyData setOldProp(PropertyDataDefinition oldProp) {
+        this.oldProp = oldProp;
+        return this;
+    }
+
+    public MergePropertyData setNewProp(PropertyDataDefinition newProp) {
+        this.newProp = newProp;
+        return this;
+    }
+
+    public PropertyDataDefinition getNewProp() {
+        return newProp;
+    }
+
+    public void addAddGetInputNamesToMerge(List<String> getInputsNameToMerge) {
+        getInputNamesToMerge.addAll(getInputsNameToMerge);
+    }
+
+    public List<String> getGetInputNamesToMerge() {
+        return getInputNamesToMerge;
+    }
+
+    public boolean isGetInputProp() {
+        return oldProp.isGetInputProperty();
+    }
+    
+}