Upgrade SDC from Titan to Janus Graph

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / jsonjanusgraph / 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/jsonjanusgraph/operations/CategoryOperation.java
similarity index 80%
rename from catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java
rename to catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CategoryOperation.java
index 88f0ea3..7603657 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/jsonjanusgraph/operations/CategoryOperation.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 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;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 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;
@@ -53,12 +53,14 @@ public class CategoryOperation extends BaseOperation{
             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);
+            Either<List<GraphVertex>, JanusGraphOperationStatus> either = janusGraphDao
+                .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) {
+                JanusGraphOperationStatus janusGraphOperationStatus = either.right().value();
+                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, janusGraphOperationStatus
+                    .name());
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     return Either.right(StorageOperationStatus.CATEGORY_NOT_FOUND);
                 } else {
                     return Either.right(StorageOperationStatus.GENERAL_ERROR);
@@ -76,10 +78,11 @@ public class CategoryOperation extends BaseOperation{
      * @return
      */
     public  Either<GraphVertex, StorageOperationStatus> getSubCategoryForCategory(GraphVertex categoryV, String name ) {
-        Either<List<GraphVertex>, TitanOperationStatus> childrenVertecies = titanDao.getChildrenVertecies(categoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> childrenVertecies = janusGraphDao
+            .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()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childrenVertecies.right().value()));
         }
         for ( GraphVertex childV : childrenVertecies.left().value() ){
             if ( childV.getMetadataProperty(GraphPropertyEnum.NAME).equals(name) ){