diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2018-08-06 04:45:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-06 04:45:19 +0000 |
| commit | 7bc08300d69bdbd3512be206128b3ee344ca8b7b (patch) | |
| tree | b483ec6f22d14192b84ac9f0b31e5199ec65f662 /bpmn/MSOCommonBPMN/src/main/groovy | |
| parent | 5cc2888eae5cc80cb62f502071a87d44e348536c (diff) | |
| parent | d41863f54c30a20a47e0c5c7d7436d4be72dfd7f (diff) | |
Merge "Add junit for MSOCommonBPMN"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/groovy')
2 files changed, 1 insertions, 16 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AppCClient.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AppCClient.groovy index bb1de36eac..5cbbe0ab46 100644 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AppCClient.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AppCClient.groovy @@ -20,21 +20,11 @@ package org.onap.so.bpmn.common.scripts -import org.onap.so.bpmn.core.UrnPropertiesReader - -import java.util.HashMap; import org.camunda.bpm.engine.delegate.BpmnError import org.camunda.bpm.engine.delegate.DelegateExecution -import org.hibernate.event.internal.AbstractLockUpgradeEventListener import org.onap.so.bpmn.core.json.JsonUtils -import org.onap.so.client.appc.ApplicationControllerOrchestrator -import org.onap.so.client.appc.ApplicationControllerOrchestratorException import org.onap.appc.client.lcm.model.Action -import org.onap.appc.client.lcm.model.Status -import org.onap.so.bpmn.appc.payload.PayloadClient import org.onap.so.client.appc.ApplicationControllerAction; -import groovy.transform.TypeChecked; -import java.util.UUID; import org.onap.so.logger.MessageEnum import org.onap.so.logger.MsoLogger @@ -113,7 +103,7 @@ public class AppCClient extends AbstractServiceTaskProcessor{ payload = Optional.of(pay) } if(action.equals(Action.HealthCheck)){ - String healthCheckIndex = execution.getVariable('healthCheckIndex') + Integer healthCheckIndex = (Integer) execution.getVariable('healthCheckIndex') execution.setVariable('workStep', action.toString() + healthCheckIndex) execution.setVariable('healthCheckIndex', healthCheckIndex + 1) } diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy index 9c4c73fb7d..ff5dabf99a 100644 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy @@ -20,7 +20,6 @@ package org.onap.so.bpmn.common.scripts -import org.apache.commons.lang3.* import org.camunda.bpm.engine.delegate.BpmnError import org.camunda.bpm.engine.delegate.DelegateExecution import org.onap.so.logger.MessageEnum @@ -170,8 +169,6 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor { msoLogger.debug("Exception Occured During PreProcessRequest: " + e); exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in " + method) } - -// msoLogger.trace("Completed CompleteMsoProcess preProcessRequest Method "); } public void setUpdateDBstatustoSuccessPayload (DelegateExecution execution){ @@ -303,8 +300,6 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor { msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e); exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method) } - // msoLogger.trace("Completed CompleteMsoProcess PostProcessRequest Method "); - } |