[MSO-8] Additional fixes for the second rebase

DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file
not reloaded properly when it's wrong (JSON error or model hierarchy
mistake) at MSO startup

Change-Id: I2853030b78499e2a761706b643ea210955e72de3
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

[MSO-8] Restore files removed in patch set 2

Those groovy files must be there

Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

1 files changed, 105 insertions, 105 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
index af615e379d..6f012bcb88 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_D5VzAHElEeaJwpcpVN5gXw" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_D5VzAHElEeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="GenericGetService" name="GenericGetService" isExecutable="true">
     <bpmn2:scriptTask id="intialization" name="Initialization" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
@@ -9,16 +9,16 @@ GenericGetService getService = new GenericGetService()
 getService.preProcessRequest(execution)
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="getUrl"/>
-    <bpmn2:exclusiveGateway id="getUrl" name="Get Url?" default="getUrlNo">
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="getUrl" />
+    <bpmn2:exclusiveGateway id="getUrl" name="Need Object&#39;s Url?" default="getUrlNo">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>getUrlYes</bpmn2:outgoing>
       <bpmn2:outgoing>getUrlNo</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="getUrlYes" name="Yes" sourceRef="getUrl" targetRef="obtain">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_obtainServiceInstanceUrl" ) == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_obtainObjectsUrl" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="getUrlNo" name="No" sourceRef="getUrl" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:sequenceFlow id="getUrlNo" name="No" sourceRef="getUrl" targetRef="ExclusiveGateway_2" />
     <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">
       <bpmn2:scriptTask id="processBPMNException" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
@@ -28,12 +28,12 @@ getService.preProcessRequest(execution)
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="processBPMNException" targetRef="EndEvent_2"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="processBPMNException" targetRef="EndEvent_2" />
       <bpmn2:startEvent id="StartEvent_2">
         <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1"/>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />
       </bpmn2:startEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="StartEvent_2" targetRef="processBPMNException"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="StartEvent_2" targetRef="processBPMNException" />
       <bpmn2:endEvent id="EndEvent_2">
         <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
       </bpmn2:endEvent>
