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