1 files changed, 35 insertions, 61 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 114a97a039..6e7703cda3 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
@@ -13,29 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdcrests.item.rest.services;
 
+import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_USER;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.ITEM_ID;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.ITEM_NAME;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.SUBMIT_DESCRIPTION;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.VERSION_ID;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.VERSION_NAME;
+
 import com.google.common.annotations.VisibleForTesting;
-import org.openecomp.sdc.activitylog.ActivityLogManager;
-import org.openecomp.sdc.activitylog.ActivityLogManagerFactory;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
 import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
 import org.openecomp.sdc.activitylog.dao.type.ActivityType;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.Messages;
-import org.openecomp.sdc.conflicts.ConflictsManager;
-import org.openecomp.sdc.conflicts.ConflictsManagerFactory;
-import org.openecomp.sdc.itempermissions.PermissionsManager;
-import org.openecomp.sdc.itempermissions.PermissionsManagerFactory;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.notification.dtos.Event;
-import org.openecomp.sdc.notification.factories.NotificationPropagationManagerFactory;
-import org.openecomp.sdc.notification.services.NotificationPropagationManager;
-import org.openecomp.sdc.versioning.AsdcItemManager;
-import org.openecomp.sdc.versioning.AsdcItemManagerFactory;
-import org.openecomp.sdc.versioning.VersioningManager;
-import org.openecomp.sdc.versioning.VersioningManagerFactory;
 import org.openecomp.sdc.versioning.dao.types.Revision;
 import org.openecomp.sdc.versioning.dao.types.SynchronizationState;
 import org.openecomp.sdc.versioning.dao.types.Version;
@@ -47,20 +46,17 @@ 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.item.types.ActivityLogDto;
+import org.openecomp.sdcrests.item.types.CommitRequestDto;
+import org.openecomp.sdcrests.item.types.RevisionDto;
+import org.openecomp.sdcrests.item.types.RevisionRequestDto;
+import org.openecomp.sdcrests.item.types.VersionActionRequestDto;
+import org.openecomp.sdcrests.item.types.VersionDto;
+import org.openecomp.sdcrests.item.types.VersionRequestDto;
 import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_USER;
-import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.*;
-
 @Named
 @Service("versions")
 @Scope(value = "prototype")