@@ -46,43 +46,43 @@ GenericGetService getService = new GenericGetService()
 getService.setSuccessIndicator(execution, true)
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1"/>
-    <bpmn2:scriptTask id="getServiceInstance" name="GET&#xD;&#xA;Service Instance" scriptFormat="groovy">
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1" />
+    <bpmn2:scriptTask id="getServiceInstance" name="GET&#10;Object" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.getServiceObject(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getServiceInstance" targetRef="toggleSuccess"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getServiceInstance" targetRef="toggleSuccess" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_2">
       <bpmn2:incoming>getUrlNo</bpmn2:incoming>
       <bpmn2:incoming>foundYes</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_2" targetRef="getServiceInstance"/>
-    <bpmn2:scriptTask id="obtainServiceUrlById" name="Obtain Service URL Using&#xD;&#xA;Id" scriptFormat="groovy">
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_2" targetRef="getServiceInstance" />
+    <bpmn2:scriptTask id="obtainServiceUrlById" name="Node Query Using Id&#10;" scriptFormat="groovy">
       <bpmn2:incoming>obtainById</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.obtainServiceInstanceUrlById(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="obtainServiceUrlById" targetRef="ExclusiveGateway_3"/>
-    <bpmn2:scriptTask id="obtainServiceUrlByName" name="Obtain Service Url Using&#xD;&#xA;Name" scriptFormat="groovy">
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="obtainServiceUrlById" targetRef="ExclusiveGateway_3" />
+    <bpmn2:scriptTask id="obtainServiceUrlByName" name="Node Query Using Name" scriptFormat="groovy">
       <bpmn2:incoming>obtainByName</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.obtainServiceInstanceUrlByName(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="obtainServiceUrlByName" targetRef="ExclusiveGateway_3"/>
-    <bpmn2:exclusiveGateway id="obtain" name="Obtain By?" default="obtainById">
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="obtainServiceUrlByName" targetRef="ExclusiveGateway_3" />
+    <bpmn2:exclusiveGateway id="obtain" name="Query By?" default="obtainById">
       <bpmn2:incoming>getUrlYes</bpmn2:incoming>
       <bpmn2:outgoing>obtainById</bpmn2:outgoing>
       <bpmn2:outgoing>obtainByName</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="obtainById" name="Id" sourceRef="obtain" targetRef="obtainServiceUrlById"/>
+    <bpmn2:sequenceFlow id="obtainById" name="Id" sourceRef="obtain" targetRef="obtainServiceUrlById" />
     <bpmn2:sequenceFlow id="obtainByName" name="Name" sourceRef="obtain" targetRef="obtainServiceUrlByName">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_obtainServiceInstanceUrlByName" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
@@ -94,226 +94,226 @@ getService.obtainServiceInstanceUrlByName(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="foundYes" name="Yes" sourceRef="serviceFoundCheck" targetRef="ExclusiveGateway_2">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="notFound" name="No" sourceRef="serviceFoundCheck" targetRef="EndEvent_3"/>
+    <bpmn2:sequenceFlow id="notFound" name="No" sourceRef="serviceFoundCheck" targetRef="EndEvent_3" />
     <bpmn2:endEvent id="EndEvent_3">
       <bpmn2:incoming>notFound</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_29"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_29" />
     </bpmn2:endEvent>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_3">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ExclusiveGateway_3" targetRef="serviceFoundCheck"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ExclusiveGateway_3" targetRef="serviceFoundCheck" />
     <bpmn2:endEvent id="EndEvent_1">
       <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_26"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_26" />
     </bpmn2:endEvent>
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization" />
   </bpmn2:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericGetService">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_69" bpmnElement="StartEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="108.0" y="264.0"/>
+        <dc:Bounds x="108" y="264" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="126.0" y="305.0"/>
+          <dc:Bounds x="126" y="305" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_288" bpmnElement="intialization">
-        <dc:Bounds height="80.0" width="100.0" x="228.0" y="242.0"/>
+        <dc:Bounds x="228" y="242" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_69" targetElement="_BPMNShape_ScriptTask_288">
-        <di:waypoint xsi:type="dc:Point" x="144.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="228.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="144" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="228" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="177.0" y="282.0"/>
+          <dc:Bounds x="177" y="282" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_227" bpmnElement="getUrl" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="372.0" y="256.0"/>
+        <dc:Bounds x="372" y="256" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="70.0" x="408.0" y="286.0"/>
+          <dc:Bounds x="420" y="282" width="72" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_288" targetElement="_BPMNShape_ExclusiveGateway_227">
-        <di:waypoint xsi:type="dc:Point" x="328.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="372.0" y="281.0"/>
+        <di:waypoint xsi:type="dc:Point" x="328" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="372" y="281" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="350.0" y="281.0"/>
+          <dc:Bounds x="350" y="281" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_289" bpmnElement="obtainServiceUrlById">
-        <dc:Bounds height="80.0" width="100.0" x="528.0" y="197.0"/>
+        <dc:Bounds x="528" y="197" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_228" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="738.0" y="256.0"/>
+        <dc:Bounds x="738" y="256" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="763.0" y="311.0"/>
+          <dc:Bounds x="763" y="311" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_290" bpmnElement="getServiceInstance">
-        <dc:Bounds height="80.0" width="100.0" x="820.0" y="242.0"/>
+        <dc:Bounds x="820" y="242" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="getUrlYes" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_ExclusiveGateway_233">
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="256.0"/>
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="170.0"/>
-        <di:waypoint xsi:type="dc:Point" x="446.0" y="170.0"/>
+        <di:waypoint xsi:type="dc:Point" x="397" y="256" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="170" />
+        <di:waypoint xsi:type="dc:Point" x="446" y="170" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="397.0" y="213.0"/>
+          <dc:Bounds x="397" y="213" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_289" targetElement="_BPMNShape_ExclusiveGateway_234">
-        <di:waypoint xsi:type="dc:Point" x="628.0" y="237.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="237.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="195.0"/>
+        <di:waypoint xsi:type="dc:Point" x="628" y="237" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="237" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="195" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="668.0" y="221.0"/>
+          <dc:Bounds x="668" y="221" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ExclusiveGateway_228" targetElement="_BPMNShape_ScriptTask_290">
-        <di:waypoint xsi:type="dc:Point" x="788.0" y="281.0"/>
-        <di:waypoint xsi:type="dc:Point" x="820.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="788" y="281" />
+        <di:waypoint xsi:type="dc:Point" x="820" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="798.0" y="281.0"/>
+          <dc:Bounds x="798" y="281" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="getUrlNo" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_ExclusiveGateway_228">
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="306.0"/>
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="370.0"/>
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="370.0"/>
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="306.0"/>
+        <di:waypoint xsi:type="dc:Point" x="397" y="306" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="370" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="370" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="306" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="400.0" y="324.0"/>
+          <dc:Bounds x="400" y="324" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_291" bpmnElement="toggleSuccess">
-        <dc:Bounds height="80.0" width="100.0" x="960.0" y="242.0"/>
+        <dc:Bounds x="960" y="242" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_290" targetElement="_BPMNShape_ScriptTask_291">
-        <di:waypoint xsi:type="dc:Point" x="920.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="960.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="920" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="960" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="937.0" y="282.0"/>
+          <dc:Bounds x="937" y="282" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_223" bpmnElement="EndEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="1133.0" y="264.0"/>
+        <dc:Bounds x="1133" y="264" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="1151.0" y="305.0"/>
+          <dc:Bounds x="1151" y="305" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_291" targetElement="_BPMNShape_EndEvent_223">
-        <di:waypoint xsi:type="dc:Point" x="1060.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1133.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1060" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="1133" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1100.0" y="282.0"/>
+          <dc:Bounds x="1100" y="282" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_25" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">
-        <dc:Bounds height="169.0" width="325.0" x="152.0" y="468.0"/>
+        <dc:Bounds x="152" y="468" width="325" height="169" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_2">
-        <dc:Bounds height="36.0" width="36.0" x="176.0" y="535.0"/>
+        <dc:Bounds x="176" y="535" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="194.0" y="576.0"/>
+          <dc:Bounds x="194" y="576" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_224" bpmnElement="EndEvent_2">
-        <dc:Bounds height="36.0" width="36.0" x="416.0" y="535.0"/>
+        <dc:Bounds x="416" y="535" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="434.0" y="576.0"/>
+          <dc:Bounds x="434" y="576" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_292" bpmnElement="processBPMNException">
-        <dc:Bounds height="80.0" width="100.0" x="265.0" y="513.0"/>
+        <dc:Bounds x="265" y="513" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_292">
-        <di:waypoint xsi:type="dc:Point" x="212.0" y="553.0"/>
-        <di:waypoint xsi:type="dc:Point" x="265.0" y="553.0"/>
+        <di:waypoint xsi:type="dc:Point" x="212" y="553" />
+        <di:waypoint xsi:type="dc:Point" x="265" y="553" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="233.0" y="553.0"/>
+          <dc:Bounds x="233" y="553" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_292" targetElement="_BPMNShape_EndEvent_224">
-        <di:waypoint xsi:type="dc:Point" x="365.0" y="553.0"/>
-        <di:waypoint xsi:type="dc:Point" x="416.0" y="553.0"/>
+        <di:waypoint xsi:type="dc:Point" x="365" y="553" />
+        <di:waypoint xsi:type="dc:Point" x="416" y="553" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="385.0" y="553.0"/>
+          <dc:Bounds x="385" y="553" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_301" bpmnElement="obtainServiceUrlByName">
-        <dc:Bounds height="80.0" width="100.0" x="528.0" y="59.0"/>
+        <dc:Bounds x="528" y="59" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_233" bpmnElement="obtain" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="446.0" y="145.0"/>
+        <dc:Bounds x="446" y="145" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="71.0" x="496.0" y="162.0"/>
+          <dc:Bounds x="501" y="164" width="53" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_234" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="646.0" y="145.0"/>
+        <dc:Bounds x="646" y="145" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="671.0" y="200.0"/>
+          <dc:Bounds x="671" y="200" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="obtainById" sourceElement="_BPMNShape_ExclusiveGateway_233" targetElement="_BPMNShape_ScriptTask_289">
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="195.0"/>
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="236.0"/>
-        <di:waypoint xsi:type="dc:Point" x="528.0" y="237.0"/>
+        <di:waypoint xsi:type="dc:Point" x="471" y="195" />
+        <di:waypoint xsi:type="dc:Point" x="471" y="236" />
+        <di:waypoint xsi:type="dc:Point" x="528" y="237" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="16.0" x="476.0" y="207.0"/>
+          <dc:Bounds x="476" y="207" width="16" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="obtainByName" sourceElement="_BPMNShape_ExclusiveGateway_233" targetElement="_BPMNShape_ScriptTask_301">
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="145.0"/>
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="99.0"/>
-        <di:waypoint xsi:type="dc:Point" x="528.0" y="99.0"/>
+        <di:waypoint xsi:type="dc:Point" x="471" y="145" />
+        <di:waypoint xsi:type="dc:Point" x="471" y="99" />
+        <di:waypoint xsi:type="dc:Point" x="528" y="99" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="40.0" x="471.0" y="115.0"/>
+          <dc:Bounds x="471" y="115" width="40" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_301" targetElement="_BPMNShape_ExclusiveGateway_234">
-        <di:waypoint xsi:type="dc:Point" x="628.0" y="99.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="99.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="145.0"/>
+        <di:waypoint xsi:type="dc:Point" x="628" y="99" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="99" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="145" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="665.0" y="99.0"/>
+          <dc:Bounds x="665" y="99" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_235" bpmnElement="serviceFoundCheck" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="738.0" y="145.0"/>
+        <dc:Bounds x="738" y="145" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="59.0" x="735.0" y="125.0"/>
+          <dc:Bounds x="735" y="125" width="59" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ExclusiveGateway_234" targetElement="_BPMNShape_ExclusiveGateway_235">
-        <di:waypoint xsi:type="dc:Point" x="696.0" y="170.0"/>
-        <di:waypoint xsi:type="dc:Point" x="738.0" y="170.0"/>
+        <di:waypoint xsi:type="dc:Point" x="696" y="170" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="170" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="704.0" y="170.0"/>
+          <dc:Bounds x="704" y="170" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="foundYes" sourceElement="_BPMNShape_ExclusiveGateway_235" targetElement="_BPMNShape_ExclusiveGateway_228">
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="195.0"/>
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="256.0"/>
+        <di:waypoint xsi:type="dc:Point" x="763" y="195" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="256" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="762.0" y="205.0"/>
+          <dc:Bounds x="762" y="205" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="notFound" sourceElement="_BPMNShape_ExclusiveGateway_235" targetElement="_BPMNShape_EndEvent_229">
-        <di:waypoint xsi:type="dc:Point" x="788.0" y="170.0"/>
-        <di:waypoint xsi:type="dc:Point" x="877.0" y="171.0"/>
+        <di:waypoint xsi:type="dc:Point" x="788" y="170" />
+        <di:waypoint xsi:type="dc:Point" x="877" y="171" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="798.0" y="170.0"/>
+          <dc:Bounds x="798" y="170" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_229" bpmnElement="EndEvent_3">
-        <dc:Bounds height="36.0" width="36.0" x="877.0" y="153.0"/>
+        <dc:Bounds x="877" y="153" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="895.0" y="194.0"/>
+          <dc:Bounds x="895" y="194" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>