Sync Integ to Master

Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>

6 files changed, 158 insertions, 156 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ICommitHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ICommitHandler.java
index e70b33a938..d7a0f4b8d1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ICommitHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ICommitHandler.java
@@ -23,5 +23,5 @@ package org.openecomp.sdc.common.transaction.api;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 
 public interface ICommitHandler extends IDBType {
-	DBActionCodeEnum doCommit();
+    DBActionCodeEnum doCommit();
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBAction.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBAction.java
index a36e5fe1b5..20763d04f8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBAction.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBAction.java
@@ -21,5 +21,5 @@
 package org.openecomp.sdc.common.transaction.api;
 
 public interface IDBAction {
-	<T> T doAction();
+    <T> T doAction();
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBType.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBType.java
index 4c19e41609..3aa2e9a9d7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBType.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/IDBType.java
@@ -23,5 +23,5 @@ package org.openecomp.sdc.common.transaction.api;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
 
 public interface IDBType {
-	DBTypeEnum getDBType();
+    DBTypeEnum getDBType();
 }
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 5a10e9029c..ea041359fd 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
@@ -20,21 +20,20 @@
 
 package org.openecomp.sdc.common.transaction.api;
 
+import fj.data.Either;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.ESActionTypeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.TransactionCodeEnum;
 
-import fj.data.Either;
-
 public interface ITransactionSdnc {
-	TransactionCodeEnum finishTransaction();
+    TransactionCodeEnum finishTransaction();
 
-	Either<DBActionCodeEnum, TransactionCodeEnum> invokeESAction(boolean isLastAction, ESActionTypeEnum esActiontype, ESArtifactData artifactData);
+    Either<DBActionCodeEnum, TransactionCodeEnum> invokeESAction(boolean isLastAction, ESActionTypeEnum esActiontype, ESArtifactData artifactData);
 
-	<T> Either<T, TransactionCodeEnum> invokeGeneralDBAction(boolean isLastAction, DBTypeEnum dbType, IDBAction dbAction, IDBAction dbRollbackAction);
+    <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> invokeTitanAction(boolean isLastAction, IDBAction dbAction);
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java
index 97a8083e88..a44073971e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java
@@ -20,102 +20,105 @@
 
 package org.openecomp.sdc.common.transaction.api;
 
-import java.util.Stack;
-
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.LogMessages;
 import org.openecomp.sdc.common.util.MethodActivationStatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Stack;
+
 public abstract class RollbackHandler implements IDBType {
-	private static Logger log = LoggerFactory.getLogger(RollbackHandler.class.getName());
-	private Stack<IDBAction> dbActionRollbacks;
-
-	private Integer transactionId;
-	private String userId, actionType;
-
-	protected RollbackHandler(Integer transactionId, String userId, String actionType) {
-		if (isRollbackForPersistenceData()) {
-			dbActionRollbacks = new Stack<>();
-		}
-		this.transactionId = transactionId;
-		this.userId = userId;
-		this.actionType = actionType;
-	}
-
-	public MethodActivationStatusEnum addRollbackAction(IDBAction rollbackAction) {
-		MethodActivationStatusEnum result = MethodActivationStatusEnum.SUCCESS;
-		if (isRollbackForPersistenceData()) {
-			dbActionRollbacks.push(rollbackAction);
-		} else {
-			result = MethodActivationStatusEnum.NOT_ALLOWED;
-		}
-		return result;
-	}
-
-	public DBActionCodeEnum doRollback() {
-		DBActionCodeEnum result;
-
-		try {
-			if (isRollbackForPersistenceData()) {
-				result = doPersistenceDataRollback();
-			} else {
-				log.debug(LogMessages.ROLLBACK_NON_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
-				log.debug(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_NON_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
-				result = doNonPersistenceDataRollback();
-			}
-			if (result != DBActionCodeEnum.SUCCESS) {
-				log.error(LogMessages.ROLLBACK_FAILED_ON_DB, transactionId, getDBType().name(), userId, actionType);
-				log.error(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_FAILED_ON_DB, transactionId, getDBType().name(), userId, actionType);
-			}
-
-		} catch (Exception e) {
-			result = DBActionCodeEnum.FAIL_GENERAL;
-			log.error(LogMessages.ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION, transactionId, getDBType().name(), e.getMessage(), userId, actionType);
-			log.debug(LogMessages.ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION, transactionId, getDBType().name(), e.getMessage(), userId, actionType, e);
-			log.error(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION, transactionId, getDBType().name(), e.getMessage(), userId, actionType);
-		}
-
-		return result;
-	}
-
-	private <T> DBActionCodeEnum doPersistenceDataRollback() {
-		DBActionCodeEnum result = DBActionCodeEnum.SUCCESS;
-		while (!dbActionRollbacks.empty()) {
-			log.debug(LogMessages.ROLLBACK_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
-			log.debug(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
-			IDBAction rollbackAction = dbActionRollbacks.pop();
-			T rollbackResult = rollbackAction.doAction();
-			if (!isRollbackResultValid(rollbackResult)) {
-				result = DBActionCodeEnum.FAIL_GENERAL;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Override for specific logic
-	 * 
-	 * @param <T>
-	 */
-	public <T> boolean isRollbackResultValid(T rollbackResult) {
-		return true;
-	}
-
-	/**
-	 * Override for specific logic
-	 */
-	public DBActionCodeEnum doNonPersistenceDataRollback() {
-		return DBActionCodeEnum.SUCCESS;
-	}
-
-	protected abstract boolean isRollbackForPersistenceData();
-
-	/**
-	 * Only Used for Unit Tests !
-	 */
-	public static void setLog(Logger log) {
-		RollbackHandler.log = log;
-	}
+
+    // TODO test using slf4j-test and make this final
+    private static Logger log = LoggerFactory.getLogger(RollbackHandler.class);
+    private Stack<IDBAction> dbActionRollbacks;
+
+    private Integer transactionId;
+    private String userId, actionType;
+
+    protected RollbackHandler(Integer transactionId, String userId, String actionType) {
+        if (isRollbackForPersistenceData()) {
+            dbActionRollbacks = new Stack<>();
+        }
+        this.transactionId = transactionId;
+        this.userId = userId;
+        this.actionType = actionType;
+    }
+
+    public MethodActivationStatusEnum addRollbackAction(IDBAction rollbackAction) {
+        MethodActivationStatusEnum result = MethodActivationStatusEnum.SUCCESS;
+        if (isRollbackForPersistenceData()) {
+            dbActionRollbacks.push(rollbackAction);
+        } else {
+            result = MethodActivationStatusEnum.NOT_ALLOWED;
+        }
+        return result;
+    }
+
+    public DBActionCodeEnum doRollback() {
+        DBActionCodeEnum result;
+
+        try {
+            if (isRollbackForPersistenceData()) {
+                result = doPersistenceDataRollback();
+            } else {
+                log.debug(LogMessages.ROLLBACK_NON_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
+                log.debug(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_NON_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
+                result = doNonPersistenceDataRollback();
+            }
+            if (result != DBActionCodeEnum.SUCCESS) {
+                log.error(LogMessages.ROLLBACK_FAILED_ON_DB, transactionId, getDBType().name(), userId, actionType);
+                log.error(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_FAILED_ON_DB, transactionId, getDBType().name(), userId, actionType);
+            }
+
+        } catch (Exception e) {
+            result = DBActionCodeEnum.FAIL_GENERAL;
+            log.error(LogMessages.ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION, transactionId, getDBType().name(), e.getMessage(), userId, actionType);
+            log.debug(LogMessages.ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION, transactionId, getDBType().name(), e.getMessage(), userId, actionType, e);
+            log.error(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION, transactionId, getDBType().name(), e.getMessage(), userId, actionType);
+        }
+
+        return result;
+    }
+
+    private <T> DBActionCodeEnum doPersistenceDataRollback() {
+        DBActionCodeEnum result = DBActionCodeEnum.SUCCESS;
+        while (!dbActionRollbacks.empty()) {
+            log.debug(LogMessages.ROLLBACK_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
+            log.debug(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
+            IDBAction rollbackAction = dbActionRollbacks.pop();
+            T rollbackResult = rollbackAction.doAction();
+            if (!isRollbackResultValid(rollbackResult)) {
+                result = DBActionCodeEnum.FAIL_GENERAL;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Override for specific logic
+     *
+     * @param <T>
+     */
+    public <T> boolean isRollbackResultValid(T rollbackResult) {
+        return true;
+    }
+
+    /**
+     * Override for specific logic
+     */
+    public DBActionCodeEnum doNonPersistenceDataRollback() {
+        return DBActionCodeEnum.SUCCESS;
+    }
+
+    protected abstract boolean isRollbackForPersistenceData();
+
+    /**
+     * Only Used for Unit Tests !
+     */
+    // TODO test using slf4j-test and remove this
+    public static void setLog(Logger log) {
+        RollbackHandler.log = log;
+    }
 }
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 e90b9618d4..fc7c90509f 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
@@ -25,61 +25,61 @@ import org.slf4j.MarkerFactory;
 
 public final class TransactionUtils {
 
-	private TransactionUtils() {
-
-	}
-
-	public enum DBTypeEnum {
-		ELASTIC_SEARCH, TITAN, MYSTERY, SWIFT
-	}
-
-	public enum TransactionCodeEnum {
-		ROLLBACK_SUCCESS, ROLLBACK_FAILED, SUCCESS, COMMIT_FAILED, MULTIPLE_LAST_ACTION, INTERNAL_ERROR, UNALLOWED_METHOD_USAGE, PREPARE_ROLLBACK_FAILED, TRANSACTION_CLOSED
-	}
-
-	public enum TransactionStatusEnum {
-		OPEN, CLOSED, FAILED_ROLLBACK
-	}
-
-	public enum DBActionCodeEnum {
-		SUCCESS, FAIL_GENERAL, FAIL_MULTIPLE_LAST_ACTION
-	}
-
-	public enum ESActionTypeEnum {
-		ADD_ARTIFACT, UPDATE_ARTIFACT, REMOVE_ARTIFACT
-	}
-
-	public enum ActionTypeEnum {
-		ADD_ARTIFACT, REMOVE_ARTIFACT, UPDATE_ARTIFACT, CREATE_RESOURCE, UPDATE_RESOURCE, DELETE_RESOURCE
-	}
-
-	public static final int MAX_SIZE_TRANSACTION_LIST = 1000;
-
-	public static final int TRANSACTION_ID_RESET_LIMIT = MAX_SIZE_TRANSACTION_LIST * 10;
-
-	public static final String TRANSACTION_MARKER_STR = "TRANSACTION_MARKER";
-
-	public static final String DUMMY_USER = "udummy";
-
-	public static final Marker TRANSACTION_MARKER = MarkerFactory.getMarker(TRANSACTION_MARKER_STR);
-
-	public static class LogMessages {
-		public static final String PRE_INVOKE_ACTION = "About to add Action to SdncTransaction ID:{} for DB:{}, user:{}, action:{}";
-		public static final String INVOKE_ACTION = "invoking Action in SdncTransactionID:{}, on DB:{}, user:{}, action:{}";
-		public static final String COMMIT_ACTION_ALL_DB = "Starting Commit for SdncTransactionID:{} for all DBs, user:{}, action:{}";
-		public static final String COMMIT_ACTION_SPECIFIC_DB = "Starting Commit for SdncTransactionID:{} on DB:{}, user:{}, action:{}";
-		public static final String COMMIT_ON_CLOSED_TRANSACTION = "Commit failed for SdncTransactionID:{} Transaction is in status:{}, user:{}, action:{}";
-		public static final String ACTION_ON_CLOSED_TRANSACTION = "Action failed for SdncTransactionID:{} Transaction is already closed, user:{}, action:{}";
-		public static final String DOUBLE_FINISH_FLAG_ACTION = "Transaction with SdncTransactionID:{} on DB:{} was called multiple times with last action flag, user:{}, action:{}";
-		public static final String DB_ACTION_FAILED_WITH_EXCEPTION = "Action on DB:{} has failed for SdncTransactionID:{}, message:{}, user:{}, action:{}";
-		public static final String ROLLBACK_SUCCEEDED_GENERAL = "Transaction rollback succeeded for SdncTransactionID:{}, user:{}, action:{}";
-		public static final String ROLLBACK_FAILED_GENERAL = "Transaction rollback failed for SdncTransactionID:{}, user:{}, action:{}";
-		public static final String ROLLBACK_FAILED_ON_DB = "Transaction rollback failed for SdncTransactionID:{} on DB:{}, user:{}, action:{}";
-		public static final String ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION = "Transaction rollback failed for SdncTransactionID:{} on DB:{}, exception message:{}, user:{}, action:{}";
-		public static final String ROLLBACK_PERSISTENT_ACTION = "About To Rollback Action on DB{} for TransactionID:{} ... user:{}, action:{}";
-		public static final String ROLLBACK_NON_PERSISTENT_ACTION = "About To Rollback Actions on DB{} for TransactionID:{} ...  user:{}, action:{}";
-		public static final String CREATE_ROLLBACK_HANDLER = "creating new Rollback Handler For DB:{} in SdncTransaction ID:{}, user:{}, action:{}";
-		public static final String FAILED_CREATE_ROLLBACK = "failed to create new Rollback action For DB:{} with SdncTransactionID:{}, user:{}, action:{}";
-	}
+    private TransactionUtils() {
+
+    }
+
+    public enum DBTypeEnum {
+        ELASTIC_SEARCH, TITAN, MYSTERY, SWIFT
+    }
+
+    public enum TransactionCodeEnum {
+        ROLLBACK_SUCCESS, ROLLBACK_FAILED, SUCCESS, COMMIT_FAILED, MULTIPLE_LAST_ACTION, INTERNAL_ERROR, UNALLOWED_METHOD_USAGE, PREPARE_ROLLBACK_FAILED, TRANSACTION_CLOSED
+    }
+
+    public enum TransactionStatusEnum {
+        OPEN, CLOSED, FAILED_ROLLBACK
+    }
+
+    public enum DBActionCodeEnum {
+        SUCCESS, FAIL_GENERAL, FAIL_MULTIPLE_LAST_ACTION
+    }
+
+    public enum ESActionTypeEnum {
+        ADD_ARTIFACT, UPDATE_ARTIFACT, REMOVE_ARTIFACT
+    }
+
+    public enum ActionTypeEnum {
+        ADD_ARTIFACT, REMOVE_ARTIFACT, UPDATE_ARTIFACT, CREATE_RESOURCE, UPDATE_RESOURCE, DELETE_RESOURCE
+    }
+
+    public static final int MAX_SIZE_TRANSACTION_LIST = 1000;
+
+    public static final int TRANSACTION_ID_RESET_LIMIT = MAX_SIZE_TRANSACTION_LIST * 10;
+
+    public static final String TRANSACTION_MARKER_STR = "TRANSACTION_MARKER";
+
+    public static final String DUMMY_USER = "udummy";
+
+    public static final Marker TRANSACTION_MARKER = MarkerFactory.getMarker(TRANSACTION_MARKER_STR);
+
+    public static class LogMessages {
+        public static final String PRE_INVOKE_ACTION = "About to add Action to SdncTransaction ID:{} for DB:{}, user:{}, action:{}";
+        public static final String INVOKE_ACTION = "invoking Action in SdncTransactionID:{}, on DB:{}, user:{}, action:{}";
+        public static final String COMMIT_ACTION_ALL_DB = "Starting Commit for SdncTransactionID:{} for all DBs, user:{}, action:{}";
+        public static final String COMMIT_ACTION_SPECIFIC_DB = "Starting Commit for SdncTransactionID:{} on DB:{}, user:{}, action:{}";
+        public static final String COMMIT_ON_CLOSED_TRANSACTION = "Commit failed for SdncTransactionID:{} Transaction is in status:{}, user:{}, action:{}";
+        public static final String ACTION_ON_CLOSED_TRANSACTION = "Action failed for SdncTransactionID:{} Transaction is already closed, user:{}, action:{}";
+        public static final String DOUBLE_FINISH_FLAG_ACTION = "Transaction with SdncTransactionID:{} on DB:{} was called multiple times with last action flag, user:{}, action:{}";
+        public static final String DB_ACTION_FAILED_WITH_EXCEPTION = "Action on DB:{} has failed for SdncTransactionID:{}, message:{}, user:{}, action:{}";
+        public static final String ROLLBACK_SUCCEEDED_GENERAL = "Transaction rollback succeeded for SdncTransactionID:{}, user:{}, action:{}";
+        public static final String ROLLBACK_FAILED_GENERAL = "Transaction rollback failed for SdncTransactionID:{}, user:{}, action:{}";
+        public static final String ROLLBACK_FAILED_ON_DB = "Transaction rollback failed for SdncTransactionID:{} on DB:{}, user:{}, action:{}";
+        public static final String ROLLBACK_FAILED_ON_DB_WITH_EXCEPTION = "Transaction rollback failed for SdncTransactionID:{} on DB:{}, exception message:{}, user:{}, action:{}";
+        public static final String ROLLBACK_PERSISTENT_ACTION = "About To Rollback Action on DB{} for TransactionID:{} ... user:{}, action:{}";
+        public static final String ROLLBACK_NON_PERSISTENT_ACTION = "About To Rollback Actions on DB{} for TransactionID:{} ...  user:{}, action:{}";
+        public static final String CREATE_ROLLBACK_HANDLER = "creating new Rollback Handler For DB:{} in SdncTransaction ID:{}, user:{}, action:{}";
+        public static final String FAILED_CREATE_ROLLBACK = "failed to create new Rollback action For DB:{} with SdncTransactionID:{}, user:{}, action:{}";
+    }
 
 }