@@ -68,16 +64,13 @@ public class VersionsImpl implements Versions {
 
     private static final String COMMIT_ITEM_ACTION = "Commit_Item";
     private static final Logger LOGGER = LoggerFactory.getLogger(VersionsImpl.class);
-
     private ManagersProvider managersProvider;
 
     @Override
     public Response list(String itemId, String user) {
         GenericCollectionWrapper<VersionDto> results = new GenericCollectionWrapper<>();
         MapVersionToDto mapper = new MapVersionToDto();
-
-        getManagersProvider().getVersioningManager().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();
     }
 
@@ -86,15 +79,11 @@ public class VersionsImpl implements Versions {
         Version version = new Version();
         version.setBaseId(baseVersionId);
         version.setDescription(request.getDescription());
-
         version = getManagersProvider().getVersioningManager()
             .create(itemId, version, VersionCreationMethod.valueOf(request.getCreationMethod().name()));
-
         VersionDto versionDto = new MapVersionToDto().applyMapping(version, VersionDto.class);
-
-        getManagersProvider().getActivityLogManager().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();
     }
 
@@ -109,10 +98,8 @@ public class VersionsImpl implements Versions {
     public Response getActivityLog(String itemId, String versionId, String user) {
         GenericCollectionWrapper<ActivityLogDto> results = new GenericCollectionWrapper<>();
         MapActivityLogEntityToDto mapper = new MapActivityLogEntityToDto();
-
         getManagersProvider().getActivityLogManager().listLoggedActivities(itemId, new Version(versionId))
-                .forEach(loggedActivity -> results.add(mapper.applyMapping(loggedActivity, ActivityLogDto.class)));
-
+            .forEach(loggedActivity -> results.add(mapper.applyMapping(loggedActivity, ActivityLogDto.class)));
         return Response.ok(results).build();
     }
 
@@ -120,7 +107,6 @@ public class VersionsImpl implements Versions {
     public Response listRevisions(String itemId, String versionId, String user) {
         List<Revision> revisions = getManagersProvider().getVersioningManager().listRevisions(itemId, new Version(versionId));
         filterRevisions(revisions);
-
         GenericCollectionWrapper<RevisionDto> results = new GenericCollectionWrapper<>();
         MapRevisionToDto mapper = new MapRevisionToDto();
         revisions.forEach(revision -> results.add(mapper.applyMapping(revision, RevisionDto.class)));
@@ -136,8 +122,7 @@ public class VersionsImpl implements Versions {
                 break;
             case Commit:
                 if (!getManagersProvider().getPermissionsManager().isAllowed(itemId, user, COMMIT_ITEM_ACTION)) {
-                    return Response.status(Response.Status.FORBIDDEN)
-                                   .entity(new Exception(Messages.PERMISSIONS_ERROR.getErrorMessage())).build();
+                    return Response.status(Response.Status.FORBIDDEN).entity(new Exception(Messages.PERMISSIONS_ERROR.getErrorMessage())).build();
                 }
                 commit(request.getCommitRequest(), itemId, version, user);
                 break;
@@ -155,10 +140,9 @@ public class VersionsImpl implements Versions {
 
     private Version getVersion(String itemId, Version version) {
         Version retrievedVersion = getManagersProvider().getVersioningManager().get(itemId, version);
-
         if (retrievedVersion.getState().getSynchronizationState() != SynchronizationState.Merging &&
-                    // looks for sdc applicative conflicts
-                    getManagersProvider().getConflictsManager().isConflicted(itemId, retrievedVersion)) {
+            // looks for sdc applicative conflicts
+            getManagersProvider().getConflictsManager().isConflicted(itemId, retrievedVersion)) {
             retrievedVersion.getState().setSynchronizationState(SynchronizationState.Merging);
         }
         return retrievedVersion;
@@ -170,20 +154,17 @@ public class VersionsImpl implements Versions {
     }
 
     private void commit(CommitRequestDto request, String itemId, Version version, String user) {
-
         String message = request == null ? "" : request.getMessage();
-
         getManagersProvider().getVersioningManager().publish(itemId, version, message);
         notifyUsers(itemId, version, message, user, NotificationEventTypes.COMMIT);
-        getManagersProvider().getActivityLogManager().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) {
         if (request.getRevisionId() == null) {
             throw new CoreException(new RevisionIdNotFoundErrorBuilder().build());
         }
-
         getManagersProvider().getVersioningManager().revert(itemId, new Version(versionId), request.getRevisionId());
     }
 
@@ -195,26 +176,20 @@ public class VersionsImpl implements Versions {
      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. */
         int numOfRevisions = revisions.size();
-        if (numOfRevisions > 1 &&
-
-                    revisions.get(numOfRevisions - 2).getMessage().matches("Initial .*:.*")) {
+        if (numOfRevisions > 1 && revisions.get(numOfRevisions - 2).getMessage().matches("Initial .*:.*")) {
             revisions.remove(numOfRevisions - 1);
         }
     }
 
-    private void notifyUsers(String itemId, Version version, String message, String userName,
-            NotificationEventTypes eventType) {
+    private void notifyUsers(String itemId, Version version, String message, String userName, NotificationEventTypes eventType) {
         Map<String, Object> eventProperties = new HashMap<>();
         eventProperties.put(ITEM_NAME, getManagersProvider().getAsdcItemManager().get(itemId).getName());
         eventProperties.put(ITEM_ID, itemId);
-
         Version ver = getManagersProvider().getVersioningManager().get(itemId, version);
         eventProperties.put(VERSION_NAME, ver.getName());
         eventProperties.put(VERSION_ID, ver.getId());
-
         eventProperties.put(SUBMIT_DESCRIPTION, message);
         eventProperties.put(PERMISSION_USER, userName);
-
         Event syncEvent = new SyncEvent(eventType.getEventName(), itemId, eventProperties, itemId);
         try {
             getManagersProvider().getNotificationPropagationManager().notifySubscribers(syncEvent, userName);
@@ -223,16 +198,15 @@ public class VersionsImpl implements Versions {
         }
     }
 
-    @VisibleForTesting
-    void setManagersProvider(ManagersProvider managersProvider) {
-        this.managersProvider = managersProvider;
-    }
-
     private ManagersProvider getManagersProvider() {
-        if (managersProvider == null){
+        if (managersProvider == null) {
             managersProvider = new ManagersProvider();
         }
         return managersProvider;
     }
 
+    @VisibleForTesting
+    void setManagersProvider(ManagersProvider managersProvider) {
+        this.managersProvider = managersProvider;
+    }
 }