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 --- .../openecomp-zusammen-api/pom.xml | 5 -- .../core/zusammen/api/ZusammenAdaptor.java | 11 ++-- .../core/zusammen/impl/ZusammenAdaptorImpl.java | 75 ++++------------------ 3 files changed, 16 insertions(+), 75 deletions(-) (limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib') diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml index ee59b5bf77..a1337f6c95 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml @@ -23,11 +23,6 @@ openecomp-session-lib ${project.version} - - org.openecomp.sdc - openecomp-sdc-versioning-api - ${project.version} - org.openecomp.sdc.core openecomp-facade-api diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java index 35c07cbee0..694c35ebbe 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenAdaptor.java @@ -15,11 +15,10 @@ 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.sdc.versioning.dao.types.Revision; import java.util.Collection; -import java.util.List; import java.util.Optional; public interface ZusammenAdaptor { @@ -95,11 +94,11 @@ public interface ZusammenAdaptor { void resolveElementConflict(SessionContext context, ElementContext elementContext, ZusammenElement element, Resolution resolution); - Collection checkHealth(SessionContext context); + void revert(SessionContext context, Id itemId, Id versionId, Id revisionId); - String getVersion(SessionContext context); + ItemVersionRevisions listRevisions(SessionContext context, Id itemId, Id versionId); - void revert(SessionContext sessionContext, String itemId, String versionId, String revisionId); + Collection checkHealth(SessionContext context); - List listRevisions(SessionContext sessionContext, String itemId, String versionId); + String getVersion(SessionContext context); } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/ZusammenAdaptorImpl.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/ZusammenAdaptorImpl.java index 9bdbfd681c..6f4352b10e 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/ZusammenAdaptorImpl.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/ZusammenAdaptorImpl.java @@ -20,11 +20,9 @@ import com.amdocs.zusammen.datatypes.itemversion.ItemVersionRevisions; import com.amdocs.zusammen.datatypes.itemversion.Tag; import org.openecomp.core.zusammen.api.ZusammenAdaptor; import org.openecomp.core.zusammen.db.ZusammenConnector; -import org.openecomp.sdc.versioning.dao.types.Revision; import java.util.ArrayList; import java.util.Collection; -import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.function.Predicate; @@ -108,7 +106,8 @@ public class ZusammenAdaptorImpl implements ZusammenAdaptor { } @Override - public Optional getElementConflict(SessionContext context, ElementContext elementContext, + public Optional getElementConflict(SessionContext context, + ElementContext elementContext, Id elementId) { return Optional.ofNullable(connector.getElementConflict(context, elementContext, elementId)); } @@ -184,7 +183,7 @@ public class ZusammenAdaptorImpl implements ZusammenAdaptor { @Override public Optional getFirstVersion(SessionContext context, Id itemId) { Collection versions = connector.listPublicVersions(context, itemId); - if (versions == null || versions.size() == 0) { + if (versions == null || versions.isEmpty()) { return Optional.empty(); } List itemVersions = new ArrayList<>(versions); @@ -242,18 +241,6 @@ public class ZusammenAdaptorImpl implements ZusammenAdaptor { connector.resetVersionHistory(context, itemId, versionId, changeRef); } - /*@Override - public void revertVersionToRevision(SessionContext context, Id itemId, Id versionId, - Id revisionId) { - connector.resetVersionRevision(context, itemId, versionId, revisionId); - }*/ - - /*@Override - public ItemVersionRevisions listVersionRevisions(SessionContext context, Id itemId, Id - versionId) { - return connector.listVersionRevisions(context, itemId, versionId); - }*/ - @Override public void publishVersion(SessionContext context, Id itemId, Id versionId, String message) { connector.publishVersion(context, itemId, versionId, message); @@ -270,63 +257,23 @@ public class ZusammenAdaptorImpl implements ZusammenAdaptor { } @Override - public Collection checkHealth(SessionContext context) { - return connector.checkHealth(context); + public void revert(SessionContext context, Id itemId, Id versionId, Id revisionId) { + connector.revertVersionRevision(context, itemId, versionId, revisionId); } @Override - public String getVersion(SessionContext sessionContext) { - return connector.getVersion(sessionContext); + public ItemVersionRevisions listRevisions(SessionContext context, Id itemId, Id versionId) { + return connector.listVersionRevisions(context, itemId, versionId); } @Override - public void revert(SessionContext sessionContext, String itemId, String versionId, - String revisionId) { - connector.revertVersionRevision(sessionContext, new Id(itemId), new Id(versionId), - new Id(revisionId)); + public Collection checkHealth(SessionContext context) { + return connector.checkHealth(context); } @Override - public List listRevisions(SessionContext sessionContext, String itemId, - String versionId) { - List revisions = new ArrayList<>(); - ItemVersionRevisions itemVersionRevisions = - connector.listVersionRevisions(sessionContext, new Id(itemId), new Id - (versionId)); - if(itemVersionRevisions == null || itemVersionRevisions.getItemVersionRevisions()==null || - itemVersionRevisions.getItemVersionRevisions().size()==0) { - return revisions; - } - else{ - revisions = itemVersionRevisions.getItemVersionRevisions().stream().map - (revision -> { - Revision rev = new Revision(); - rev.setId(revision.getRevisionId().getValue()); - rev.setTime(revision.getTime()); - rev.setUser(revision.getUser()); - rev.setMessage(revision.getMessage()); - return rev; - }).collect(Collectors.toList()); - revisions.sort(new Comparator() { - @Override - public int compare(Revision o1, Revision o2) { - if(o1.getTime().before(o2.getTime())) return 1; - else return -1; - } - }); - // when creating a new item an initial version is created with - // invalid data. this revision is not an applicable revision. - //the logic of identifying this revision is: - //1- only the first version of item has this issue - //2- only in the first item version there are 2 revisions created - //3- the second revision is in format "Initial {vlm/vsp}: {name of the vlm/vsp} - //4- only if a revision in this format exists we remove the first revision. - if(revisions.size()>1 && revisions.get(revisions.size()-2).getMessage().matches("Initial " + - ".*:.*")){ - revisions.remove(revisions.size()-1); - } - return revisions; - } + public String getVersion(SessionContext context) { + return connector.getVersion(context); } private static void sortItemVersionListByModificationTimeDescOrder( -- cgit 1.2.3-korg