[3650] Fix potential NPE in DiagramNavigator and Node

Bug: #3650 Signed-off-by: Gwendal Daniel <[email protected]>
eclipse-sirius · Jun 20, 2024 · 43fba15 · 43fba15
1 parent a0110f2
commit 43fba15
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -57,6 +57,7 @@ More existing APIs will be migrated to this new common pattern.
 - https://github.com/eclipse-sirius/sirius-web/issues/3628[#3628] [sirius-web] Restore support for expand all and reveal in the explorer
 - https://github.com/eclipse-sirius/sirius-web/issues/3616[#3616] [diagram] Fix potential exceptions due to duplicate keys in diagram event processing
 - https://github.com/eclipse-sirius/sirius-web/issues/3624[#3624] [diagram] Fix an issue where the header separator does not fill the entire width of the node
+- https://github.com/eclipse-sirius/sirius-web/issues/3650[#3650] [diagram] Fix potential NPE in DiagramNavigator and Node toString method 
 
 === New Features
 

diff --git a/...c/main/java/org/eclipse/sirius/components/diagrams/tests/navigation/DiagramNavigator.java b/...c/main/java/org/eclipse/sirius/components/diagrams/tests/navigation/DiagramNavigator.java
@@ -13,6 +13,7 @@
 package org.eclipse.sirius.components.diagrams.tests.navigation;
 
 import java.text.MessageFormat;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
@@ -105,6 +106,10 @@ public EdgeNavigator edgeWithEdgeDescriptionId(String edgeDescriptionId) {
         return new EdgeNavigator(edges.get(0), this.cache);
     }
 
+    public Collection<Node> findAllNodes() {
+        return this.cache.getIdToNode().values();
+    }
+
     public int findDiagramNodeCount() {
         return this.cache.getDiagramNodeCount();
     }

diff --git a/...src/main/java/org/eclipse/sirius/components/diagrams/tests/navigation/NavigatorCache.java b/...src/main/java/org/eclipse/sirius/components/diagrams/tests/navigation/NavigatorCache.java
@@ -123,8 +123,14 @@ private void cacheNode(Node node, List<Node> ancestors) {
         this.idToNode.put(node.getId(), node);
         List<Node> nodesWithDescription = this.nodeDescriptionIdToNodes.computeIfAbsent(node.getDescriptionId(), k -> new ArrayList<>());
         nodesWithDescription.add(node);
-        List<Node> nodesWithLabel = this.labelToNodes.computeIfAbsent(node.getInsideLabel().getText(), k -> new ArrayList<>());
-        nodesWithLabel.add(node);
+        if (node.getInsideLabel() != null) {
+            List<Node> nodesWithLabel = this.labelToNodes.computeIfAbsent(node.getInsideLabel().getText(), k -> new ArrayList<>());
+            nodesWithLabel.add(node);
+        }
+        node.getOutsideLabels().forEach(outsideLabel -> {
+            List<Node> nodesWithLabel = this.labelToNodes.computeIfAbsent(outsideLabel.text(), k -> new ArrayList<>());
+            nodesWithLabel.add(node);
+        });
         List<Node> nodesWithTargetObjectLabel = this.targetObjectLabelToNodes.computeIfAbsent(node.getTargetObjectLabel(), k -> new ArrayList<>());
         nodesWithTargetObjectLabel.add(node);
         List<Node> nodesWithTargetObjectId = this.targetObjectIdToNodes.computeIfAbsent(node.getTargetObjectId(), k -> new ArrayList<>());
@@ -150,9 +156,10 @@ private void cacheEdge(Edge edge) {
         edgesWithTargetObjectLabel.add(edge);
         List<Edge> edgesWithTargetObjectId = this.targetObjectIdToEdges.computeIfAbsent(edge.getTargetObjectId(), k -> new ArrayList<>());
         edgesWithTargetObjectId.add(edge);
-
-        List<Edge> edgesWithLabel = this.labelToEdges.computeIfAbsent(edge.getCenterLabel().getText(), k -> new ArrayList<>());
-        edgesWithLabel.add(edge);
+        if (edge.getCenterLabel() != null) {
+            List<Edge> edgesWithLabel = this.labelToEdges.computeIfAbsent(edge.getCenterLabel().getText(), k -> new ArrayList<>());
+            edgesWithLabel.add(edge);
+        }
     }
 
 }
diff --git a/...sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java b/...sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java
@@ -190,9 +190,13 @@ public boolean isPinned() {
 
     @Override
     public String toString() {
+        String insideLabelText = "";
+        if (this.insideLabel != null) {
+            insideLabelText = this.insideLabel.getText();
+        }
         String pattern = "{0} '{'id: {1}, targetObjectId: {2}, targetObjectKind: {3}, targetObjectLabel: {4}, descriptionId: {5}, state: {6}, label: {7}, styleType: {8}, borderNodeCount: {9}, childNodeCount: {10}'}'";
         return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.targetObjectKind, this.targetObjectLabel, this.descriptionId, this.state,
-                this.insideLabel.getText(), this.style.getClass().getSimpleName(), this.borderNodes.size(), this.childNodes.size());
+                insideLabelText, this.style.getClass().getSimpleName(), this.borderNodes.size(), this.childNodes.size());
     }
 
     /**