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
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
/*-
* ============LICENSE_START=======================================================
* SDC
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.conflicts.impl;
import org.openecomp.conflicts.ItemMergeHandler;
import org.openecomp.conflicts.ItemMergeHandlerFactory;
import org.openecomp.conflicts.dao.ConflictsDao;
import org.openecomp.conflicts.types.Conflict;
import org.openecomp.conflicts.types.ConflictResolution;
import org.openecomp.conflicts.types.ItemVersionConflict;
import org.openecomp.conflicts.types.Resolution;
import org.openecomp.sdc.common.errors.CoreException;
import org.openecomp.sdc.common.errors.ErrorCategory;
import org.openecomp.sdc.common.errors.ErrorCode;
import org.openecomp.sdc.conflicts.ConflictsManager;
import org.openecomp.sdc.versioning.dao.types.Version;
import java.util.Optional;
public class ConflictsManagerImpl implements ConflictsManager {
private static final String ELEMENT_CONFLICT_NOT_EXIST_ERR_ID = "ELEMENT_CONFLICT_NOT_EXIST";
private static final String ELEMENT_CONFLICT_NOT_EXISTS_MSG =
"Item Id %s, version Id %s, element conflict with Id %s does not exists.";
private final ConflictsDao conflictsDao;
public ConflictsManagerImpl(ConflictsDao conflictsDao) {
this.conflictsDao = conflictsDao;
}
@Override
public boolean isConflicted(String itemId, Version version) {
Optional<ItemMergeHandler> itemMergeHandler =
ItemMergeHandlerFactory.getInstance().createInterface(itemId);
return conflictsDao.isConflicted(itemId, version) ||
(itemMergeHandler.isPresent() &&
itemMergeHandler.get().isConflicted(itemId, version));
}
@Override
public ItemVersionConflict getConflict(String itemId, Version version) {
ItemVersionConflict conflicts = conflictsDao.getConflict(itemId, version);
ItemMergeHandlerFactory.getInstance().createInterface(itemId)
.ifPresent(itemMergeHandler -> itemMergeHandler
.postListConflicts(itemId, version, conflicts));
return conflicts;
}
@Override
public void finalizeMerge(String itemId, Version version) {
ItemMergeHandlerFactory.getInstance().createInterface(itemId)
.ifPresent(mergeHandler -> mergeHandler.finalizeMerge(itemId, version));
}
@Override
public Conflict getConflict(String itemId, Version version, String conflictId) {
Optional<ItemMergeHandler> itemMergeHandler =
ItemMergeHandlerFactory.getInstance().createInterface(itemId);
if (itemMergeHandler.isPresent()) {
Optional<Conflict> conflict =
itemMergeHandler.get().getConflict(itemId, version, conflictId);
if (conflict.isPresent()) {
return conflict.get();
}
}
Conflict conflict = conflictsDao.getConflict(itemId, version, conflictId);
itemMergeHandler.ifPresent(mergeHandler ->
mergeHandler.postGetConflict(itemId, version, conflict));
if (conflict == null) {
throw getConflictNotExistException(itemId, version, conflictId);
}
return conflict;
}
@Override
public void resolveConflict(String itemId, Version version, String conflictId,
ConflictResolution resolution) {
if (Resolution.OTHER.equals(resolution.getResolution())) {
throw new UnsupportedOperationException(
"Resolution other than 'THEIRS' or 'YOURS' is not supported.");
}
Optional<ItemMergeHandler> itemMergeHandler =
ItemMergeHandlerFactory.getInstance().createInterface(itemId);
if (!itemMergeHandler.isPresent() ||
!itemMergeHandler.get()
.resolveConflict(itemId, version, conflictId, resolution)) {
getConflict(itemId, version, conflictId); // validate that the conflict exist
itemMergeHandler.ifPresent(mergeHandler ->
mergeHandler.preResolveConflict(itemId, version, conflictId, resolution));
conflictsDao.resolveConflict(itemId, version, conflictId, resolution);
}
}
private CoreException getConflictNotExistException(String itemId, Version version,
String conflictId) {
return new CoreException(new ErrorCode.ErrorCodeBuilder()
.withCategory(ErrorCategory.APPLICATION)
.withId(ELEMENT_CONFLICT_NOT_EXIST_ERR_ID)
.withMessage(
String.format(ELEMENT_CONFLICT_NOT_EXISTS_MSG, itemId, version.getId(), conflictId))
.build());
}
}
|
