diff options
| author |   talig <talig@amdocs.com> | 2017-12-25 15:05:31 +0200 |
|---|---|---|
| committer |   Vitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com> | 2017-12-25 14:24:44 +0000 |
| commit | 05c625fb9c3673d6c60511958f7e051257247c2b (patch) | |
| tree | 28df153c7f9bdfd5b5682a6ff4cbeced23f30d3c /openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api | |
| parent | 22f1220c2dda43e3dcbadd70180db521a7984d1d (diff) | |
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 <talig@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api')
2 files changed, 5 insertions, 11 deletions
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 @@ -24,11 +24,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-versioning-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-facade-api</artifactId> <version>${project.version}</version> 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<HealthInfo> 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<HealthInfo> checkHealth(SessionContext context); - List<Revision> listRevisions(SessionContext sessionContext, String itemId, String versionId); + String getVersion(SessionContext context); } |