Merge "explicitly type defs and strings for templates"

11 files changed, 34 insertions, 34 deletions

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 c19851d223..865b9ee8a7 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
@@ -243,7 +243,7 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 		msoLogger.trace('Entered ' + method)
 		try {
 
-			def msoCompletionResponse = """
+			String msoCompletionResponse = """
 			<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
 			   <sdncadapterworkflow:out>BPEL ${execution.getVariable("CMSO_mso-bpel-name")} FAILED</sdncadapterworkflow:out>
 			</sdncadapterworkflow:MsoCompletionResponse>
@@ -275,7 +275,7 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 		//		msoLogger.trace("Started CompleteMsoProcess PostProcessRequest Method ");
 				try {
 
-					def msoCompletionResponse = """
+					String msoCompletionResponse = """
 			<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://ecomp.com/mso/workflow/schema/v1">
 			   <sdncadapterworkflow:out>BPEL ${execution.getVariable("CMSO_mso-bpel-name")} completed</sdncadapterworkflow:out>
 			</sdncadapterworkflow:MsoCompletionResponse>
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
index 9732693f38..480dcd5e8f 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
@@ -355,7 +355,7 @@ public class FalloutHandler extends AbstractServiceTaskProcessor {
 			Boolean success = (Boolean) execution.getVariable("FH_success")
 			String out = success ? "Fallout Handler Succeeded" : "Fallout Handler Failed";
 	
-			def falloutHandlerResponse = """
+			String falloutHandlerResponse = """
 					<workflow:FalloutHandlerResponse xmlns:workflow="http://org.onap/so/workflow/schema/v1">
 					   <workflow:out>${MsoUtils.xmlEscape(out)}</workflow:out>
 					</workflow:FalloutHandlerResponse>
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
index 32d1ee74bf..bed857dda8 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
@@ -144,7 +144,7 @@ class SDNCAdapterUtils {
 		def prefix = execution.getVariable('prefix')
 		def request = taskProcessor.getVariable(execution, prefix+'Request')
 
-		def requestInformation = """<request-information>
+		String requestInformation = """<request-information>
 										<request-id>${MsoUtils.xmlEscape(execution.getVariable("mso-request-id"))}</request-id>
 										<request-action>torepl</request-action>
 										<source>${MsoUtils.xmlEscape(execution.getVariable(prefix+"source"))}</source>
@@ -172,7 +172,7 @@ class SDNCAdapterUtils {
 
 		//Build Service Information
 		// Send serviceName from CANOPI to sdnc for service-type
-		def serviceInformation = """<service-information>
+		String serviceInformation = """<service-information>
 									      <service-type>${MsoUtils.xmlEscape(execution.getVariable(prefix+"serviceName"))}</service-type>
 									      <service-instance-id>${MsoUtils.xmlEscape(svcInstanceId)}</service-instance-id>
 									      <subscriber-name>${MsoUtils.xmlEscape(execution.getVariable(prefix+"subscriberName"))}</subscriber-name>
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
index 5eb72bb2f2..ab260e48f3 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
@@ -210,7 +210,7 @@ public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
 				orchestrationStatusEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'orchestration-status')
 			}
 
-			def payload = """
+			String payload = """
 					{	${personaModelVersionEntry}
 						${ipv4OamAddressEntry}
 						${managementV6AddressEntry}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
index 6e09837274..40b0368eaa 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
@@ -116,7 +116,7 @@ class VidUtils {
 		}
 		def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''
 		
-		def xmlReq = """
+		String xmlReq = """
 		<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
 			<request-info>
 				<action>${MsoUtils.xmlEscape(action)}</action>
@@ -251,7 +251,7 @@ class VidUtils {
 			//'sdncVersion' = current, '1610' (non-RPC SDNC) or '1702' (RPC SDNC)
 			def sdncVersion =  execution.getVariable("sdncVersion")
 			
-			def xmlReq = """
+			String xmlReq = """
 			<network-request xmlns="http://www.w3.org/2001/XMLSchema"> 
 			 <request-info> 
 	            <request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
@@ -393,7 +393,7 @@ class VidUtils {
 		   userParamsNode = buildUserParams(userParams)
 		}
 		
-		def xmlReq = """
+		String xmlReq = """
 		<network-request xmlns="http://www.w3.org/2001/XMLSchema"> 
 		 <request-info> 
             <request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
@@ -512,7 +512,7 @@ class VidUtils {
 		def personaModelVersion = requestMap.requestDetails?.modelInfo?.modelUuid ?: ''
 		def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''
 		
-		def xmlReq = """
+		String xmlReq = """
 		<vnf-request>
 			<request-info>
 				<request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/NetworkUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/NetworkUtilsTest.groovy
index 510dcf665c..a920b22c71 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/NetworkUtilsTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/NetworkUtilsTest.groovy
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 class NetworkUtilsTest {
 
-	def volumeRequestXml = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
+	String volumeRequestXml = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
    <request-info>
       <action>CREATE_VF_MODULE_VOL</action>
       <source>VID</source>
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterTest.groovy
index e351210586..3438c7957c 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterTest.groovy
@@ -424,7 +424,7 @@ public class SDNCAdapterTest {
 </rest:payload>
 			</sdncadaptersc:RequestData></aetgt:SDNCAdapterRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>"""
 
-def sdncAdapterResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
+String sdncAdapterResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
 <sdncadapterworkflow:response-data>
 <tag0:CallbackHeader xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1">
    <tag0:RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</tag0:RequestId>
@@ -439,7 +439,7 @@ def sdncAdapterResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xm
 </sdncadapterworkflow:SDNCAdapterWorkflowResponse>
 """
 
-def workflowErrorResponse = """<aetgt:WorkflowException xmlns:aetgt="http://org.onap/so/workflow/schema/v1">
+String workflowErrorResponse = """<aetgt:WorkflowException xmlns:aetgt="http://org.onap/so/workflow/schema/v1">
 								<aetgt:ErrorMessage>Received error from SDN-C: Error processing request to SDNC. Not Found.
 			https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.
 			SDNC Returned-[error-type:application, error-tag:data-missing,
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
index ef71e9073b..51dd77d383 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
@@ -180,7 +180,7 @@ public class SDNCAdapterUtilsTest {
 		def rc = respcode
 		def rm = respmsg
 		
-		def output = """
+		String output = """
 <output xmlns="org:onap:sdnc:northbound:generic-resource">
 		<svc-request-id>8b46e36e-b44f-4085-9404-427be1bc8a3</svc-request-id>
 		<response-code>${MsoUtils.xmlEscape(rc)}</response-code>
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtilTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtilTest.groovy
index 52f59a3fad..14fb60c245 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtilTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtilTest.groovy
@@ -41,7 +41,7 @@ import org.junit.Test
 
 class TrinityExceptionUtilTest {
 	
-	def aotsFault ="""<n1:Fault xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:n1="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd" xmlns:cer="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/ErrorResponse.xsd" xsi:schemaLocation="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd SoapFault-CDM.xsd">
+	String aotsFault ="""<n1:Fault xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:n1="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd" xmlns:cer="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/ErrorResponse.xsd" xsi:schemaLocation="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd SoapFault-CDM.xsd">
 	<n1:faultcode>xml:space</n1:faultcode>
 	<n1:faultstring>String</n1:faultstring>
 	<n1:faultactor>http://test.com</n1:faultactor>
@@ -113,7 +113,7 @@ class TrinityExceptionUtilTest {
 </requestError>
 </Fault>
 			"""	
-		def errorString = """<requestError>
+		String errorString = """<requestError>
 <serviceException>
 <messageId>SVC3002</messageId>
 <text>Error writing output performing %1 on %2 (msg=%3) (ec=%4)</text>
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VidUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VidUtilsTest.groovy
index 1ab049571a..b80cb87c16 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VidUtilsTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VidUtilsTest.groovy
@@ -53,7 +53,7 @@ import org.junit.Test;
 
 class VidUtilsTest {
 
-	def vfModuleReqJson = """
+	String vfModuleReqJson = """
 {
   "requestDetails": {
     "modelInfo": {
@@ -153,7 +153,7 @@ class VidUtilsTest {
   }
 }
 """
-	def bpmnReq1 = """
+	String bpmnReq1 = """
 {
 	"requestDetails": {
 		"modelInfo": {
@@ -220,7 +220,7 @@ class VidUtilsTest {
 }
 """
 
-	def vidUtilResp1 = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
+	String vidUtilResp1 = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
    <request-info>
       <action>CREATE_VF_MODULE_VOL</action>
       <source>VID</source>
@@ -256,7 +256,7 @@ class VidUtilsTest {
 </volume-request>
 """
 	
-	def bpmnReq2 = """
+	String bpmnReq2 = """
 {
 	"requestDetails": {
 		"modelInfo": {
@@ -305,7 +305,7 @@ class VidUtilsTest {
 }
 """
 	
-	def bpmnReqJsonVolumeSuppressRollbackTrue = """
+	String bpmnReqJsonVolumeSuppressRollbackTrue = """
 {
 	"requestDetails": {
 		"modelInfo": {
@@ -354,7 +354,7 @@ class VidUtilsTest {
 }
 """
 
-def bpmnReqJsonVolumeSuppressRollbackFalse = """
+String bpmnReqJsonVolumeSuppressRollbackFalse = """
 {
 	"requestDetails": {
 		"modelInfo": {
@@ -403,7 +403,7 @@ def bpmnReqJsonVolumeSuppressRollbackFalse = """
 }
 """
 
-def bpmnReqJsonVolumeSuppressRollbackNone = """
+String bpmnReqJsonVolumeSuppressRollbackNone = """
 {
 	"requestDetails": {
 		"modelInfo": {
@@ -451,7 +451,7 @@ def bpmnReqJsonVolumeSuppressRollbackNone = """
 }
 """
 
-	def bpmnReqJsonVfModuleSuppressRollbackTrue = """
+	String bpmnReqJsonVfModuleSuppressRollbackTrue = """
 {
 "requestDetails": {
 "modelInfo": {
@@ -518,7 +518,7 @@ def bpmnReqJsonVolumeSuppressRollbackNone = """
 }
 """
 
-def bpmnReqJsonVfModuleSuppressRollbackFalse = """
+String bpmnReqJsonVfModuleSuppressRollbackFalse = """
 {
 "requestDetails": {
 "modelInfo": {
@@ -585,7 +585,7 @@ def bpmnReqJsonVfModuleSuppressRollbackFalse = """
 }
 """
 
-def bpmnReqJsonVfModuleSuppressRollbackNone = """
+String bpmnReqJsonVfModuleSuppressRollbackNone = """
 {
 "requestDetails": {
 "modelInfo": {
@@ -650,7 +650,7 @@ def bpmnReqJsonVfModuleSuppressRollbackNone = """
 }
 }
 """
-	def vidUtilResp2 = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
+	String vidUtilResp2 = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
    <request-info>
       <action>CREATE_VF_MODULE_VOL</action>
       <source>VID</source>
@@ -672,7 +672,7 @@ def bpmnReqJsonVfModuleSuppressRollbackNone = """
 </volume-request>
 """
 	
-def vidUtilVolumeRespBackoutOnFailureFalse = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
+String vidUtilVolumeRespBackoutOnFailureFalse = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
    <request-info>
       <action>CREATE_VF_MODULE_VOL</action>
       <source>VID</source>
@@ -694,7 +694,7 @@ def vidUtilVolumeRespBackoutOnFailureFalse = """<volume-request xmlns="http://ww
 </volume-request>
 """
 
-def vidUtilVolumeRespBackoutOnFailureTrue = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
+String vidUtilVolumeRespBackoutOnFailureTrue = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
    <request-info>
       <action>CREATE_VF_MODULE_VOL</action>
       <source>VID</source>
@@ -716,7 +716,7 @@ def vidUtilVolumeRespBackoutOnFailureTrue = """<volume-request xmlns="http://www
 </volume-request>
 """
 
-def vidUtilVolumeRespBackoutOnFailureEmpty = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
+String vidUtilVolumeRespBackoutOnFailureEmpty = """<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
    <request-info>
       <action>CREATE_VF_MODULE_VOL</action>
       <source>VID</source>
@@ -738,7 +738,7 @@ def vidUtilVolumeRespBackoutOnFailureEmpty = """<volume-request xmlns="http://ww
 </volume-request>
 """
 
-def vidUtilVfModuleRespBackoutOnFailureFalse = """<vnf-request>
+String vidUtilVfModuleRespBackoutOnFailureFalse = """<vnf-request>
    <request-info>
       <request-id>test-request-id-123</request-id>
       <action>CREATE_VF_MODULE</action>
@@ -767,7 +767,7 @@ def vidUtilVfModuleRespBackoutOnFailureFalse = """<vnf-request>
 </vnf-request>
 """
 
-def vidUtilVfModuleRespBackoutOnFailureTrue = """<vnf-request>
+String vidUtilVfModuleRespBackoutOnFailureTrue = """<vnf-request>
    <request-info>
       <request-id>test-request-id-123</request-id>
       <action>CREATE_VF_MODULE</action>
@@ -796,7 +796,7 @@ def vidUtilVfModuleRespBackoutOnFailureTrue = """<vnf-request>
 </vnf-request>
 """
 
-def vidUtilVfModuleRespBackoutOnFailureEmpty = """<vnf-request>
+String vidUtilVfModuleRespBackoutOnFailureEmpty = """<vnf-request>
    <request-info>
       <request-id>test-request-id-123</request-id>
       <action>CREATE_VF_MODULE</action>
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1Test.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1Test.groovy
index 72cde00877..afc180e8a4 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1Test.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1Test.groovy
@@ -79,7 +79,7 @@ public class VnfAdapterRestV1Test {
 
 	}
 
-	def rollbackReq = """
+	String rollbackReq = """
 <rollbackVolumeGroupRequest>
    <volumeGroupRollback>
       <volumeGroupId>8a07b246-155e-4b08-b56e-76e98a3c2d66</volumeGroupId>