openecomp-be/backend/openecomp-sdc-conflict-manager/src/main/java/org/openecomp/sdc/conflicts/ConflictsManager.java

   1 package org.openecomp.sdc.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 public interface ConflictsManager {
   9
  10   boolean isConflicted(String itemId, Version version);
  11
  12   ItemVersionConflict getConflict(String itemId, Version version);
  13
  14   void finalizeMerge(String itemId, Version version);
  15
  16   Conflict getConflict(String itemId, Version version, String conflictId);
  17
  18   void resolveConflict(String itemId, Version version, String conflictId,
  19                        ConflictResolution resolution);
  20 }