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
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
package org.openecomp.conflicts.impl;
import org.openecomp.conflicts.ItemMergeHandler;
import org.openecomp.conflicts.dao.ConflictsDao;
import org.openecomp.conflicts.types.*;
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.datatypes.model.ElementType;
import org.openecomp.sdc.vendorsoftwareproduct.dao.VspMergeDao;
import org.openecomp.sdc.versioning.dao.types.Version;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.openecomp.sdc.datatypes.model.ElementType.*;
public class VspMergeHandler implements ItemMergeHandler {
private static final String VSP_MODEL_CONFLICT_ID = "vspModelConflictId";
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 static final Set<ElementType> FILTERED_OUT_TYPES = Stream
.of(OrchestrationTemplateCandidateContent, OrchestrationTemplateValidationData)
.collect(Collectors.toSet());
private static final Map<ElementType, Set<ElementType>> ELEMENT_TYPE_TO_CONFLICT_DEPENDANT_TYPES =
new EnumMap<>(ElementType.class);
static {
ELEMENT_TYPE_TO_CONFLICT_DEPENDANT_TYPES.put(OrchestrationTemplateCandidate,
Collections.singleton(OrchestrationTemplateCandidateContent));
ELEMENT_TYPE_TO_CONFLICT_DEPENDANT_TYPES.put(OrchestrationTemplate,
Collections.singleton(OrchestrationTemplateValidationData));
}
private ConflictsDao conflictsDao;
private VspMergeDao vspMergeDao;
public VspMergeHandler(ConflictsDao conflictsDao, VspMergeDao vspMergeDao) {
this.conflictsDao = conflictsDao;
this.vspMergeDao = vspMergeDao;
}
@Override
public boolean isConflicted(String itemId, Version version) {
return vspMergeDao.isConflicted(itemId, version);
}
@Override
public void finalizeMerge(String itemId, Version version) {
if (!conflictsDao.isConflicted(itemId, version)) {
vspMergeDao.applyConflictResolution(itemId, version);
}
}
@Override
public void postListConflicts(String itemId, Version version, ItemVersionConflict conflicts) {
List<ConflictInfo> elementConflicts = new ArrayList<>();
boolean vspModelConflicted = false;
for (ConflictInfo elementConflict : conflicts.getElementConflicts()) {
if (elementConflict.getType() == VspModel) {
elementConflicts.add(
new ConflictInfo(elementConflict.getId(), NetworkPackage, NetworkPackage.name()));
vspModelConflicted = true;
continue;
}
if (!FILTERED_OUT_TYPES.contains(elementConflict.getType())) {
elementConflicts.add(elementConflict);
}
}
if (!vspModelConflicted && vspMergeDao.isConflicted(itemId, version)) {
elementConflicts
.add(new ConflictInfo(VSP_MODEL_CONFLICT_ID, NetworkPackage, NetworkPackage.name()));
}
conflicts.setElementConflicts(elementConflicts);
}
@Override
public Optional<Conflict> getConflict(String itemId, Version version, String conflictId) {
return VSP_MODEL_CONFLICT_ID.equals(conflictId)
? Optional.of(buildVspModelConflict(conflictId))
: Optional.empty();
}
@Override
public void postGetConflict(String itemId, Version version, Conflict conflict) {
if (conflict.getType() == VspModel) {
Conflict vspModelConflict = buildVspModelConflict(null);
conflict.setType(vspModelConflict.getType());
conflict.setName(vspModelConflict.getName());
conflict.setYours(vspModelConflict.getYours());
conflict.setTheirs(vspModelConflict.getTheirs());
}
}
@Override
public void preResolveConflict(String itemId, Version version, String conflictId,
ConflictResolution resolution) {
if (VSP_MODEL_CONFLICT_ID.equals(conflictId)) {
return;
}
resolveDependantConflicts(itemId, version, conflictId, resolution);
}
@Override
public boolean resolveConflict(String itemId, Version version, String conflictId,
ConflictResolution resolution) {
if (VSP_MODEL_CONFLICT_ID.equals(conflictId)) {
vspMergeDao.updateConflictResolution(itemId, version,
com.amdocs.zusammen.datatypes.item.Resolution.valueOf(resolution.getResolution().name()));
return true;
}
Conflict conflict = conflictsDao.getConflict(itemId, version, conflictId);
if (conflict == null) {
throw getConflictNotExistException(itemId, version, conflictId);
}
if (conflict.getType() == VspModel) {
vspMergeDao.updateConflictResolution(itemId, version,
com.amdocs.zusammen.datatypes.item.Resolution.valueOf(resolution.getResolution().name()));
conflictsDao.resolveConflict(itemId, version, conflictId, new ConflictResolution(
conflict.getTheirs() == null ? Resolution.YOURS : Resolution.THEIRS));
return true;
}
return false;
}
private void resolveDependantConflicts(String itemId, Version version, String conflictId,
ConflictResolution resolution) {
ItemVersionConflict conflicts = conflictsDao.getConflict(itemId, version);
Set<ElementType> conflictDependantTypes =
ELEMENT_TYPE_TO_CONFLICT_DEPENDANT_TYPES
.get(findConflictById(conflicts, conflictId).getType());
if (conflictDependantTypes == null) {
return;
}
findConflictsByTypes(conflicts, conflictDependantTypes)
.forEach(dependantConflict ->
conflictsDao.resolveConflict(itemId, version, dependantConflict.getId(), resolution));
}
private ConflictInfo findConflictById(ItemVersionConflict versionConflicts,
String conflictId) {
return versionConflicts.getElementConflicts().stream()
.filter(elementConflict -> conflictId.equals(elementConflict.getId()))
.findFirst()
.orElseThrow(() -> new IllegalStateException(
String.format("Conflict Id %s does not exist on conflicts list", conflictId)));
}
private Collection<ConflictInfo> findConflictsByTypes(ItemVersionConflict versionConflicts,
Set<ElementType> elementTypes) {
return versionConflicts.getElementConflicts().stream()
.filter(elementConflict -> elementTypes.contains(elementConflict.getType()))
.collect(Collectors.toList());
}
private Conflict buildVspModelConflict(String conflictId) {
Conflict conflict = new Conflict(conflictId, NetworkPackage, NetworkPackage.name());
Map<String, String> yours = new HashMap<>();
yours.put("File", "Local (Me)");
conflict.setYours(yours);
Map<String, String> theirs = new HashMap<>();
theirs.put("File", "Last Committed");
conflict.setTheirs(theirs);
return conflict;
}
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());
}
}
|
