Merge "Reorder modifiers"

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / openecomp / mso / bpmn / common / scripts / SDNCAdapter.groovy

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapter.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapter.groovy
index d37e889..44c9f3f 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapter.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapter.groovy
@@ -1,6 +1,6 @@
 /*-\r
  * ============LICENSE_START=======================================================\r
- * OPENECOMP - MSO\r
+ * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
  * ================================================================================\r
@@ -22,7 +22,7 @@ package org.openecomp.mso.bpmn.common.scripts;
 \r
 import java.text.SimpleDateFormat\r
 \r
-import org.camunda.bpm.engine.runtime.Execution\r
+import org.camunda.bpm.engine.delegate.DelegateExecution\r
 import org.openecomp.mso.bpmn.core.WorkflowException\r
 \r
 \r
@@ -34,10 +34,10 @@ public class SDNCAdapter extends AbstractServiceTaskProcessor {
        ExceptionUtil exceptionUtil = new ExceptionUtil()\r
 \r
        // Script Task: Process SDNC Workflow Request\r
-       // Params:      Workflow Execution\r
+       // Params:      Workflow DelegateExecution\r
        // Assume:      Received SDNCAdapterWorkflowRequest is in variable 'sdncAdapterWorkflowRequest'\r
        //                      Put created SDNCAdapterRequest in variable 'sdncAdapterRequest'\r
-       public void preProcessRequest (Execution execution) {\r
+       public void preProcessRequest (DelegateExecution execution) {\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                try{\r
 \r
@@ -155,7 +155,7 @@ public class SDNCAdapter extends AbstractServiceTaskProcessor {
                utils.log("DEBUG","=========== End pre Process SDNCRequestScript ===========", isDebugEnabled)\r
        }\r
 \r
-       public void postProcessResponse (Execution execution) {\r
+       public void postProcessResponse (DelegateExecution execution) {\r
 \r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                try{\r
@@ -224,7 +224,7 @@ public class SDNCAdapter extends AbstractServiceTaskProcessor {
                utils.log("DEBUG","=========== End POSTProcess SDNCAdapter ===========", isDebugEnabled)\r
        }\r
 \r
-       public void callbackResponsecheck(Execution execution){\r
+       public void callbackResponsecheck(DelegateExecution execution){\r
 \r
                def sdnccallbackreq=execution.getVariable("sdncAdapterCallbackRequest")\r
                utils.logAudit("sdncAdapterCallbackRequest :" + sdnccallbackreq)\r
@@ -235,7 +235,7 @@ public class SDNCAdapter extends AbstractServiceTaskProcessor {
                }\r
        }\r
 \r
-       public void resetCallbackRequest(Execution execution) {\r
+       public void resetCallbackRequest(DelegateExecution execution) {\r
 \r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
 \r
@@ -269,7 +269,7 @@ public class SDNCAdapter extends AbstractServiceTaskProcessor {
        }\r
 \r
 \r
-       public void prepareDBMessage(Execution execution) {\r
+       public void prepareDBMessage(DelegateExecution execution) {\r
 \r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
 \r
@@ -302,13 +302,13 @@ public class SDNCAdapter extends AbstractServiceTaskProcessor {
                return utcTime;\r
        }\r
 \r
-       public void toggleSuccessIndicator(Execution execution){\r
+       public void toggleSuccessIndicator(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("SDNCA_SuccessIndicator", true)\r
                utils.log("DEBUG","Setting SDNCA Success Indicator to True", isDebugEnabled)\r
        }\r
 \r
-       public void assignError(Execution execution){\r
+       public void assignError(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                utils.log("DEBUG","=========== Started Assign Error ===========", isDebugEnabled)\r
                WorkflowException wf = execution.getVariable("WorkflowException")\r
@@ -322,7 +322,7 @@ public class SDNCAdapter extends AbstractServiceTaskProcessor {
                utils.log("DEBUG","=========== End Assign Error ===========", isDebugEnabled)\r
        }\r
        \r
-       public void setTimeout(Execution execution){\r
+       public void setTimeout(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                utils.log("DEBUG","=========== Started SetTimeout ===========", isDebugEnabled)\r
                utils.log("DEBUG", "Timer expired, telling correlation service to stop listening", isDebugEnabled)\r