re base code

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / operations / utils / ComponentValidationUtils.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java
index 2c2d3e7..d4cbc8d 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java
@@ -20,76 +20,74 @@
 
 package org.openecomp.sdc.be.model.operations.utils;
 
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import fj.data.Either;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
 public class ComponentValidationUtils {
 
-       private static Logger log = LoggerFactory.getLogger(ComponentValidationUtils.class.getName());
+    private static final Logger log = Logger.getLogger(ComponentValidationUtils.class.getName());
+
+    public static boolean canWorkOnResource(Resource resource, String userId) {
+        // verify resource is checked-out
+        if (resource.getLifecycleState() != LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
+            log.debug("resource is not checked-out");
+            return false;
+        }
+        // verify resource is not deleted
+        if ((resource.getIsDeleted() != null) && (resource.getIsDeleted())) {
+            log.debug("resource is marked as delete");
+            return false;
+        }
+        // verify resource last update user is the current user
+        if (!userId.equals(resource.getLastUpdaterUserId())) {
+            log.debug("resource last update is not {}", userId);
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean canWorkOnComponent(String componentId, ToscaOperationFacade toscaOperationFacade, String userId) {
+
+        Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseMetadata);
 
-       public static boolean canWorkOnResource(Resource resource, String userId) {
-               // verify resource is checked-out
-               if (resource.getLifecycleState() != LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
-                       log.debug("resource is not checked-out");
-                       return false;
-               }
-               // verify resource is not deleted
-               if ((resource.getIsDeleted() != null) && (resource.getIsDeleted() == true)) {
-                       log.debug("resource is marked as delete");
-                       return false;
-               }
-               // verify resource last update user is the current user
-               if (!userId.equals(resource.getLastUpdaterUserId())) {
-                       log.debug("resource last update is not {}", userId);
-                       return false;
-               }
-               return true;
-       }
+        if (getResourceResult.isRight()) {
+            log.debug("Failed to retrieve component, component id {}", componentId);
+            return false;
+        }
+        Component component = getResourceResult.left().value();
 
-       public static boolean canWorkOnComponent(String componentId, ToscaOperationFacade toscaOperationFacade, String userId) {
-               
-               Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseMetadata);
+        return canWorkOnComponent(component, userId);
+    }
 
-               if (getResourceResult.isRight()) {
-                       log.debug("Failed to retrieve component, component id {}", componentId);
-                       return false;
-               }
-               Component component = getResourceResult.left().value();
+    public static boolean canWorkOnComponent(Component component, String userId) {
+        return canWorkOnComponent(component.getLifecycleState(), component.getLastUpdaterUserId(), userId);
+    }
 
-               return canWorkOnComponent(component, userId);
-       }
-       
-       public static boolean canWorkOnComponent(Component component, String userId) {
-               return canWorkOnComponent(component.getLifecycleState(), component.getLastUpdaterUserId(), userId);
-       }
-       
-       private static boolean canWorkOnComponent(LifecycleStateEnum lifecycleState, String lastUpdaterUserId, String userId) {
-               // verify resource is checked-out
-               if (lifecycleState != LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
-                       log.debug("resource is not checked-out");
-                       return false;
-               }
+    private static boolean canWorkOnComponent(LifecycleStateEnum lifecycleState, String lastUpdaterUserId, String userId) {
+        // verify resource is checked-out
+        if (lifecycleState != LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
+            log.debug("resource is not checked-out");
+            return false;
+        }
 
-               // verify userId is not null
-               if (userId == null) {
-                       log.debug("current user userId is null");
-                       return false;
-               }
+        // verify userId is not null
+        if (userId == null) {
+            log.debug("current user userId is null");
+            return false;
+        }
 
-               // verify resource last update user is the current user
-               if (!userId.equals(lastUpdaterUserId)) {
-                       log.debug("resource last updater userId is not {}", userId);
-                       return false;
-               }
-               return true;
-       }
+        // verify resource last update user is the current user
+        if (!userId.equals(lastUpdaterUserId)) {
+            log.debug("resource last updater userId is not {}", userId);
+            return false;
+        }
+        return true;
+    }
 
 }