AT&T 1712 and 1802 release code

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

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy
index cfc5171..3b380a9 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy
@@ -22,7 +22,7 @@ package org.openecomp.mso.bpmn.common.scripts
 \r
 import org.apache.commons.lang3.StringEscapeUtils\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
@@ -101,7 +101,7 @@ class GenericGetService extends AbstractServiceTaskProcessor{
         * @param - execution\r
         *\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 GenericGetService PreProcessRequest Process*** ", isDebugEnabled)\r
@@ -187,7 +187,7 @@ class GenericGetService extends AbstractServiceTaskProcessor{
         *\r
         * @param - execution\r
         */\r
-       public void obtainServiceInstanceUrlById(Execution execution){\r
+       public void obtainServiceInstanceUrlById(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                utils.log("DEBUG", " *** STARTED GenericGetService ObtainServiceInstanceUrlById Process*** ", isDebugEnabled)\r
@@ -269,7 +269,7 @@ class GenericGetService extends AbstractServiceTaskProcessor{
         *\r
         * @param - execution\r
         */\r
-       public void obtainServiceInstanceUrlByName(Execution execution){\r
+       public void obtainServiceInstanceUrlByName(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                utils.log("DEBUG", " *** STARTED GenericGetService ObtainServiceInstanceUrlByName Process*** ", isDebugEnabled)\r
@@ -339,7 +339,7 @@ class GenericGetService extends AbstractServiceTaskProcessor{
         *\r
         * @param - execution\r
         */\r
-       public void getServiceObject(Execution execution){\r
+       public void getServiceObject(DelegateExecution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix",Prefix)\r
                utils.log("DEBUG", " *** STARTED GenericGetService GetServiceObject Process*** ", isDebugEnabled)\r
@@ -410,6 +410,7 @@ class GenericGetService extends AbstractServiceTaskProcessor{
                        aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)\r
                        execution.setVariable("GENGS_getServiceResponse", aaiResponse)\r
                        utils.logAudit("GenericGetService AAI Response: " + aaiResponse)\r
+                       aaiResponse = aaiResponse.replaceAll("&", "&")\r
                        //Process Response\r
                        if(responseCode == 200 || responseCode == 202){\r
                                utils.log("DEBUG", "GET Service Received a Good Response Code", isDebugEnabled)\r