From 05c625fb9c3673d6c60511958f7e051257247c2b Mon Sep 17 00:00:00 2001 From: talig Date: Mon, 25 Dec 2017 15:05:31 +0200 Subject: Refactor list revisions api Remove zusammen-api dependency in versioning-api, enhance version zusammen dao impl UT. Issue-ID: SDC-779 Change-Id: Ic792462eac52f1f5129f92ce80d3deb641c90916 Signed-off-by: talig --- .../dao/ServiceModelDaoFactoryTest.java | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib') diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java index 4690d75a68..418da9a770 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java @@ -36,6 +36,7 @@ import com.amdocs.zusammen.datatypes.item.ItemVersion; import com.amdocs.zusammen.datatypes.item.ItemVersionData; import com.amdocs.zusammen.datatypes.item.ItemVersionStatus; import com.amdocs.zusammen.datatypes.item.Resolution; +import com.amdocs.zusammen.datatypes.itemversion.ItemVersionRevisions; import com.amdocs.zusammen.datatypes.itemversion.Tag; import org.openecomp.core.utilities.CommonMethods; import org.openecomp.core.utilities.file.FileContentHandler; @@ -46,7 +47,6 @@ import org.openecomp.sdc.model.impl.zusammen.ServiceModelDaoZusammenImpl; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.YamlUtil; -import org.openecomp.sdc.versioning.dao.types.Revision; import org.openecomp.sdc.versioning.dao.types.Version; import org.testng.Assert; import org.testng.annotations.Test; @@ -55,7 +55,6 @@ import java.io.ByteArrayInputStream; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Optional; @@ -255,7 +254,7 @@ public class ServiceModelDaoFactoryTest { ElementContext elementContext, Id parentElementId, String elementName) { - if(elementName.equals(ElementType.VspModel.name())){ + if (elementName.equals(ElementType.VspModel.name())) { return elementInfoMap.values(); } @@ -267,11 +266,11 @@ public class ServiceModelDaoFactoryTest { ElementContext elementContext, Id parentElementId, String elementName) { - if(elementName.equals(ElementType.Templates.name())){ - return Optional.ofNullable(elementInfoMap.get("null" + elementName)); - }else if(elementName.equals(ElementType.Artifacts.name())) { - return Optional.ofNullable(elementInfoMap.get("null" + elementName)); - } + if (elementName.equals(ElementType.Templates.name())) { + return Optional.ofNullable(elementInfoMap.get("null" + elementName)); + } else if (elementName.equals(ElementType.Artifacts.name())) { + return Optional.ofNullable(elementInfoMap.get("null" + elementName)); + } return Optional.empty(); } @@ -382,14 +381,14 @@ public class ServiceModelDaoFactoryTest { } @Override - public void revert(SessionContext sessionContext, String itemId, String versionId, - String revisionId) { + public void revert(SessionContext sessionContext, Id itemId, Id versionId, + Id revisionId) { } @Override - public List listRevisions(SessionContext sessionContext, String itemId, - String versionId) { + public ItemVersionRevisions listRevisions(SessionContext sessionContext, Id itemId, + Id versionId) { return null; } -- cgit 1.2.3-korg