diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/ItemMergeHandler.java')
| -rw-r--r-- | openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/ItemMergeHandler.java | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/ItemMergeHandler.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/ItemMergeHandler.java index c0947d0b69..16ad7b274a 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/ItemMergeHandler.java +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/ItemMergeHandler.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,31 +17,27 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.conflicts; +import java.util.Optional; 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); + boolean isConflicted(String itemId, Version version); - void finalizeMerge(String itemId, Version version); + void finalizeMerge(String itemId, Version version); - void postListConflicts(String itemId, Version version, ItemVersionConflict conflicts); + void postListConflicts(String itemId, Version version, ItemVersionConflict conflicts); - Optional<Conflict> getConflict(String itemId, Version version, String conflictId); + Optional<Conflict> getConflict(String itemId, Version version, String conflictId); - void postGetConflict(String itemId, Version version, Conflict conflict); + void postGetConflict(String itemId, Version version, Conflict conflict); - void preResolveConflict(String itemId, Version version, String conflictId, - ConflictResolution resolution); + void preResolveConflict(String itemId, Version version, String conflictId, ConflictResolution resolution); - boolean resolveConflict(String itemId, Version version, String conflictId, - ConflictResolution resolution); + boolean resolveConflict(String itemId, Version version, String conflictId, ConflictResolution resolution); } |