Upgrade SDC from Titan to Janus Graph

[sdc.git] / asdctool / src / main / java / org / openecomp / sdc / asdctool / migration / tasks / mig1802 / SdcCatalogMigration.java

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1802/SdcCatalogMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1802/SdcCatalogMigration.java
index d520eee..a47c63d 100644 (file)
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1802/SdcCatalogMigration.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1802/SdcCatalogMigration.java
@@ -6,17 +6,17 @@ import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.openecomp.sdc.asdctool.migration.core.DBVersion;
 import org.openecomp.sdc.asdctool.migration.core.task.Migration;
 import org.openecomp.sdc.asdctool.migration.core.task.MigrationResult;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 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.jsongraph.utils.IdBuilderUtils;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.TopologyTemplateOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaElementOperation;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
@@ -32,11 +32,11 @@ public class SdcCatalogMigration implements Migration {
     private static final List<ResourceTypeEnum> EXCLUDE_TYPES = Arrays.asList(ResourceTypeEnum.VFCMT, ResourceTypeEnum.Configuration);
 
     private ToscaElementOperation toscaElementOperation;
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
 
-    public SdcCatalogMigration(TopologyTemplateOperation toscaElementOperation, TitanDao titanDao) {
+    public SdcCatalogMigration(TopologyTemplateOperation toscaElementOperation, JanusGraphDao janusGraphDao) {
         this.toscaElementOperation = toscaElementOperation;
-        this.titanDao = titanDao;
+        this.janusGraphDao = janusGraphDao;
     }
 
     @Override
@@ -51,45 +51,46 @@ public class SdcCatalogMigration implements Migration {
 
     @Override
     public MigrationResult migrate() {
-        TitanOperationStatus status = null;
+        JanusGraphOperationStatus status = null;
         try {
             status = getOrCreateCatalogRoot()
                     .either(this::associateCatalogRootToCatalogElements,
                             err -> {LOGGER.error("failed to create catalog root. err: {}", err); return err;});
-            return status == TitanOperationStatus.OK ? MigrationResult.success() : MigrationResult.error("failed to create and associate catalog root. error: " + status);
+            return status == JanusGraphOperationStatus.OK ? MigrationResult.success() : MigrationResult.error("failed to create and associate catalog root. error: " + status);
         } finally {
             commitOrRollBack(status);
         }
     }
 
-    private void commitOrRollBack(TitanOperationStatus status) {
-        if (status == TitanOperationStatus.OK) {
-            titanDao.commit();
+    private void commitOrRollBack(JanusGraphOperationStatus status) {
+        if (status == JanusGraphOperationStatus.OK) {
+            janusGraphDao.commit();
         } else {
-            titanDao.rollback();
+            janusGraphDao.rollback();
         }
     }
 
-    private Either<GraphVertex, TitanOperationStatus> getOrCreateCatalogRoot() {
+    private Either<GraphVertex, JanusGraphOperationStatus> getOrCreateCatalogRoot() {
         LOGGER.info("creating or getting catalog root vertex");
-        return titanDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT)
+        return janusGraphDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT)
                 .right()
                 .bind(this::createRootCatalogVertexOrError);
     }
 
 
-    private Either<GraphVertex, TitanOperationStatus> createRootCatalogVertexOrError(TitanOperationStatus titanOperationStatus) {
-        return titanOperationStatus == TitanOperationStatus.NOT_FOUND ? createRootCatalogVertex() : Either.right(titanOperationStatus);
+    private Either<GraphVertex, JanusGraphOperationStatus> createRootCatalogVertexOrError(JanusGraphOperationStatus janusGraphOperationStatus) {
+        return janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND ? createRootCatalogVertex() : Either.right(
+            janusGraphOperationStatus);
     }
 
-    private Either<GraphVertex, TitanOperationStatus> createRootCatalogVertex() {
+    private Either<GraphVertex, JanusGraphOperationStatus> createRootCatalogVertex() {
         LOGGER.info("Creating root catalog vertex");
         GraphVertex catalogRootVertex = new GraphVertex(VertexTypeEnum.CATALOG_ROOT);
         catalogRootVertex.setUniqueId(IdBuilderUtils.generateUniqueId());
-        return titanDao.createVertex(catalogRootVertex);
+        return janusGraphDao.createVertex(catalogRootVertex);
     }
 
-    private Either<List<GraphVertex>, TitanOperationStatus> getAllCatalogVertices() {
+    private Either<List<GraphVertex>, JanusGraphOperationStatus> getAllCatalogVertices() {
         LOGGER.info("fetching all catalog resources");
         return toscaElementOperation.getListOfHighestComponents(ComponentTypeEnum.RESOURCE, EXCLUDE_TYPES, JsonParseFlagEnum.ParseMetadata)
                 .right()
@@ -98,12 +99,12 @@ public class SdcCatalogMigration implements Migration {
                 .bind(this::getAllCatalogVertices);
     }
 
-    private Either<List<GraphVertex>, TitanOperationStatus> errOrEmptyListIfNotFound(TitanOperationStatus err) {
-        return TitanOperationStatus.NOT_FOUND.equals(err) ? Either.left(new ArrayList<>()) : Either.right(err);
+    private Either<List<GraphVertex>, JanusGraphOperationStatus> errOrEmptyListIfNotFound(JanusGraphOperationStatus err) {
+        return JanusGraphOperationStatus.NOT_FOUND.equals(err) ? Either.left(new ArrayList<>()) : Either.right(err);
     }
 
     @SuppressWarnings("unchecked")
-    private Either<List<GraphVertex>, TitanOperationStatus> getAllCatalogVertices(List<GraphVertex> allResourceCatalogVertices) {
+    private Either<List<GraphVertex>, JanusGraphOperationStatus> getAllCatalogVertices(List<GraphVertex> allResourceCatalogVertices) {
         LOGGER.info("number of resources: {}", allResourceCatalogVertices.size());
         LOGGER.info("fetching all catalog services");
         return toscaElementOperation.getListOfHighestComponents(ComponentTypeEnum.SERVICE, EXCLUDE_TYPES, JsonParseFlagEnum.ParseMetadata)
@@ -113,20 +114,22 @@ public class SdcCatalogMigration implements Migration {
                 .map(allServiceVertices -> ListUtils.union(allServiceVertices, allResourceCatalogVertices));
     }
 
-    private TitanOperationStatus associateCatalogRootToCatalogElements(GraphVertex root) {
+    private JanusGraphOperationStatus associateCatalogRootToCatalogElements(GraphVertex root) {
         return getAllCatalogVertices()
                 .either(catalogVertices -> associateCatalogRootToCatalogElements(root, catalogVertices),
                         err -> err);
     }
 
-    private TitanOperationStatus associateCatalogRootToCatalogElements(GraphVertex root, List<GraphVertex> catalogElements) {
+    private JanusGraphOperationStatus associateCatalogRootToCatalogElements(GraphVertex root, List<GraphVertex> catalogElements) {
         LOGGER.info("number of catalog elements: {}", catalogElements.size());
         LOGGER.info("connect all catalog elements to root edge");
         List<GraphVertex> nonConnectedElements = catalogElements.stream().filter(this::edgeNotAlreadyExists).collect(Collectors.toList());
         int numOfCreatedEdges = 0;
         for (GraphVertex catalogElement : nonConnectedElements) {
-                TitanOperationStatus edgeCreationStatus = titanDao.createEdge(root, catalogElement, EdgeLabelEnum.CATALOG_ELEMENT, null);
-                if (edgeCreationStatus != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus
+                    edgeCreationStatus = janusGraphDao
+                    .createEdge(root, catalogElement, EdgeLabelEnum.CATALOG_ELEMENT, null);
+                if (edgeCreationStatus != JanusGraphOperationStatus.OK) {
                     LOGGER.error("failed to create edge from catalog element to vertex {}", catalogElement.getUniqueId());
                     return edgeCreationStatus;
                 }
@@ -134,7 +137,7 @@ public class SdcCatalogMigration implements Migration {
                 numOfCreatedEdges++;
         }
         LOGGER.info("number edges created: {}", numOfCreatedEdges);
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     private boolean edgeNotAlreadyExists(GraphVertex catalogElement) {