1 files changed, 29 insertions, 0 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ItemVersionConflictDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ItemVersionConflictDto.java
new file mode 100644
index 0000000000..3dbfcf03cf
--- /dev/null
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ItemVersionConflictDto.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdcrests.conflict.types;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class ItemVersionConflictDto{
+  private ConflictDto conflict;
+  private Collection<ConflictInfoDto> conflictInfoList = new ArrayList<>();
+
+  public ConflictDto getConflict() {
+    return conflict;
+  }
+
+  public void setConflict(ConflictDto conflict) {
+    this.conflict = conflict;
+  }
+
+  public Collection<ConflictInfoDto> getConflictInfoList() {
+    return conflictInfoList;
+  }
+
+  public void setConflictInfoList(Collection<ConflictInfoDto> conflictInfoList) {
+    this.conflictInfoList = conflictInfoList;
+  }
+
+  public void addConflictInfo(ConflictInfoDto conflictInfo){
+    conflictInfoList.add(conflictInfo);
+  }
+}