AT&T 1712 and 1802 release code

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

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteService.groovy
index 6dd27b2..8d9defd 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteService.groovy
@@ -24,7 +24,7 @@ import static org.apache.commons.lang3.StringUtils.*
 \r
 import org.apache.commons.lang3.*\r
 import org.camunda.bpm.engine.delegate.BpmnError\r
-import org.camunda.bpm.engine.runtime.Execution\r
+import org.camunda.bpm.engine.delegate.DelegateExecution\r
 import org.openecomp.mso.rest.APIResponse\r
 import org.springframework.web.util.UriUtils\r
 \r
@@ -85,7 +85,7 @@ class GenericDeleteService extends AbstractServiceTaskProcessor{
         *\r
         * @param - execution\r
         */\r
-       public void preProcessRequest(Execution execution) {\r
+       public void preProcessRequest(DelegateExecution execution) {\r
                def isDebugEnabled = execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                utils.log("DEBUG", " *** STARTED GenericDeleteService PreProcessRequest Process*** ", isDebugEnabled)\r
@@ -153,7 +153,7 @@ class GenericDeleteService extends AbstractServiceTaskProcessor{
         *\r
         * @param - execution\r
         */\r
-       public void getServiceResourceVersion(Execution execution){\r
+       public void getServiceResourceVersion(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                utils.log("DEBUG", " *** STARTED GenericDeleteService GetServiceResourceVersion Process*** ", isDebugEnabled)\r
@@ -193,6 +193,7 @@ class GenericDeleteService extends AbstractServiceTaskProcessor{
                        \r
                        String aaiResponse = response.getResponseBodyAsString()\r
                        aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)\r
+                       aaiResponse = aaiResponse.replaceAll("&", "&")\r
                        execution.setVariable("GENDS_getServiceResponse", aaiResponse)\r
 \r
                        utils.logAudit("GET Service Instance response : " + aaiResponse)\r
@@ -231,7 +232,7 @@ class GenericDeleteService extends AbstractServiceTaskProcessor{
         *\r
         * @param - execution\r
         */\r
-       public void deleteServiceObject(Execution execution){\r
+       public void deleteServiceObject(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                utils.log("DEBUG", " *** STARTED GenericDeleteService DeleteServiceObject Process*** ", isDebugEnabled)\r