[tests] Fix JavaServiceIsCalledChecker not collecting all AQL expression

Bug: #960
Signed-off-by: Florent Latombe <florent.latombe@obeo.fr>

Author: flatombe

backend/application/syson-application/src/test/java/org/eclipse/syson/JavaServiceIsCalledChecker.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2024, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -107,11 +107,9 @@ private Collection<String> collectAQLExpressionsInDiagramDescription(DiagramDesc
 
         expressions.add(diagramDescription.getPreconditionExpression());
 
-        List<Tool> diagramTools = Optional.ofNullable(diagramDescription.getPalette()).stream()
-                .flatMap(palette -> EMFUtils.allContainedObjectOfType(palette, Tool.class))
-                .toList();
+        final List<Tool> allDiagramTools = EMFUtils.allContainedObjectOfType(diagramDescription, Tool.class).toList();
 
-        for (Tool diagramTool : diagramTools) {
+        for (Tool diagramTool : allDiagramTools) {
             expressions.add(diagramTool.getPreconditionExpression());
             for (Operation bodyOperation : diagramTool.getBody()) {
                 EMFUtils.allContainedObjectOfType(bodyOperation, ChangeContext.class)
@@ -210,11 +208,9 @@ private Collection<String> collectAQLExpressionsInEdgeDescription(EdgeDescriptio
         Optional.ofNullable(edgeDescription.getPreconditionExpression())
                 .map(expressions::add);
 
-        List<Tool> edgeTools = Optional.ofNullable(edgeDescription.getPalette()).stream()
-                .flatMap(palette -> EMFUtils.allContainedObjectOfType(palette, Tool.class))
-                .toList();
+        final List<Tool> allEdgeTools = EMFUtils.allContainedObjectOfType(edgeDescription, Tool.class).toList();
 
-        for (Tool edgeTool : edgeTools) {
+        for (Tool edgeTool : allEdgeTools) {
             expressions.add(edgeTool.getPreconditionExpression());
             if (edgeTool instanceof LabelEditTool labelEditTool) {
                 expressions.add(labelEditTool.getInitialDirectEditLabelExpression());

backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/helper/EMFUtils.java

@@ -168,12 +168,12 @@ public static Stream<Notifier> eAllContentSteamWithSelf(ResourceSet rs) {
      */
     public static <T extends EObject> Stream<T> allContainedObjectOfType(Notifier self, Class<T> type) {
         final Stream<T> result;
-        if (self instanceof EObject) {
-            result = eAllContentStreamWithSelf((EObject) self).filter(e -> type.isInstance(e)).map(e -> type.cast(e));
-        } else if (self instanceof Resource) {
-            result = eAllContentSteamWithSelf((Resource) self).filter(e -> type.isInstance(e)).map(e -> type.cast(e));
-        } else if (self instanceof ResourceSet) {
-            result = eAllContentSteamWithSelf((ResourceSet) self).filter(e -> type.isInstance(e))
+        if (self instanceof EObject eObject) {
+            result = eAllContentStreamWithSelf(eObject).filter(e -> type.isInstance(e)).map(e -> type.cast(e));
+        } else if (self instanceof Resource resource) {
+            result = eAllContentSteamWithSelf(resource).filter(e -> type.isInstance(e)).map(e -> type.cast(e));
+        } else if (self instanceof ResourceSet resourceSet) {
+            result = eAllContentSteamWithSelf(resourceSet).filter(e -> type.isInstance(e))
                     .map(e -> type.cast(e));
         } else {
             result = Stream.empty();