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
|
/*-
* ============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.sdcrests.conflict.rest.services;
import javax.inject.Named;
import javax.ws.rs.core.Response;
import org.openecomp.conflicts.types.Conflict;
import org.openecomp.conflicts.types.ConflictResolution;
import org.openecomp.conflicts.types.ItemVersionConflict;
import org.openecomp.sdc.conflicts.ConflictsManager;
import org.openecomp.sdc.conflicts.ConflictsManagerFactory;
import org.openecomp.sdc.versioning.dao.types.Version;
import org.openecomp.sdcrests.conflict.rest.Conflicts;
import org.openecomp.sdcrests.conflict.rest.mapping.MapConflictToDto;
import org.openecomp.sdcrests.conflict.rest.mapping.MapDtoToConflictResolution;
import org.openecomp.sdcrests.conflict.rest.mapping.MapItemVersionConflictToDto;
import org.openecomp.sdcrests.conflict.types.ConflictDto;
import org.openecomp.sdcrests.conflict.types.ConflictResolutionDto;
import org.openecomp.sdcrests.conflict.types.ItemVersionConflictDto;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@Named
@Service("conflicts")
@Scope(value = "prototype")
public class ConflictsImpl implements Conflicts {
@Override
public Response getConflict(String itemId, String versionId, String user) {
ConflictsManager conflictsManager = ConflictsManagerFactory.getInstance().createInterface();
ItemVersionConflict itemVersionConflict = conflictsManager.getConflict(itemId, new Version(versionId));
ItemVersionConflictDto result = (new MapItemVersionConflictToDto()).applyMapping(itemVersionConflict, ItemVersionConflictDto.class);
return Response.ok(result).build();
}
@Override
public Response getConflict(String itemId, String versionId, String conflictId, String user) {
ConflictsManager conflictsManager = ConflictsManagerFactory.getInstance().createInterface();
Conflict conflict = conflictsManager.getConflict(itemId, new Version(versionId), conflictId);
ConflictDto result = new MapConflictToDto().applyMapping(conflict, ConflictDto.class);
return Response.ok(result).build();
}
@Override
public Response resolveConflict(ConflictResolutionDto conflictResolution, String itemId, String versionId, String conflictId, String user) {
ConflictsManager conflictsManager = ConflictsManagerFactory.getInstance().createInterface();
Version version = new Version(versionId);
conflictsManager.resolveConflict(itemId, version, conflictId,
new MapDtoToConflictResolution().applyMapping(conflictResolution, ConflictResolution.class));
conflictsManager.finalizeMerge(itemId, version);
return Response.ok().build();
}
}
|
