6 files changed, 35 insertions, 33 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java
index ea041359fd..b964321c8a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java
@@ -34,6 +34,6 @@ public interface ITransactionSdnc {
 
     <T> Either<T, TransactionCodeEnum> invokeGeneralDBAction(boolean isLastAction, DBTypeEnum dbType, IDBAction dbAction, IDBAction dbRollbackAction);
 
-    <T> Either<T, TransactionCodeEnum> invokeTitanAction(boolean isLastAction, IDBAction dbAction);
+    <T> Either<T, TransactionCodeEnum> invokeJanusGraphAction(boolean isLastAction, IDBAction dbAction);
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/TransactionUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/TransactionUtils.java
index fc7c90509f..60f89ce012 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/TransactionUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/TransactionUtils.java
@@ -30,7 +30,7 @@ public final class TransactionUtils {
     }
 
     public enum DBTypeEnum {
-        ELASTIC_SEARCH, TITAN, MYSTERY, SWIFT
+        ELASTIC_SEARCH, JANUSGRAPH, MYSTERY, SWIFT
     }
 
     public enum TransactionCodeEnum {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/TitanCommitHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/JanusGraphCommitHandler.java
index c86241ebf1..dad79b5f76 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/TitanCommitHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/JanusGraphCommitHandler.java
@@ -20,25 +20,25 @@
 
 package org.openecomp.sdc.common.transaction.impl;
 
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.common.transaction.api.ICommitHandler;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
 
-public class TitanCommitHandler implements ICommitHandler {
+public class JanusGraphCommitHandler implements ICommitHandler {
 
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
-    public TitanCommitHandler(TitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public JanusGraphCommitHandler(JanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     @Override
     public DBActionCodeEnum doCommit() {
         DBActionCodeEnum result = DBActionCodeEnum.SUCCESS;
-        TitanOperationStatus titanStatus = titanGenericDao.commit();
-        if (titanStatus != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus janusGraphStatus = janusGraphGenericDao.commit();
+        if (janusGraphStatus != JanusGraphOperationStatus.OK) {
             result = DBActionCodeEnum.FAIL_GENERAL;
         }
         return result;
@@ -46,7 +46,7 @@ public class TitanCommitHandler implements ICommitHandler {
 
     @Override
     public DBTypeEnum getDBType() {
-        return DBTypeEnum.TITAN;
+        return DBTypeEnum.JANUSGRAPH;
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/TitanRollbackHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/JanusGraphRollbackHandler.java
index 89d2b9da8e..ed2633fa11 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/TitanRollbackHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/JanusGraphRollbackHandler.java
@@ -20,23 +20,23 @@
 
 package org.openecomp.sdc.common.transaction.impl;
 
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.common.transaction.api.RollbackHandler;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
 
-public class TitanRollbackHandler extends RollbackHandler {
+public class JanusGraphRollbackHandler extends RollbackHandler {
 
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
-    public TitanRollbackHandler(Integer transactionId, String userId, String actionType, TitanGenericDao titanGenericDao) {
+    public JanusGraphRollbackHandler(Integer transactionId, String userId, String actionType, JanusGraphGenericDao janusGraphGenericDao) {
         super(transactionId, userId, actionType);
-        this.titanGenericDao = titanGenericDao;
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     public DBTypeEnum getDBType() {
-        return DBTypeEnum.TITAN;
+        return DBTypeEnum.JANUSGRAPH;
     }
 
     protected boolean isRollbackForPersistenceData() {
@@ -45,8 +45,8 @@ public class TitanRollbackHandler extends RollbackHandler {
 
     public DBActionCodeEnum doNonPersistenceDataRollback() {
         DBActionCodeEnum result = DBActionCodeEnum.SUCCESS;
-        TitanOperationStatus titanStatus = titanGenericDao.rollback();
-        if (titanStatus != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus janusGraphStatus = janusGraphGenericDao.rollback();
+        if (janusGraphStatus != JanusGraphOperationStatus.OK) {
             result = DBActionCodeEnum.FAIL_GENERAL;
         }
         return result;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java
index 9d95c26ec9..78264484fb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java
@@ -23,7 +23,7 @@ package org.openecomp.sdc.common.transaction.mngr;
 import com.google.common.collect.EvictingQueue;
 import com.google.common.collect.Queues;
 import org.openecomp.sdc.be.dao.impl.ESCatalogDAO;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.transaction.api.ITransactionSdnc;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils;
@@ -45,7 +45,7 @@ public class TransactionManager {
     @Resource
     private ESCatalogDAO esCatalogDao;
     @Resource
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
     /**
      * userId and actionType parameters are used only for logging purposes.
@@ -55,7 +55,8 @@ public class TransactionManager {
             init();
         }
         log.debug("TransactionManager creating new SdncTransaction");
-        ITransactionSdnc tx = new TransactionSdncImpl(generateTransactionID(), userId, actionType, esCatalogDao, titanGenericDao);
+        ITransactionSdnc tx = new TransactionSdncImpl(generateTransactionID(), userId, actionType, esCatalogDao,
+            janusGraphGenericDao);
         transactions.add(tx);
 
         return tx;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java
index 1c07e50e0a..93a2c9db82 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java
@@ -23,15 +23,15 @@ package org.openecomp.sdc.common.transaction.mngr;
 import fj.data.Either;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.impl.ESCatalogDAO;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.transaction.api.*;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.*;
 import org.openecomp.sdc.common.transaction.impl.ESAction;
 import org.openecomp.sdc.common.transaction.impl.ESRollbackHandler;
-import org.openecomp.sdc.common.transaction.impl.TitanCommitHandler;
-import org.openecomp.sdc.common.transaction.impl.TitanRollbackHandler;
+import org.openecomp.sdc.common.transaction.impl.JanusGraphCommitHandler;
+import org.openecomp.sdc.common.transaction.impl.JanusGraphRollbackHandler;
 import org.openecomp.sdc.common.util.MethodActivationStatusEnum;
 
 import java.util.ArrayList;
@@ -45,14 +45,14 @@ public class TransactionSdncImpl implements ITransactionSdnc {
     private RollbackManager rollbackManager;
     private CommitManager commitManager;
     private ESCatalogDAO esCatalogDao;
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
     private Integer transactionId;
     private TransactionStatusEnum status;
     private String userId, actionType;
 
-    TransactionSdncImpl(Integer transactionId, String userId, ActionTypeEnum actionTypeEnum, ESCatalogDAO esCatalogDao, TitanGenericDao titanGenericDao) {
+    TransactionSdncImpl(Integer transactionId, String userId, ActionTypeEnum actionTypeEnum, ESCatalogDAO esCatalogDao, JanusGraphGenericDao janusGraphGenericDao) {
         this.esCatalogDao = esCatalogDao;
-        this.titanGenericDao = titanGenericDao;
+        this.janusGraphGenericDao = janusGraphGenericDao;
         this.transactionId = transactionId;
         this.userId = userId;
         actionType = actionTypeEnum.name();
@@ -64,13 +64,14 @@ public class TransactionSdncImpl implements ITransactionSdnc {
 
     private List<ICommitHandler> initCommitHandlers() {
         List<ICommitHandler> commitHandlers = new ArrayList<>();
-        commitHandlers.add(new TitanCommitHandler(titanGenericDao));
+        commitHandlers.add(new JanusGraphCommitHandler(janusGraphGenericDao));
         return commitHandlers;
     }
 
     private List<RollbackHandler> initRollbackHandlers() {
         List<RollbackHandler> rolebackHandlers = new ArrayList<>();
-        rolebackHandlers.add(new TitanRollbackHandler(transactionId, userId, actionType, titanGenericDao));
+        rolebackHandlers.add(new JanusGraphRollbackHandler(transactionId, userId, actionType,
+            janusGraphGenericDao));
         rolebackHandlers.add(new ESRollbackHandler(transactionId, userId, actionType));
         return rolebackHandlers;
     }
@@ -115,10 +116,10 @@ public class TransactionSdncImpl implements ITransactionSdnc {
         return result;
     }
 
-    public <T> Either<T, TransactionCodeEnum> invokeTitanAction(boolean isLastAction, IDBAction dbAction) {
+    public <T> Either<T, TransactionCodeEnum> invokeJanusGraphAction(boolean isLastAction, IDBAction dbAction) {
         Either<T, TransactionCodeEnum> result;
         if (status == TransactionStatusEnum.OPEN) {
-            result = invokeAction(isLastAction, dbAction, DBTypeEnum.TITAN);
+            result = invokeAction(isLastAction, dbAction, DBTypeEnum.JANUSGRAPH);
         } else {
             result = handleActionOnClosedTransaction();
         }