diff options
author | vasraz <vasyl.razinkov@est.tech> | 2021-03-22 15:33:06 +0000 |
---|---|---|
committer | Christophe Closset <christophe.closset@intl.att.com> | 2021-03-24 06:59:47 +0000 |
commit | d378c37fbd1ecec7b43394926f1ca32a695e07de (patch) | |
tree | 5c8a085f8732f980d871d966ac49361644efa698 /openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/dao/impl/zusammen/ItemVersionConflictConvertorFromZusammen.java | |
parent | a6ae7294ecd336d7e88f915710b08e2658eaee00 (diff) |
Reformat openecomp-be
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3449
Change-Id: I13e02322f8e00820cc5a1d85752caaeda9bf10d1
Diffstat (limited to 'openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/dao/impl/zusammen/ItemVersionConflictConvertorFromZusammen.java')
-rw-r--r-- | openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/dao/impl/zusammen/ItemVersionConflictConvertorFromZusammen.java | 84 |
1 files changed, 32 insertions, 52 deletions
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/dao/impl/zusammen/ItemVersionConflictConvertorFromZusammen.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/dao/impl/zusammen/ItemVersionConflictConvertorFromZusammen.java index 67827bc041..9c5238c44e 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/dao/impl/zusammen/ItemVersionConflictConvertorFromZusammen.java +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/dao/impl/zusammen/ItemVersionConflictConvertorFromZusammen.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,10 +17,8 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.conflicts.dao.impl.zusammen; - import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementConflictInfo; import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementInfo; import com.amdocs.zusammen.adaptor.inbound.api.types.item.ItemVersionConflict; @@ -28,6 +26,7 @@ import com.amdocs.zusammen.datatypes.Id; import com.amdocs.zusammen.datatypes.item.ItemVersion; import com.amdocs.zusammen.datatypes.item.ItemVersionData; import com.amdocs.zusammen.datatypes.item.ItemVersionDataConflict; +import java.util.stream.Collectors; import org.openecomp.conflicts.types.Conflict; import org.openecomp.conflicts.types.ConflictInfo; import org.openecomp.sdc.datatypes.model.ElementType; @@ -35,59 +34,40 @@ import org.openecomp.sdc.versioning.dao.impl.zusammen.convertor.ItemVersionToVer import org.openecomp.sdc.versioning.dao.types.Version; import org.openecomp.types.ElementPropertyName; -import java.util.stream.Collectors; - public class ItemVersionConflictConvertorFromZusammen { - public org.openecomp.conflicts.types.ItemVersionConflict convert(String itemId, Version version, - ItemVersionConflict source) { - org.openecomp.conflicts.types.ItemVersionConflict target = - new org.openecomp.conflicts.types.ItemVersionConflict(); - - target.setVersionConflict( - convertVersionDataConflict(itemId, version, source.getVersionDataConflict())); - target.setElementConflicts(source.getElementConflictInfos().stream() - .map(this::convertElementConflictInfo) - .collect(Collectors.toList())); - return target; - } - - - private Conflict<Version> convertVersionDataConflict(String itemId, Version version, - ItemVersionDataConflict versionDataConflict) { - if (versionDataConflict == null) { - return null; + public org.openecomp.conflicts.types.ItemVersionConflict convert(String itemId, Version version, ItemVersionConflict source) { + org.openecomp.conflicts.types.ItemVersionConflict target = new org.openecomp.conflicts.types.ItemVersionConflict(); + target.setVersionConflict(convertVersionDataConflict(itemId, version, source.getVersionDataConflict())); + target.setElementConflicts(source.getElementConflictInfos().stream().map(this::convertElementConflictInfo).collect(Collectors.toList())); + return target; } - Conflict<Version> conflict = - new Conflict<>(version.getId(), ElementType.itemVersion, null); - - ItemVersionToVersionConvertor convertor = new ItemVersionToVersionConvertor(); - conflict.setYours(convertor.convert( - getItemVersion(version.getId(), versionDataConflict.getLocalData()))); - conflict.setTheirs(convertor.convert( - getItemVersion(version.getId(), versionDataConflict.getRemoteData()))); - return conflict; - } - - private ItemVersion getItemVersion(String versionId, ItemVersionData versionData) { - if (versionData == null) { - return null; + private Conflict<Version> convertVersionDataConflict(String itemId, Version version, ItemVersionDataConflict versionDataConflict) { + if (versionDataConflict == null) { + return null; + } + Conflict<Version> conflict = new Conflict<>(version.getId(), ElementType.itemVersion, null); + ItemVersionToVersionConvertor convertor = new ItemVersionToVersionConvertor(); + conflict.setYours(convertor.convert(getItemVersion(version.getId(), versionDataConflict.getLocalData()))); + conflict.setTheirs(convertor.convert(getItemVersion(version.getId(), versionDataConflict.getRemoteData()))); + return conflict; } - ItemVersion itemVersion = new ItemVersion(); - itemVersion.setId(new Id(versionId)); - itemVersion.setData(versionData); - return itemVersion; - } - private ConflictInfo convertElementConflictInfo(ElementConflictInfo elementConflictInfo) { - ElementInfo elementInfo = elementConflictInfo.getLocalElementInfo() == null - ? elementConflictInfo.getRemoteElementInfo() - : elementConflictInfo.getLocalElementInfo(); + private ItemVersion getItemVersion(String versionId, ItemVersionData versionData) { + if (versionData == null) { + return null; + } + ItemVersion itemVersion = new ItemVersion(); + itemVersion.setId(new Id(versionId)); + itemVersion.setData(versionData); + return itemVersion; + } - return new ConflictInfo(elementInfo.getId().getValue(), - ElementType - .valueOf(elementInfo.getInfo().getProperty(ElementPropertyName.elementType.name())), - elementInfo.getInfo().getName()); - } + private ConflictInfo convertElementConflictInfo(ElementConflictInfo elementConflictInfo) { + ElementInfo elementInfo = elementConflictInfo.getLocalElementInfo() == null ? elementConflictInfo.getRemoteElementInfo() + : elementConflictInfo.getLocalElementInfo(); + return new ConflictInfo(elementInfo.getId().getValue(), + ElementType.valueOf(elementInfo.getInfo().getProperty(ElementPropertyName.elementType.name())), elementInfo.getInfo().getName()); + } } |