From 15c17d56df8b8b517763ef248a1503e09309e232 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Tue, 18 Jun 2024 09:19:34 +0200
Subject: [PATCH] refactoring, minor improvements

issue #346
---
 .../java/org/openbpmn/bpmn/elements/BPMNProcess.java  |  2 +-
 .../bpmn/validation/BPMNValidationHandler.java        | 10 ++++++++--
 .../test/validation/TestBPMNValidationIssue346.java   | 11 ++++-------
 .../src/test/resources/validation_issue_346.bpmn      |  7 ++++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/BPMNProcess.java b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/BPMNProcess.java
index 3c3373d4..1dd30433 100644
--- a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/BPMNProcess.java
+++ b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/BPMNProcess.java
@@ -1459,7 +1459,7 @@ public Set<MessageFlow> findMessageFlowsByElementId(String id) {
     }
 
     /**
-     * Returns all BPMN Edges associated with a geiven FlowElement.
+     * Returns all BPMN Edges associated with a given FlowElement.
      * 
      * @param id
      * @return
diff --git a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/validation/BPMNValidationHandler.java b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/validation/BPMNValidationHandler.java
index 13ae886b..e916051b 100644
--- a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/validation/BPMNValidationHandler.java
+++ b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/validation/BPMNValidationHandler.java
@@ -9,6 +9,7 @@
 import org.openbpmn.bpmn.elements.BPMNProcess;
 import org.openbpmn.bpmn.elements.Event;
 import org.openbpmn.bpmn.elements.Gateway;
+import org.openbpmn.bpmn.exceptions.BPMNModelException;
 
 /**
  * The BPMNValidationHandler validates a complete BPMNModel for validation
@@ -28,8 +29,9 @@ public class BPMNValidationHandler {
      * 
      * @param forceValidation - if true the full model will be validated.
      * @return
+     * @throws BPMNModelException
      */
-    public List<BPMNValidationMarker> validate(BPMNModel model, boolean forceValidation) {
+    public List<BPMNValidationMarker> validate(BPMNModel model, boolean forceValidation) throws BPMNModelException {
         List<BPMNValidationMarker> result = new ArrayList<>();
         // iterate over all process
         Set<BPMNProcess> processes = model.getProcesses();
@@ -48,9 +50,13 @@ public List<BPMNValidationMarker> validate(BPMNModel model, boolean forceValidat
      * for only new added or changed element nodes.
      * 
      * @return
+     * @throws BPMNModelException
      */
-    private List<BPMNValidationMarker> validateProcess(BPMNProcess process, boolean forceValidation) {
+    public List<BPMNValidationMarker> validateProcess(BPMNProcess process, boolean forceValidation)
+            throws BPMNModelException {
         List<BPMNValidationMarker> result = new ArrayList<>();
+        // make sure that the process is initialized
+        process.init();
         // validate events....
         Set<Event> events = process.getEvents();
         for (Event event : events) {
diff --git a/open-bpmn.metamodel/src/test/java/org/openbpmn/metamodel/test/validation/TestBPMNValidationIssue346.java b/open-bpmn.metamodel/src/test/java/org/openbpmn/metamodel/test/validation/TestBPMNValidationIssue346.java
index d7a8653c..a6776781 100644
--- a/open-bpmn.metamodel/src/test/java/org/openbpmn/metamodel/test/validation/TestBPMNValidationIssue346.java
+++ b/open-bpmn.metamodel/src/test/java/org/openbpmn/metamodel/test/validation/TestBPMNValidationIssue346.java
@@ -50,6 +50,7 @@ public void testValidationTaskWithMessageFlow() {
             // Test default process
             BPMNProcess process = model.openDefaultProces();
             assertNotNull(process);
+            assertEquals(1, process.getActivities().size());
 
             BPMNValidationHandler bpmnValidationHandler = new BPMNValidationHandler();
             List<BPMNValidationMarker> result = bpmnValidationHandler.validate(model, true);
@@ -57,15 +58,11 @@ public void testValidationTaskWithMessageFlow() {
             // we expect no errors
             assertEquals(0, result.size());
 
-            // Now open the 'Pool-1' containing a receive Task
+            // Now verify the 'Pool-1'. We expect that the process was initialized by the
+            // validate method
             process = model.findProcessByName("Pool-1");
-            process = model.openProcess(process.getId());
             assertNotNull(process);
-            bpmnValidationHandler = new BPMNValidationHandler();
-            result = bpmnValidationHandler.validate(model, true);
-
-            // we expect no errors
-            assertEquals(0, result.size());
+            assertEquals(3, process.getActivities().size());
 
         } catch (BPMNModelException e) {
 
diff --git a/open-bpmn.metamodel/src/test/resources/validation_issue_346.bpmn b/open-bpmn.metamodel/src/test/resources/validation_issue_346.bpmn
index 181e71e1..e5fe546d 100644
--- a/open-bpmn.metamodel/src/test/resources/validation_issue_346.bpmn
+++ b/open-bpmn.metamodel/src/test/resources/validation_issue_346.bpmn
@@ -69,6 +69,7 @@
     <bpmn2:receiveTask id="task_MPPyxg" instantiate="true" name="Task-3">
       <bpmn2:documentation id="documentation_qc8ghA"/>
       <bpmn2:outgoing>sequenceFlow_kIA1WQ</bpmn2:outgoing>
+      <bpmn2:incoming>messageFlow_oBGang</bpmn2:incoming>
     </bpmn2:receiveTask>
     <bpmn2:sequenceFlow id="sequenceFlow_kIA1WQ" sourceRef="task_MPPyxg" targetRef="task_p9QtJg">
       <bpmn2:documentation id="documentation_LFztyg"/>
@@ -151,9 +152,9 @@
         <di:waypoint x="865.0" y="200.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="messageFlow_oBGang" id="BPMNEdge_3KHv0g" sourceElement="BPMNShape_OKyVyg" targetElement="BPMNShape_CTmfzQ">
-        <di:waypoint x="850.0" y="211.0"/>
-        <di:waypoint x="735.0" y="211.0"/>
-        <di:waypoint x="735.0" y="310.0"/>
+        <di:waypoint x="850.0" y="210.0"/>
+        <di:waypoint x="734.0" y="210.0"/>
+        <di:waypoint x="734.0" y="310.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_kIA1WQ" id="BPMNEdge_5NpCgA" sourceElement="BPMNShape_CTmfzQ" targetElement="BPMNShape_pKoMYQ">
         <di:waypoint x="735.0" y="360.0"/>