Small changes to the bpmn models

camunda/src/main/java/de/unikoblenz/fgbas/bs/bpm/iot/RfidTimerReaderService.java

@@ -36,13 +36,13 @@ public class RfidTimerReaderService implements JavaDelegate {
         String rfidTag = jo.getString("tagId");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = sdf.parse(jo.getString("timeStamp"));
-        LOGGER.info("Starting product review  with rfid tag {" + rfidTag + "} Date:" + date.toString());
+        LOGGER.info("Starting product review with rfid tag {" + rfidTag + "} Date:" + date.toString());
         // Create new Process
         Map<String, Object> variables = new HashMap<String, Object>();
         variables.put("rfidTag", rfidTag);
         variables.put("product", RfidProductService.getProductByRfidTag(rfidTag));
         delegateExecution.getProcessEngineServices().getRuntimeService()
-            .startProcessInstanceByKey("Process_2", variables);
+            .startProcessInstanceByKey("Product_Review_Process", variables);
 
       }
     }

camunda/src/main/resources/META-INF/diagram_1.bpmn

 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0m41206" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.2.4">
-  <bpmn:process id="Process_1" isExecutable="true">
+  <bpmn:collaboration id="Collaboration_0om3cjf">
+    <bpmn:participant id="Participant_1av3pim" name="IoT Process handler" processRef="IoT_Process" />
+    <bpmn:participant id="Participant_0nb09fh" name="IoT Data Server" />
+    <bpmn:participant id="Participant_0ucwc6c" name="RFID Reader" />
+    <bpmn:messageFlow id="MessageFlow_0hco709" name="RFID TagId" sourceRef="Participant_0ucwc6c" targetRef="Participant_0nb09fh" />
+    <bpmn:messageFlow id="MessageFlow_0c978xw" name="Receive IoT Data" sourceRef="Participant_0nb09fh" targetRef="Task_1ls08zd" />
+    <bpmn:messageFlow id="MessageFlow_0ufslpy" name="Get IoT Data" sourceRef="Task_1ls08zd" targetRef="Participant_0nb09fh" />
+  </bpmn:collaboration>
+  <bpmn:process id="IoT_Process" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_1z111f9</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1z111f9" sourceRef="StartEvent_1" targetRef="ExclusiveGateway_09r95mp" />
-    <bpmn:endEvent id="EndEvent_11c5iyc">
-      <bpmn:incoming>SequenceFlow_1wfucxl</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:serviceTask id="Task_1ls08zd" name="Call IoT and do amazing stuff" camunda:class="de.unikoblenz.fgbas.bs.bpm.iot.RfidTimerReaderService">
-      <bpmn:incoming>SequenceFlow_0nwksx9</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0cblkjr</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="SequenceFlow_0cblkjr" sourceRef="Task_1ls08zd" targetRef="IntermediateThrowEvent_1hvhn31" />
     <bpmn:exclusiveGateway id="ExclusiveGateway_09r95mp">
       <bpmn:incoming>SequenceFlow_1z111f9</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_1xiqxap</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0nwksx9</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_0nwksx9" sourceRef="ExclusiveGateway_09r95mp" targetRef="Task_1ls08zd" />
+    <bpmn:serviceTask id="Task_1ls08zd" name="Call IoT Data Server and do amazing stuff" camunda:class="de.unikoblenz.fgbas.bs.bpm.iot.RfidTimerReaderService">
+      <bpmn:incoming>SequenceFlow_0nwksx9</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0cblkjr</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:boundaryEvent id="BoundaryEvent_14th0kf" attachedToRef="Task_1ls08zd">
+      <bpmn:outgoing>SequenceFlow_1wfucxl</bpmn:outgoing>
+      <bpmn:errorEventDefinition />
+    </bpmn:boundaryEvent>
+    <bpmn:endEvent id="EndEvent_11c5iyc">
+      <bpmn:incoming>SequenceFlow_1wfucxl</bpmn:incoming>
+    </bpmn:endEvent>
     <bpmn:intermediateCatchEvent id="IntermediateThrowEvent_1hvhn31" name="1 min">
       <bpmn:incoming>SequenceFlow_0cblkjr</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1xiqxap</bpmn:outgoing>
@@ -26,56 +35,86 @@
         <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT60S</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:intermediateCatchEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_1z111f9" sourceRef="StartEvent_1" targetRef="ExclusiveGateway_09r95mp" />
     <bpmn:sequenceFlow id="SequenceFlow_1xiqxap" sourceRef="IntermediateThrowEvent_1hvhn31" targetRef="ExclusiveGateway_09r95mp" />
-    <bpmn:boundaryEvent id="BoundaryEvent_14th0kf" attachedToRef="Task_1ls08zd">
-      <bpmn:outgoing>SequenceFlow_1wfucxl</bpmn:outgoing>
-      <bpmn:errorEventDefinition />
-    </bpmn:boundaryEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0nwksx9" sourceRef="ExclusiveGateway_09r95mp" targetRef="Task_1ls08zd" />
+    <bpmn:sequenceFlow id="SequenceFlow_0cblkjr" sourceRef="Task_1ls08zd" targetRef="IntermediateThrowEvent_1hvhn31" />
     <bpmn:sequenceFlow id="SequenceFlow_1wfucxl" sourceRef="BoundaryEvent_14th0kf" targetRef="EndEvent_11c5iyc" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_0om3cjf">
