Skip to content

Commit 176d5af

Browse files
committed
[enh] Introduce ServiceMethod
Bug: #1628 Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 90e0e79 commit 176d5af

30 files changed

Lines changed: 626 additions & 88 deletions

File tree

CHANGELOG.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
- https://github.com/eclipse-syson/syson/issues/1628[#1628] [services] Introduce new services organization.
1616
https://doc.mbse-syson.org/syson/main/developer-guide/index.html#services_organization[See the developer guide in the documentation for more details].
17+
Also introduces new `ServiceMethod` helper class to build AQL service call expressions from type-safe Java method references instead of hardcoded strings.
18+
- [services] _isActor(Element)_ has been moved from `ViewNodeService` to `ElementQueryService`.
1719

1820
=== Dependency update
1921

@@ -44,6 +46,7 @@ https://doc.mbse-syson.org/syson/main/developer-guide/index.html#services_organi
4446
- https://github.com/eclipse-syson/syson/issues/1587[#1587] [diagrams] Handle `ActionUsage` and `ActionDefinition` parameters as graphical border nodes.
4547
- https://github.com/eclipse-syson/syson/issues/1628[#1628] [services] Introduce new services organization.
4648
https://doc.mbse-syson.org/syson/main/developer-guide/index.html#services_organization[See the developer guide in the documentation for more details].
49+
Also introduces new `ServiceMethod` helper class to build AQL service call expressions from type-safe Java method references instead of hardcoded strings.
4750
- https://github.com/eclipse-syson/syson/issues/1606[#1606] [explorer] Display the _shortName_ of `Elements` as part of the label in the _Explorer_ view.
4851

4952
== v2025.10.0

backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/configuration/SysMLv2PropertiesConfigurer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory;
5454
import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription;
5555
import org.eclipse.syson.application.services.DetailsViewService;
56-
import org.eclipse.syson.form.services.FormMutationAQLService;
57-
import org.eclipse.syson.form.services.FormQueryAQLService;
58-
import org.eclipse.syson.model.services.ModelMutationAQLService;
59-
import org.eclipse.syson.model.services.ModelQueryAQLService;
56+
import org.eclipse.syson.form.services.aql.FormMutationAQLService;
57+
import org.eclipse.syson.form.services.aql.FormQueryAQLService;
58+
import org.eclipse.syson.model.services.aql.ModelMutationAQLService;
59+
import org.eclipse.syson.model.services.aql.ModelQueryAQLService;
6060
import org.eclipse.syson.services.UtilService;
6161
import org.eclipse.syson.sysml.SysmlPackage;
6262
import org.eclipse.syson.sysml.helper.LabelConstants;

backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/DiagramMutationAQLService.java renamed to backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/aql/DiagramMutationAQLService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.diagram.services;
13+
package org.eclipse.syson.diagram.services.aql;
1414

1515
/**
1616
* Entry point for all diagram-related services doing mutations in diagrams and called by AQL expressions in diagram

backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/DiagramQueryAQLService.java renamed to backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/aql/DiagramQueryAQLService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.diagram.services;
13+
package org.eclipse.syson.diagram.services.aql;
1414

1515
/**
1616
* Entry point for all diagram-related services doing queries in diagrams and called by AQL expressions in diagram

backend/services/syson-form-services/src/main/java/org/eclipse/syson/form/services/FormMutationAQLService.java renamed to backend/services/syson-form-services/src/main/java/org/eclipse/syson/form/services/aql/FormMutationAQLService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.form.services;
13+
package org.eclipse.syson.form.services.aql;
1414

1515
/**
1616
* Entry point for all form-related services doing mutations in forms and called by AQL expressions in form

backend/services/syson-form-services/src/main/java/org/eclipse/syson/form/services/FormQueryAQLService.java renamed to backend/services/syson-form-services/src/main/java/org/eclipse/syson/form/services/aql/FormQueryAQLService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.form.services;
13+
package org.eclipse.syson.form.services.aql;
1414

1515
/**
1616
* Entry point for all form-related services doing queries in forms and called by AQL expressions in form descriptions.

backend/services/syson-model-services/src/main/java/org/eclipse/syson/model/services/ModelMutationAQLService.java renamed to backend/services/syson-model-services/src/main/java/org/eclipse/syson/model/services/aql/ModelMutationAQLService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.model.services;
13+
package org.eclipse.syson.model.services.aql;
1414

1515
/**
1616
* Entry point for all model-related services doing mutations in models and called by AQL expressions in representation

backend/services/syson-model-services/src/main/java/org/eclipse/syson/model/services/ModelQueryAQLService.java renamed to backend/services/syson-model-services/src/main/java/org/eclipse/syson/model/services/aql/ModelQueryAQLService.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.model.services;
13+
package org.eclipse.syson.model.services.aql;
14+
15+
import org.eclipse.syson.sysml.Element;
16+
import org.eclipse.syson.sysml.metamodel.services.ElementQueryService;
1417

1518
/**
1619
* Entry point for all model-related services doing queries in models and called by AQL expressions in representation
@@ -20,4 +23,16 @@
2023
*/
2124
public class ModelQueryAQLService {
2225

26+
private final ElementQueryService elementQueryService;
27+
28+
public ModelQueryAQLService() {
29+
this.elementQueryService = new ElementQueryService();
30+
}
31+
32+
/**
33+
* {@link ElementQueryService#isActor(Element)}.
34+
*/
35+
public boolean isActor(Element element) {
36+
return this.elementQueryService.isActor(element);
37+
}
2338
}

backend/services/syson-representation-services/src/main/java/org/eclipse/syson/representation/services/RepresentationMutationAQLService.java renamed to backend/services/syson-representation-services/src/main/java/org/eclipse/syson/representation/services/aql/RepresentationMutationAQLService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.representation.services;
13+
package org.eclipse.syson.representation.services.aql;
1414

1515
/**
1616
* Entry point for all representation-related services doing mutations in representations and called by AQL expressions

backend/services/syson-representation-services/src/main/java/org/eclipse/syson/representation/services/RepresentationQueryAQLService.java renamed to backend/services/syson-representation-services/src/main/java/org/eclipse/syson/representation/services/aql/RepresentationQueryAQLService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Obeo - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.syson.representation.services;
13+
package org.eclipse.syson.representation.services.aql;
1414

1515
/**
1616
* Entry point for all representation-related services doing queries in representations and called by AQL expressions in

0 commit comments

Comments
 (0)