re base code

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

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java
index 5b70229..88f0ea3 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java
@@ -20,10 +20,7 @@
 
 package org.openecomp.sdc.be.model.jsontitan.operations;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
@@ -33,61 +30,62 @@ import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @org.springframework.stereotype.Component("category-operation")
 public class CategoryOperation extends BaseOperation{
-       
-       private static Logger log = LoggerFactory.getLogger(CategoryOperation.class.getName());
 
-       /** 
-        * 
-        * @param name
-        * @param type
-        * @return
-        */
-       public  Either<GraphVertex, StorageOperationStatus> getCategory(String name, VertexTypeEnum type) {
-               if (name != null) {
-                       String categoryUid = UniqueIdBuilder.buildComponentCategoryUid(name, type);
-                       Map<GraphPropertyEnum, Object> props = new HashMap<>();
-                       props.put(GraphPropertyEnum.NORMALIZED_NAME, ValidationUtils.normalizeCategoryName4Uniqueness(name));
-                       Either<List<GraphVertex>, TitanOperationStatus> either = titanDao.getByCriteria(type, props);
+    private static final Logger log = Logger.getLogger(CategoryOperation.class.getName());
+
+    /**
+     *
+     * @param name
+     * @param type
+     * @return
+     */
+    public  Either<GraphVertex, StorageOperationStatus> getCategory(String name, VertexTypeEnum type) {
+        if (name != null) {
+            String categoryUid = UniqueIdBuilder.buildComponentCategoryUid(name, type);
+            Map<GraphPropertyEnum, Object> props = new HashMap<>();
+            props.put(GraphPropertyEnum.NORMALIZED_NAME, ValidationUtils.normalizeCategoryName4Uniqueness(name));
+            Either<List<GraphVertex>, TitanOperationStatus> either = titanDao.getByCriteria(type, props);
 
-                       if (either.isRight()) {
-                               TitanOperationStatus titanOperationStatus = either.right().value();
-                               log.debug("Problem while geting category with id {}. reason - {}", categoryUid, titanOperationStatus.name());
-                               if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
-                                       return Either.right(StorageOperationStatus.CATEGORY_NOT_FOUND);
-                               } else {
-                                       return Either.right(StorageOperationStatus.GENERAL_ERROR);
-                               }
-                       }
-                       return Either.left(either.left().value().get(0));
-               } else {
-                       return Either.right(StorageOperationStatus.GENERAL_ERROR);
-               }
-       }
-       /** 
-        * 
-        * @param categoryV
-        * @param name
-        * @return
-        */
-       public  Either<GraphVertex, StorageOperationStatus> getSubCategoryForCategory(GraphVertex categoryV, String name ) {
-               Either<List<GraphVertex>, TitanOperationStatus> childrenVertecies = titanDao.getChildrenVertecies(categoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
-               if ( childrenVertecies.isRight() ){
-                       log.debug("Failed to fetch children verticies for category {} error {}", categoryV.getUniqueId(), childrenVertecies.right().value());
-                       return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(childrenVertecies.right().value()));
-               }
-               for ( GraphVertex childV : childrenVertecies.left().value() ){
-                       if ( childV.getMetadataProperty(GraphPropertyEnum.NAME).equals(name) ){
-                               return Either.left(childV);
-                       }
-               }
-               return Either.right(StorageOperationStatus.NOT_FOUND);
-       }
+            if (either.isRight()) {
+                TitanOperationStatus titanOperationStatus = either.right().value();
+                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, titanOperationStatus.name());
+                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                    return Either.right(StorageOperationStatus.CATEGORY_NOT_FOUND);
+                } else {
+                    return Either.right(StorageOperationStatus.GENERAL_ERROR);
+                }
+            }
+            return Either.left(either.left().value().get(0));
+        } else {
+            return Either.right(StorageOperationStatus.GENERAL_ERROR);
+        }
+    }
+    /**
+     *
+     * @param categoryV
+     * @param name
+     * @return
+     */
+    public  Either<GraphVertex, StorageOperationStatus> getSubCategoryForCategory(GraphVertex categoryV, String name ) {
+        Either<List<GraphVertex>, TitanOperationStatus> childrenVertecies = titanDao.getChildrenVertecies(categoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
+        if ( childrenVertecies.isRight() ){
+            log.debug("Failed to fetch children verticies for category {} error {}", categoryV.getUniqueId(), childrenVertecies.right().value());
+            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(childrenVertecies.right().value()));
+        }
+        for ( GraphVertex childV : childrenVertecies.left().value() ){
+            if ( childV.getMetadataProperty(GraphPropertyEnum.NAME).equals(name) ){
+                return Either.left(childV);
+            }
+        }
+        return Either.right(StorageOperationStatus.NOT_FOUND);
+    }
 }