improved message and signal validation and validation mapping (#374)

imixs · Jan 21, 2025 · 89b2dff · 89b2dff
1 parent d3644a9
commit 89b2dff
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 14 deletions.
diff --git a/...erver/src/main/java/org/openbpmn/extensions/elements/MessageEventDefinitionExtension.java b/...erver/src/main/java/org/openbpmn/extensions/elements/MessageEventDefinitionExtension.java
@@ -185,7 +185,13 @@ public boolean updatePropertiesData(final JsonObject json, final String category
                 Element eventDefinitionElement = iter.next();
                 JsonObject jsonData = dataList.getJsonObject(i);
                 if (jsonData != null) {
-                    eventDefinitionElement.setAttribute("messageRef", jsonData.getString("messageRef", ""));
+                    String oldRef = eventDefinitionElement.getAttribute("messageRef");
+                    String newRef = jsonData.getString("messageRef", "");
+                    eventDefinitionElement.setAttribute("messageRef", newRef);
+                    if (!newRef.equals(oldRef)) {
+                        // reset validation and update the client view
+                        updateClient = true;
+                    }
                 }
                 i++;
                 // update completed
@@ -194,7 +200,7 @@ public boolean updatePropertiesData(final JsonObject json, final String category
         }
 
         if (updateClient) {
-            // modelState.reset();
+            bpmnElement.resetValidation();
             modelState.refreshGModelState();
 
         }

diff --git a/...server/src/main/java/org/openbpmn/extensions/elements/SignalEventDefinitionExtension.java b/...server/src/main/java/org/openbpmn/extensions/elements/SignalEventDefinitionExtension.java
@@ -185,14 +185,20 @@ public boolean updatePropertiesData(final JsonObject json, final String category
                 Element eventDefinitionElement = iter.next();
                 JsonObject jsonData = dataList.getJsonObject(i);
                 if (jsonData != null) {
-                    eventDefinitionElement.setAttribute("signalRef", jsonData.getString("signal", ""));
+                    String oldRef = eventDefinitionElement.getAttribute("signalRef");
+                    String newRef = jsonData.getString("signal", "");
+                    eventDefinitionElement.setAttribute("signalRef", newRef);
+                    if (!newRef.equals(oldRef)) {
+                        // reset validation and update the client view
+                        updateClient = true;
+                    }
                 }
                 i++;
                 // update completed
             }
         }
         if (updateClient) {
-            // modelState.reset();
+            bpmnElement.resetValidation();
             modelState.refreshGModelState();
         }
         return updateClient;

diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/validators/BPMNGLSPValidator.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/validators/BPMNGLSPValidator.java
@@ -29,6 +29,7 @@
 import org.openbpmn.bpmn.exceptions.BPMNModelException;
 import org.openbpmn.bpmn.validation.BPMNValidationHandler;
 import org.openbpmn.bpmn.validation.BPMNValidationMarker;
+import org.openbpmn.bpmn.validation.BPMNValidationMarker.ErrorType;
 import org.openbpmn.extensions.BPMNElementExtension;
 import org.openbpmn.glsp.model.BPMNGModelState;
 
@@ -173,9 +174,19 @@ public List<Marker> doBatchValidation(final GModelElement element) {
         List<Marker> result = new ArrayList<>();
         for (BPMNValidationMarker bpmnMarker : bpmnExtensionMarkers) {
             if (bpmnMarker.getElementId().equals(element.getId())) {
-                result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
-                        bpmnMarker.getElementId(),
-                        MarkerKind.ERROR));
+                if (bpmnMarker.getErrorType() == ErrorType.ERROR) {
+                    result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
+                            bpmnMarker.getElementId(),
+                            MarkerKind.ERROR));
+                } else if (bpmnMarker.getErrorType() == ErrorType.WARNING) {
+                    result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
+                            bpmnMarker.getElementId(),
+                            MarkerKind.WARNING));
+                } else {
+                    result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
+                            bpmnMarker.getElementId(),
+                            MarkerKind.INFO));
+                }
             }
         }
 
@@ -192,9 +203,20 @@ public List<Marker> doLiveValidation(GModelElement element) {
         List<Marker> result = new ArrayList<>();
         for (BPMNValidationMarker bpmnMarker : bpmnMarkers) {
             if (bpmnMarker.getElementId().equals(element.getId())) {
-                result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
-                        bpmnMarker.getElementId(),
-                        MarkerKind.ERROR));
+                if (bpmnMarker.getErrorType() == ErrorType.ERROR) {
+                    result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
+                            bpmnMarker.getElementId(),
+                            MarkerKind.ERROR));
+                } else if (bpmnMarker.getErrorType() == ErrorType.WARNING) {
+                    result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
+                            bpmnMarker.getElementId(),
+                            MarkerKind.WARNING));
+                } else {
+                    result.add(new Marker(bpmnMarker.getLabel(), bpmnMarker.getDescription(),
+                            bpmnMarker.getElementId(),
+                            MarkerKind.INFO));
+                }
+
             }
         }
 

diff --git a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/Event.java b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/Event.java
@@ -232,8 +232,9 @@ public List<BPMNValidationMarker> validate() {
                     if (!hasMessage) {
                         this.addValidationMarker(
                                 new BPMNValidationMarker("Event",
-                                        "A Event must have a corresponding Message!", this.getId(),
-                                        BPMNValidationMarker.ErrorType.ERROR));
+                                        "A Message Event Definition should be assigned to a corresponding Message Object!",
+                                        this.getId(),
+                                        BPMNValidationMarker.ErrorType.WARNING));
                     }
                 });
 
@@ -247,8 +248,9 @@ public List<BPMNValidationMarker> validate() {
                     if (!hasMessage) {
                         this.addValidationMarker(
                                 new BPMNValidationMarker("Event",
-                                        "A Event must have a corresponding Signal!", this.getId(),
-                                        BPMNValidationMarker.ErrorType.ERROR));
+                                        "A Signal Event Definition should be assigned to a corresponding Signal!",
+                                        this.getId(),
+                                        BPMNValidationMarker.ErrorType.WARNING));
                     }
                 });