unit tests - openecomp-be

Additional junit tests for item-rest-services and unique-type-rest-services

Change-Id: I330954ad4eb432c126c7f163f9fdea30d3173cd9
Issue-ID: SDC-2326
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>

1 files changed, 33 insertions, 60 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/src/main/java/org/openecomp/sdcrests/item/rest/services/VersionsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/src/main/java/org/openecomp/sdcrests/item/rest/services/VersionsImpl.java
index cd6364f145..114a97a039 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/src/main/java/org/openecomp/sdcrests/item/rest/services/VersionsImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/src/main/java/org/openecomp/sdcrests/item/rest/services/VersionsImpl.java
@@ -16,6 +16,7 @@
 
 package org.openecomp.sdcrests.item.rest.services;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.openecomp.sdc.activitylog.ActivityLogManager;
 import org.openecomp.sdc.activitylog.ActivityLogManagerFactory;
 import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
@@ -45,6 +46,7 @@ import org.openecomp.sdcrests.item.rest.Versions;
 import org.openecomp.sdcrests.item.rest.mapping.MapActivityLogEntityToDto;
 import org.openecomp.sdcrests.item.rest.mapping.MapRevisionToDto;
 import org.openecomp.sdcrests.item.rest.mapping.MapVersionToDto;
+import org.openecomp.sdcrests.item.rest.models.SyncEvent;
 import org.openecomp.sdcrests.item.types.*;
 import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
 import org.springframework.context.annotation.Scope;