+      <bpmndi:BPMNShape id="Participant_1av3pim_di" bpmnElement="Participant_1av3pim">
+        <dc:Bounds x="239" y="103" width="577" height="220" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="173" y="102" width="36" height="36" />
+        <dc:Bounds x="311" y="145" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1z111f9_di" bpmnElement="SequenceFlow_1z111f9">
-        <di:waypoint x="209" y="120" />
-        <di:waypoint x="258" y="120" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_11c5iyc_di" bpmnElement="EndEvent_11c5iyc">
-        <dc:Bounds x="754" y="142" width="36" height="36" />
+      <bpmndi:BPMNShape id="ExclusiveGateway_09r95mp_di" bpmnElement="ExclusiveGateway_09r95mp" isMarkerVisible="true">
+        <dc:Bounds x="398" y="138" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1lmcnik_di" bpmnElement="Task_1ls08zd">
-        <dc:Bounds x="521" y="80" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0cblkjr_di" bpmnElement="SequenceFlow_0cblkjr">
-        <di:waypoint x="571" y="160" />
-        <di:waypoint x="571" y="204" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_09r95mp_di" bpmnElement="ExclusiveGateway_09r95mp" isMarkerVisible="true">
-        <dc:Bounds x="258" y="95" width="50" height="50" />
+        <dc:Bounds x="539" y="123" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0nwksx9_di" bpmnElement="SequenceFlow_0nwksx9">
-        <di:waypoint x="308" y="120" />
-        <di:waypoint x="521" y="120" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_0j8ya9i_di" bpmnElement="IntermediateThrowEvent_1hvhn31">
-        <dc:Bounds x="553" y="204" width="36" height="36" />
+        <dc:Bounds x="560" y="246" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="558" y="247" width="27" height="14" />
+          <dc:Bounds x="565" y="289" width="27" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1xiqxap_di" bpmnElement="SequenceFlow_1xiqxap">
-        <di:waypoint x="553" y="222" />
-        <di:waypoint x="283" y="222" />
-        <di:waypoint x="283" y="145" />
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_11c5iyc_di" bpmnElement="EndEvent_11c5iyc">
+        <dc:Bounds x="744" y="145" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BoundaryEvent_0nqf66s_di" bpmnElement="BoundaryEvent_14th0kf">
-        <dc:Bounds x="603" y="142" width="36" height="36" />
+        <dc:Bounds x="621" y="185" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wfucxl_di" bpmnElement="SequenceFlow_1wfucxl">
-        <di:waypoint x="639" y="160" />
-        <di:waypoint x="754" y="160" />
+        <di:waypoint x="657" y="203" />
+        <di:waypoint x="762" y="203" />
+        <di:waypoint x="762" y="181" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1xiqxap_di" bpmnElement="SequenceFlow_1xiqxap">
+        <di:waypoint x="560" y="264" />
+        <di:waypoint x="423" y="264" />
+        <di:waypoint x="423" y="188" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0nwksx9_di" bpmnElement="SequenceFlow_0nwksx9">
+        <di:waypoint x="448" y="163" />
+        <di:waypoint x="539" y="163" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0cblkjr_di" bpmnElement="SequenceFlow_0cblkjr">
+        <di:waypoint x="578" y="203" />
+        <di:waypoint x="578" y="246" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1z111f9_di" bpmnElement="SequenceFlow_1z111f9">
+        <di:waypoint x="347" y="163" />
+        <di:waypoint x="398" y="163" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Participant_0lcytb6_di" bpmnElement="Participant_0nb09fh">
+        <dc:Bounds x="239" y="385" width="577" height="60" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Participant_1d5j3hj_di" bpmnElement="Participant_0ucwc6c">
+        <dc:Bounds x="239" y="502" width="578" height="60" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="MessageFlow_0hco709_di" bpmnElement="MessageFlow_0hco709">
+        <di:waypoint x="368" y="502" />
+        <di:waypoint x="368" y="445" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="370" y="470" width="56" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="MessageFlow_0c978xw_di" bpmnElement="MessageFlow_0c978xw">
+        <di:waypoint x="612" y="380" />
+        <di:waypoint x="612" y="203" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="617" y="348" width="86" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="MessageFlow_0ufslpy_di" bpmnElement="MessageFlow_0ufslpy">
+        <di:waypoint x="602" y="203" />
+        <di:waypoint x="602" y="384" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="532" y="346" width="64" height="14" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

camunda/src/main/resources/META-INF/diagram_2.bpmn

 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0m41206" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.2.4">
-  <bpmn:process id="Process_2" isExecutable="true">
+  <bpmn:process id="Product_Review_Process" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_1c5kgwq</bpmn:outgoing>
     </bpmn:startEvent>
@@ -22,7 +22,7 @@
     </bpmn:userTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_2">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Product_Review_Process">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="118" y="117" width="36" height="36" />
       </bpmndi:BPMNShape>