openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/ItemMergeHandler.java

   1 package org.openecomp.conflicts;
   2
   3 import org.openecomp.conflicts.types.Conflict;
   4 import org.openecomp.conflicts.types.ConflictResolution;
   5 import org.openecomp.conflicts.types.ItemVersionConflict;
   6 import org.openecomp.sdc.versioning.dao.types.Version;
   7
   8 import java.util.Optional;
   9
  10 public interface ItemMergeHandler {
  11
  12   boolean isConflicted(String itemId, Version version);
  13
  14   void finalizeMerge(String itemId, Version version);
  15
  16   void postListConflicts(String itemId, Version version, ItemVersionConflict conflicts);
  17
  18   Optional<Conflict> getConflict(String itemId, Version version, String conflictId);
  19
  20   void postGetConflict(String itemId, Version version, Conflict conflict);
  21
  22   void preResolveConflict(String itemId, Version version, String conflictId,
  23                           ConflictResolution resolution);
  24
  25   boolean resolveConflict(String itemId, Version version, String conflictId,
  26                           ConflictResolution resolution);
  27 }