diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr')
2 files changed, 15 insertions, 13 deletions
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(); } |