@@ -67,20 +69,15 @@ public class VersionsImpl implements Versions {
     private static final String COMMIT_ITEM_ACTION = "Commit_Item";
     private static final Logger LOGGER = LoggerFactory.getLogger(VersionsImpl.class);
 
-    private PermissionsManager permissionsManager = PermissionsManagerFactory.getInstance().createInterface();
-    private AsdcItemManager asdcItemManager = AsdcItemManagerFactory.getInstance().createInterface();
-    private VersioningManager versioningManager = VersioningManagerFactory.getInstance().createInterface();
-    private ConflictsManager conflictsManager = ConflictsManagerFactory.getInstance().createInterface();
-    private ActivityLogManager activityLogManager = ActivityLogManagerFactory.getInstance().createInterface();
-    private NotificationPropagationManager notifier =
-            NotificationPropagationManagerFactory.getInstance().createInterface();
+    private ManagersProvider managersProvider;
 
     @Override
     public Response list(String itemId, String user) {
         GenericCollectionWrapper<VersionDto> results = new GenericCollectionWrapper<>();
         MapVersionToDto mapper = new MapVersionToDto();
 
-        versioningManager.list(itemId).forEach(version -> results.add(mapper.applyMapping(version, VersionDto.class)));
+        getManagersProvider().getVersioningManager().list(itemId)
+            .forEach(version -> results.add(mapper.applyMapping(version, VersionDto.class)));
         return Response.ok(results).build();
     }
 
@@ -90,13 +87,13 @@ public class VersionsImpl implements Versions {
         version.setBaseId(baseVersionId);
         version.setDescription(request.getDescription());
 
-        version = versioningManager
-                          .create(itemId, version, VersionCreationMethod.valueOf(request.getCreationMethod().name()));
+        version = getManagersProvider().getVersioningManager()
+            .create(itemId, version, VersionCreationMethod.valueOf(request.getCreationMethod().name()));
 
         VersionDto versionDto = new MapVersionToDto().applyMapping(version, VersionDto.class);
 
-        activityLogManager
-                .logActivity(new ActivityLogEntity(itemId, version, ActivityType.Create_Version, user, true, "", ""));
+        getManagersProvider().getActivityLogManager().logActivity(
+            new ActivityLogEntity(itemId, version, ActivityType.Create_Version, user, true, "", ""));
 
         return Response.ok(versionDto).build();
     }
@@ -113,7 +110,7 @@ public class VersionsImpl implements Versions {
         GenericCollectionWrapper<ActivityLogDto> results = new GenericCollectionWrapper<>();
         MapActivityLogEntityToDto mapper = new MapActivityLogEntityToDto();
 
-        activityLogManager.listLoggedActivities(itemId, new Version(versionId))
+        getManagersProvider().getActivityLogManager().listLoggedActivities(itemId, new Version(versionId))
                 .forEach(loggedActivity -> results.add(mapper.applyMapping(loggedActivity, ActivityLogDto.class)));
 
         return Response.ok(results).build();
@@ -121,7 +118,7 @@ public class VersionsImpl implements Versions {
 
     @Override
     public Response listRevisions(String itemId, String versionId, String user) {
-        List<Revision> revisions = versioningManager.listRevisions(itemId, new Version(versionId));
+        List<Revision> revisions = getManagersProvider().getVersioningManager().listRevisions(itemId, new Version(versionId));
         filterRevisions(revisions);
 
         GenericCollectionWrapper<RevisionDto> results = new GenericCollectionWrapper<>();
@@ -138,7 +135,7 @@ public class VersionsImpl implements Versions {
                 sync(itemId, version);
                 break;
             case Commit:
-                if (!permissionsManager.isAllowed(itemId, user, COMMIT_ITEM_ACTION)) {
+                if (!getManagersProvider().getPermissionsManager().isAllowed(itemId, user, COMMIT_ITEM_ACTION)) {
                     return Response.status(Response.Status.FORBIDDEN)
                                    .entity(new Exception(Messages.PERMISSIONS_ERROR.getErrorMessage())).build();
                 }
@@ -148,7 +145,7 @@ public class VersionsImpl implements Versions {
                 revert(request.getRevisionRequest(), itemId, versionId);
                 break;
             case Clean:
-                versioningManager.clean(itemId, version);
+                getManagersProvider().getVersioningManager().clean(itemId, version);
                 break;
             default:
                 throw new UnsupportedOperationException(String.format("Action %s not supported.", request.getAction()));
@@ -157,29 +154,29 @@ public class VersionsImpl implements Versions {
     }
 
     private Version getVersion(String itemId, Version version) {
-        Version retrievedVersion = versioningManager.get(itemId, version);
+        Version retrievedVersion = getManagersProvider().getVersioningManager().get(itemId, version);
 
         if (retrievedVersion.getState().getSynchronizationState() != SynchronizationState.Merging &&
                     // looks for sdc applicative conflicts
-                    conflictsManager.isConflicted(itemId, retrievedVersion)) {
+                    getManagersProvider().getConflictsManager().isConflicted(itemId, retrievedVersion)) {
             retrievedVersion.getState().setSynchronizationState(SynchronizationState.Merging);
         }
         return retrievedVersion;
     }
 
     private void sync(String itemId, Version version) {
-        versioningManager.sync(itemId, version);
-        conflictsManager.finalizeMerge(itemId, version);
+        getManagersProvider().getVersioningManager().sync(itemId, version);
+        getManagersProvider().getConflictsManager().finalizeMerge(itemId, version);
     }
 
     private void commit(CommitRequestDto request, String itemId, Version version, String user) {
 
         String message = request == null ? "" : request.getMessage();
 
-        versioningManager.publish(itemId, version, message);
+        getManagersProvider().getVersioningManager().publish(itemId, version, message);
         notifyUsers(itemId, version, message, user, NotificationEventTypes.COMMIT);
-        activityLogManager
-                .logActivity(new ActivityLogEntity(itemId, version, ActivityType.Commit, user, true, "", message));
+        getManagersProvider().getActivityLogManager().logActivity(
+            new ActivityLogEntity(itemId, version, ActivityType.Commit, user, true, "", message));
     }
 
     private void revert(RevisionRequestDto request, String itemId, String versionId) {
@@ -187,7 +184,7 @@ public class VersionsImpl implements Versions {
             throw new CoreException(new RevisionIdNotFoundErrorBuilder().build());
         }
 
-        versioningManager.revert(itemId, new Version(versionId), request.getRevisionId());
+        getManagersProvider().getVersioningManager().revert(itemId, new Version(versionId), request.getRevisionId());
     }
 
     private void filterRevisions(List<Revision> revisions) {
@@ -208,10 +205,10 @@ public class VersionsImpl implements Versions {
     private void notifyUsers(String itemId, Version version, String message, String userName,
             NotificationEventTypes eventType) {
         Map<String, Object> eventProperties = new HashMap<>();
-        eventProperties.put(ITEM_NAME, asdcItemManager.get(itemId).getName());
+        eventProperties.put(ITEM_NAME, getManagersProvider().getAsdcItemManager().get(itemId).getName());
         eventProperties.put(ITEM_ID, itemId);
 
-        Version ver = versioningManager.get(itemId, version);
+        Version ver = getManagersProvider().getVersioningManager().get(itemId, version);
         eventProperties.put(VERSION_NAME, ver.getName());
         eventProperties.put(VERSION_ID, ver.getId());
 
@@ -220,46 +217,22 @@ public class VersionsImpl implements Versions {
 
         Event syncEvent = new SyncEvent(eventType.getEventName(), itemId, eventProperties, itemId);
         try {
-            notifier.notifySubscribers(syncEvent, userName);
+            getManagersProvider().getNotificationPropagationManager().notifySubscribers(syncEvent, userName);
         } catch (Exception e) {
             LOGGER.error("Failed to send sync notification to users subscribed o item '" + itemId);
         }
     }
 
-    private class SyncEvent implements Event {
-
-        private String eventType;
-        private String originatorId;
-        private Map<String, Object> attributes;
-
-        private String entityId;
-
-        public SyncEvent(String eventType, String originatorId, Map<String, Object> attributes, String entityId) {
-            this.eventType = eventType;
-            this.originatorId = originatorId;
-            this.attributes = attributes;
-            this.entityId = entityId;
-        }
-
-        @Override
-        public String getEventType() {
-            return eventType;
-        }
-
-        @Override
-        public String getOriginatorId() {
-            return originatorId;
-        }
-
-        @Override
-        public Map<String, Object> getAttributes() {
-            return attributes;
-        }
+    @VisibleForTesting
+    void setManagersProvider(ManagersProvider managersProvider) {
+        this.managersProvider = managersProvider;
+    }
 
-        @Override
-        public String getEntityId() {
-            return entityId;
+    private ManagersProvider getManagersProvider() {
+        if (managersProvider == null){
+            managersProvider = new ManagersProvider();
         }
-
+        return managersProvider;
     }
+
 }