Merge "Altered bpmn and audit behavior on delete vf mod"

1 files changed, 39 insertions, 36 deletions

diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn
index 41c3966626..b774c052cc 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn
@@ -109,19 +109,19 @@
       <bpmn:outgoing>SequenceFlow_1ut7n32</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:subProcess id="SubProcess_0grvkj2" name="Audit Exception Sub Process" triggeredByEvent="true">
-      <bpmn:startEvent id="StartEvent_1euiddy">
-        <bpmn:outgoing>SequenceFlow_0xuodpy</bpmn:outgoing>
-        <bpmn:errorEventDefinition errorRef="Error_0jjnve8" />
-      </bpmn:startEvent>
       <bpmn:endEvent id="EndEvent_1gzq57j">
         <bpmn:incoming>SequenceFlow_1fhst92</bpmn:incoming>
       </bpmn:endEvent>
-      <bpmn:serviceTask id="ServiceTask_1isbxvo" name="Proccess Error" camunda:expression="${ExceptionBuilder.processAuditException(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:serviceTask id="ServiceTask_1isbxvo" name="Proccess Error" camunda:expression="${ExceptionBuilder.processAuditException(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)), true)}">
         <bpmn:incoming>SequenceFlow_0xuodpy</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_1fhst92</bpmn:outgoing>
       </bpmn:serviceTask>
       <bpmn:sequenceFlow id="SequenceFlow_0xuodpy" sourceRef="StartEvent_1euiddy" targetRef="ServiceTask_1isbxvo" />
       <bpmn:sequenceFlow id="SequenceFlow_1fhst92" sourceRef="ServiceTask_1isbxvo" targetRef="EndEvent_1gzq57j" />
+      <bpmn:startEvent id="StartEvent_1euiddy" isInterrupting="false">
+        <bpmn:outgoing>SequenceFlow_0xuodpy</bpmn:outgoing>
+        <bpmn:escalationEventDefinition escalationRef="Escalation_130je8j" camunda:escalationCodeVariable="test" />
+      </bpmn:startEvent>
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="SequenceFlow_179btn2" sourceRef="aaiCatch" targetRef="DeleteNetworkPolicies" />
     <bpmn:intermediateThrowEvent id="aaiThrow" name="Update AAI">
@@ -132,26 +132,29 @@
       <bpmn:outgoing>SequenceFlow_179btn2</bpmn:outgoing>
       <bpmn:linkEventDefinition name="AAI" />
     </bpmn:intermediateCatchEvent>
-    <bpmn:exclusiveGateway id="auditSuccessfulCheck" name="Audit&#10; Successful?" default="SequenceFlow_17cd9e2">
-      <bpmn:incoming>SequenceFlow_0qfmmgt</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_17cd9e2</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_1gdyk9j</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_17cd9e2" name="Yes" sourceRef="auditSuccessfulCheck" targetRef="ExclusiveGateway_1pydilb" />
+    <bpmn:sequenceFlow id="SequenceFlow_17cd9e2" name="Yes/No" sourceRef="auditSuccessfulCheck" targetRef="ExclusiveGateway_1pydilb">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("auditIsSuccessful") == false || execution.getVariable("auditIsSuccessful") == true}]]></bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_1gdyk9j" name="No" sourceRef="auditSuccessfulCheck" targetRef="EndEvent_0b0ocu0">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("auditIsSuccessful") == false}]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:endEvent id="EndEvent_0b0ocu0">
-      <bpmn:incoming>SequenceFlow_1gdyk9j</bpmn:incoming>
-      <bpmn:errorEventDefinition errorRef="Error_0jjnve8" />
-    </bpmn:endEvent>
     <bpmn:inclusiveGateway id="ExclusiveGateway_1yvh16a">
       <bpmn:incoming>SequenceFlow_02lpx87</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_1ut7n32</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_14bu4ys</bpmn:outgoing>
     </bpmn:inclusiveGateway>
+    <bpmn:inclusiveGateway id="auditSuccessfulCheck" name="Audit&#10; Successful?">
+      <bpmn:incoming>SequenceFlow_0qfmmgt</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_17cd9e2</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_1gdyk9j</bpmn:outgoing>
+    </bpmn:inclusiveGateway>
+    <bpmn:endEvent id="EndEvent_0b0ocu0">
+      <bpmn:incoming>SequenceFlow_1gdyk9j</bpmn:incoming>
+      <bpmn:escalationEventDefinition escalationRef="Escalation_130je8j" />
+    </bpmn:endEvent>
   </bpmn:process>
   <bpmn:error id="Error_0jjnve8" name="Error_3k24na6" errorCode="AAIInventoryFailure" />
+  <bpmn:escalation id="Escalation_130je8j" name="audit" escalationCode="audit1" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteVfModuleBB">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="DeleteVfModuleBB_Start">
@@ -375,12 +378,6 @@
       <bpmndi:BPMNShape id="SubProcess_0grvkj2_di" bpmnElement="SubProcess_0grvkj2" isExpanded="true">
         <dc:Bounds x="231" y="642" width="350" height="200" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1euiddy_di" bpmnElement="StartEvent_1euiddy">
-        <dc:Bounds x="262" y="725" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="189" y="765" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1gzq57j_di" bpmnElement="EndEvent_1gzq57j">
         <dc:Bounds x="510" y="725" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -394,7 +391,7 @@
         <di:waypoint xsi:type="dc:Point" x="298" y="743" />
         <di:waypoint xsi:type="dc:Point" x="353" y="743" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="237" y="722" width="90" height="12" />
+          <dc:Bounds x="280.5" y="722" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1fhst92_di" bpmnElement="SequenceFlow_1fhst92">
@@ -423,39 +420,45 @@
           <dc:Bounds x="150" y="530" width="55" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_187bfld_di" bpmnElement="auditSuccessfulCheck" isMarkerVisible="true">
-        <dc:Bounds x="779.6431784107947" y="108" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="775" y="162" width="60" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_17cd9e2_di" bpmnElement="SequenceFlow_17cd9e2">
         <di:waypoint xsi:type="dc:Point" x="830" y="133" />
         <di:waypoint xsi:type="dc:Point" x="868" y="133" />
         <di:waypoint xsi:type="dc:Point" x="868" y="174" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="838" y="114" width="19" height="12" />
+          <dc:Bounds x="830" y="114" width="36" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1gdyk9j_di" bpmnElement="SequenceFlow_1gdyk9j">
         <di:waypoint xsi:type="dc:Point" x="805" y="108" />
         <di:waypoint xsi:type="dc:Point" x="805" y="56" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="812" y="77.49056603773585" width="14" height="12" />
+          <dc:Bounds x="812" y="77" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1wydovd_di" bpmnElement="EndEvent_0b0ocu0">
-        <dc:Bounds x="787" y="20" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="805" y="59.13043478260869" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="InclusiveGateway_0cjvlht_di" bpmnElement="ExclusiveGateway_1yvh16a">
         <dc:Bounds x="900" y="259" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="879" y="312" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="InclusiveGateway_0i6rdd1_di" bpmnElement="auditSuccessfulCheck">
+        <dc:Bounds x="780" y="108" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="775" y="162" width="60" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_04qhoba_di" bpmnElement="StartEvent_1euiddy">
+        <dc:Bounds x="262" y="725" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="189" y="765" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_1onxfk1_di" bpmnElement="EndEvent_0b0ocu0">
+        <dc:Bounds x="787" y="20" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="760" y="59" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>