Upgrade SDC from Titan to Janus Graph

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

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
index 96b0832..768a96e 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
@@ -10,9 +10,9 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.springframework.stereotype.Component;
@@ -20,25 +20,25 @@ import org.springframework.stereotype.Component;
 @Component
 public class CommonTypeOperations {
 
-    private final HealingTitanGenericDao titanGenericDao;
+    private final HealingJanusGraphGenericDao janusGraphGenericDao;
     private final PropertyOperation propertyOperation;
     private final OperationUtils operationUtils;
 
-    public CommonTypeOperations(HealingTitanGenericDao titanGenericDao, PropertyOperation propertyOperation,
-            OperationUtils operationUtils) {
-        this.titanGenericDao = titanGenericDao;
+    public CommonTypeOperations(HealingJanusGraphGenericDao janusGraphGenericDao, PropertyOperation propertyOperation,
+                                OperationUtils operationUtils) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
         this.propertyOperation = propertyOperation;
         this.operationUtils = operationUtils;
     }
 
     public <T extends GraphNode> void addType(T typeData, Class<T> clazz) {
-        titanGenericDao.createNode(typeData, clazz)
+        janusGraphGenericDao.createNode(typeData, clazz)
             .left()
-            .on(operationUtils::onTitanOperationFailure);
+            .on(operationUtils::onJanusGraphOperationFailure);
     }
 
     public <T extends GraphNode> Optional<T> getType(String uniqueId, Class<T> clazz, NodeTypeEnum nodeType) {
-        T type = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, clazz)
+        T type = janusGraphGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, clazz)
                 .left()
                 .on(err -> null);
         return Optional.ofNullable(type);
@@ -48,7 +48,7 @@ public class CommonTypeOperations {
         Map<String, Object> mapCriteria = new HashMap<>();
         mapCriteria.put(GraphPropertiesDictionary.TYPE.getProperty(), type);
         mapCriteria.put(GraphPropertiesDictionary.IS_HIGHEST_VERSION.getProperty(), true);
-        return titanGenericDao.getByCriteria(nodeType, mapCriteria, clazz)
+        return janusGraphGenericDao.getByCriteria(nodeType, mapCriteria, clazz)
                 .left()
                 .on(err -> emptyList())
                 .stream()
@@ -58,13 +58,14 @@ public class CommonTypeOperations {
     public void addProperties(String uniqueId, NodeTypeEnum nodeType, List<PropertyDefinition> properties) {
         propertyOperation.addPropertiesToElementType(uniqueId, nodeType, properties)
             .left()
-            .on(operationUtils::onTitanOperationFailure);
+            .on(operationUtils::onJanusGraphOperationFailure);
     }
 
     public void fillProperties(String uniqueId, NodeTypeEnum nodeType, Consumer<List<PropertyDefinition>> propertySetter) {
-        TitanOperationStatus status = propertyOperation.fillPropertiesList(uniqueId, nodeType, propertySetter);
-        if (status!=TitanOperationStatus.OK) {
-            operationUtils.onTitanOperationFailure(status);
+        JanusGraphOperationStatus
+            status = propertyOperation.fillPropertiesList(uniqueId, nodeType, propertySetter);
+        if (status!= JanusGraphOperationStatus.OK) {
+            operationUtils.onJanusGraphOperationFailure(status);
         }
     }
 
@@ -72,13 +73,13 @@ public class CommonTypeOperations {
      * Handle update of type without dervidedFrom attribute
      */
     public  <T extends GraphNode> void updateType(T typeData, List<PropertyDefinition> properties, Class<T> clazz, NodeTypeEnum nodeType) {
-        titanGenericDao.updateNode(typeData, clazz)
+        janusGraphGenericDao.updateNode(typeData, clazz)
                 .left()
-                .on(operationUtils::onTitanOperationFailure);
+                .on(operationUtils::onJanusGraphOperationFailure);
         Map<String, PropertyDefinition> newProperties = properties.stream()
                 .collect(Collectors.toMap(PropertyDefinition::getName, Function.identity()));
         propertyOperation.mergePropertiesAssociatedToNode(nodeType, typeData.getUniqueId(), newProperties)
                 .left()
-                .on(operationUtils::onTitanOperationFailure);
+                .on(operationUtils::onJanusGraphOperationFailure);
     }
 }