Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ It helps handling inherited elements that are not displayed in their semantic ow

=== Dependency update

- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2025.12.4]
- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2025.12.5]
- [releng] Update to https://eclipse.dev/elk/downloads/releasenotes/release-0.11.0.html[elkjs 0.11.0]
- [releng] Update to https://github.com/spring-projects/spring-boot/releases/tag/v3.5.9[Spring Boot 3.5.9]

Expand All @@ -47,9 +47,9 @@ This fix ensure that imported models containing, for example, a top-level `Libra
- https://github.com/eclipse-syson/syson/issues/1751[#1751] [diagrams] Make `Interconnection` compartment growable.
- https://github.com/eclipse-syson/syson/issues/1763[#1763] [diagrams] Fix an issue where, in the diagrams, the creation of an `Element` inside a `sub-Package` created two graphical nodes instead of one.
- https://github.com/eclipse-syson/syson/issues/1788[#1788] [services] New `Expose` elements now have `visibility` set to _protected_ and have `isImportAll` set to _true_, as required by the SysMLv2 specification, chapter `8.3.26.2 Expose`.
- https://github.com/eclipse-syson/syson/issues/1799[#1799] During export, `Element` with a name that conflicts with SysML Keyword should be escaped.
- https://github.com/eclipse-syson/syson/issues/1825[#1825] `LiteralRational` value wrongly rounded during textual export.
- https://github.com/eclipse-syson/syson/issues/1784[#1784] Error while exporting `FeatureValue` using enumeration literals.
- https://github.com/eclipse-syson/syson/issues/1799[#1799] [export] During export, `Element` with a name that conflicts with SysML Keyword should be escaped.
- https://github.com/eclipse-syson/syson/issues/1825[#1825] [export] `LiteralRational` value wrongly rounded during textual export.
- https://github.com/eclipse-syson/syson/issues/1784[#1784] [export] Error while exporting `FeatureValue` using enumeration literals.
- https://github.com/eclipse-syson/syson/issues/1838[#1838] [metamodel] Invalid computation of `Usage.getType`: The subsetted features should be taken into account.

=== Improvements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ private GroupDescription createFeatureValuePropertiesGroup() {
group.setDisplayMode(GroupDisplayMode.LIST);
group.setName("Value");
group.setLabelExpression("");
group.setSemanticCandidatesExpression(AQLUtils.getSelfServiceCallExpression("getFeatureValue"));
group.setSemanticCandidatesExpression(ServiceMethod.of0(DetailsViewService::getFeatureValue).aqlSelf());

TextAreaDescription expressionWidget = FormFactory.eINSTANCE.createTextAreaDescription();
expressionWidget.setName("ValueExpression");
Expand Down Expand Up @@ -429,7 +429,7 @@ private GroupDescription createVisibilityPropertyGroup() {
group.setDisplayMode(GroupDisplayMode.LIST);
group.setName(MEMBERSHIP_PROPERTIES);
group.setLabelExpression("");
group.setSemanticCandidatesExpression(AQLUtils.getSelfServiceCallExpression("getVisibilityPropertyOwner"));
group.setSemanticCandidatesExpression(ServiceMethod.of0(DetailsViewService::getVisibilityPropertyOwner).aqlSelf());

RadioDescription radio = FormFactory.eINSTANCE.createRadioDescription();
radio.setName("ExtraRadioVisibilityWidget");
Expand All @@ -452,7 +452,7 @@ private GroupDescription createExtraAcceptActionUsagePropertiesGroup() {
group.setDisplayMode(GroupDisplayMode.LIST);
group.setName(ACCEPT_ACTION_USAGE_PROPERTIES);
group.setLabelExpression("");
group.setSemanticCandidatesExpression(AQLUtils.getSelfServiceCallExpression("getAcceptActionUsage"));
group.setSemanticCandidatesExpression(ServiceMethod.of0(DetailsViewService::getAcceptActionUsage).aqlSelf());

ReferenceWidgetDescription payloadRefWidget = ReferenceFactory.eINSTANCE.createReferenceWidgetDescription();
payloadRefWidget.setName("ExtraPayloadWidget");
Expand Down Expand Up @@ -485,7 +485,7 @@ private GroupDescription createExtraTransitionSourceTargetPropertiesGroup() {
group.setDisplayMode(GroupDisplayMode.LIST);
group.setName(TRANSITION_SOURCETARGET_PROPERTIES);
group.setLabelExpression("");
group.setSemanticCandidatesExpression(AQLUtils.getSelfServiceCallExpression("getTransitionUsage"));
group.setSemanticCandidatesExpression(ServiceMethod.of0(DetailsViewService::getTransitionUsage).aqlSelf());

ReferenceWidgetDescription sourceRefWidget = ReferenceFactory.eINSTANCE.createReferenceWidgetDescription();
sourceRefWidget.setName("ExtraSourceWidget");
Expand Down
2 changes: 1 addition & 1 deletion backend/application/syson-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph

spring.liquibase.change-log=classpath:db/db.changelog-master.xml

# Prevent liquibase to collect analytics
# see https://docs.liquibase.com/reference-guide/parameters/analytics-enabled
liquibase.analytics.enabled=false

spring.servlet.multipart.max-file-size=256MB
spring.servlet.multipart.max-request-size=256MB
spring.servlet.multipart.enabled=true
Expand All @@ -31,10 +35,6 @@ logging.level.org.eclipse.sirius.web.diagrams.layout.LayoutService=OFF
# Prevent Elasticsearch from scanning SysON repositories
spring.data.elasticsearch.repositories.enabled=false

# Prevent liquibase to collect analytics
# see https://docs.liquibase.com/reference-guide/parameters/analytics-enabled
liquibase.analytics.enabled=false

##################################################
#
# SYSON CUSTOM IMAGES FOR IMAGES NODES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.eclipse.sirius.components.collaborative.diagrams.dto.DiagramRefreshedEventPayload;
import org.eclipse.sirius.components.collaborative.diagrams.dto.DropNodesInput;
import org.eclipse.sirius.components.core.api.SuccessPayload;
import org.eclipse.sirius.components.diagrams.layoutdata.Position;
import org.eclipse.sirius.components.diagrams.tests.graphql.DropNodesMutationRunner;
import org.eclipse.sirius.components.diagrams.tests.navigation.DiagramNavigator;
import org.eclipse.sirius.web.tests.services.api.IGivenInitialServerState;
Expand Down Expand Up @@ -108,8 +109,7 @@ public void dropPartFromDiagramToPackageThenFromPackageToPart() {
diagramId.get(),
List.of(partNodeId.get()),
packageNodeId.get(),
0,
0);
List.of(new Position(0, 0)));
var result = this.dropNodesMutationRunner.run(input);
String typename = JsonPath.read(result.data(), "$.data.dropNodes.__typename");
assertThat(typename).isEqualTo(SuccessPayload.class.getSimpleName());
Expand All @@ -132,8 +132,7 @@ public void dropPartFromDiagramToPackageThenFromPackageToPart() {
diagramId.get(),
List.of(partNodeId.get()),
diagramId.get(),
0,
0);
List.of(new Position(0, 0)));
var result = this.dropNodesMutationRunner.run(input);
String typename = JsonPath.read(result.data(), "$.data.dropNodes.__typename");
assertThat(typename).isEqualTo(SuccessPayload.class.getSimpleName());
Expand Down
2 changes: 1 addition & 1 deletion backend/application/syson-sysml-export/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/application/syson-sysml-import/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/application/syson-sysml-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private static class FeatureTypeTestModel {
private ItemUsage item3;
private ItemUsage item4;

public FeatureTypeTestModel() {
FeatureTypeTestModel() {
this.build();
}

Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-diagram-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-direct-edit-grammar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
<antlr.version>4.13.2</antlr.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-form-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-model-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-representation-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
<antlr.version>4.10.1</antlr.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-sysml-metamodel-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-sysml-rest-api-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-table-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/services/syson-tree-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/views/syson-common-view/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion backend/views/syson-diagram-common-view/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.12.4</sirius.web.version>
<sirius.web.version>2025.12.5</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2024, 2025 Obeo.
* Copyright (c) 2024, 2026 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
Expand Down Expand Up @@ -33,6 +33,7 @@
import org.eclipse.syson.diagram.common.view.services.ViewEdgeToolSwitch;
import org.eclipse.syson.diagram.services.aql.DiagramMutationAQLService;
import org.eclipse.syson.diagram.services.aql.DiagramQueryAQLService;
import org.eclipse.syson.services.DeleteService;
import org.eclipse.syson.util.AQLConstants;
import org.eclipse.syson.util.AQLUtils;
import org.eclipse.syson.util.IDescriptionNameGenerator;
Expand Down Expand Up @@ -139,7 +140,7 @@ public void link(DiagramDescription diagramDescription, IViewDiagramElementFinde

private NodePalette createNodePalette(IViewDiagramElementFinder cache) {
var changeContext = this.viewBuilderHelper.newChangeContext()
.expression(AQLUtils.getSelfServiceCallExpression("deleteFromModel"));
.expression(ServiceMethod.of0(DeleteService::deleteFromModel).aqlSelf());

var deleteTool = this.diagramBuilderHelper.newDeleteTool()
.name(this.getRemoveToolLabel())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2024, 2025 Obeo.
* Copyright (c) 2024, 2026 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
Expand Down Expand Up @@ -44,11 +44,12 @@
import org.eclipse.sirius.components.view.emf.diagram.ViewDiagramDescriptionConverter;
import org.eclipse.syson.diagram.common.view.services.NodeDefaultSizeExpressionSwitch;
import org.eclipse.syson.diagram.common.view.services.ViewEdgeToolSwitch;
import org.eclipse.syson.diagram.common.view.services.ViewLabelService;
import org.eclipse.syson.diagram.common.view.services.dto.NodeDefaultSizeExpression;
import org.eclipse.syson.diagram.services.aql.DiagramMutationAQLService;
import org.eclipse.syson.diagram.services.aql.DiagramQueryAQLService;
import org.eclipse.syson.services.DeleteService;
import org.eclipse.syson.services.UtilService;
import org.eclipse.syson.util.AQLUtils;
import org.eclipse.syson.util.IDescriptionNameGenerator;
import org.eclipse.syson.util.ServiceMethod;
import org.eclipse.syson.util.SysMLMetamodelHelper;
Expand Down Expand Up @@ -201,7 +202,7 @@ protected InsideLabelStyle createInsideLabelStyle() {
.borderSize(0)
.headerSeparatorDisplayMode(HeaderSeparatorDisplayMode.IF_CHILDREN)
.labelColor(this.colorProvider.getColor(ViewConstants.DEFAULT_LABEL_COLOR))
.showIconExpression(AQLUtils.getSelfServiceCallExpression("showIcon"))
.showIconExpression(ServiceMethod.of0(ViewLabelService::showIcon).aqlSelf())
.withHeader(true)
.build();
}
Expand All @@ -222,7 +223,7 @@ protected NodeStyleDescription createDefinitionNodeStyle() {

protected NodePalette createNodePalette(NodeDescription nodeDescription, IViewDiagramElementFinder cache) {
var changeContext = this.viewBuilderHelper.newChangeContext()
.expression(AQLUtils.getSelfServiceCallExpression("deleteFromModel"));
.expression(ServiceMethod.of0(DeleteService::deleteFromModel).aqlSelf());

var deleteTool = this.diagramBuilderHelper.newDeleteTool()
.name("Delete from Model")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2024, 2025 Obeo.
* Copyright (c) 2024, 2026 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
Expand Down Expand Up @@ -38,6 +38,7 @@
import org.eclipse.syson.diagram.common.view.services.description.ToolDescriptionService;
import org.eclipse.syson.diagram.common.view.tools.ToolSectionDescription;
import org.eclipse.syson.diagram.services.aql.DiagramMutationAQLService;
import org.eclipse.syson.services.UtilService;
import org.eclipse.syson.sysml.SysmlPackage;
import org.eclipse.syson.util.AQLConstants;
import org.eclipse.syson.util.AQLUtils;
Expand Down Expand Up @@ -171,7 +172,7 @@ private NodeTool createNodeToolFromPackage(NodeDescription nodeDescription, ECla
.children(changeContexMembership.build());

var changeContextViewUsageOwner = this.viewBuilderHelper.newChangeContext()
.expression(AQLUtils.getSelfServiceCallExpression("getViewUsageOwner"))
.expression(ServiceMethod.of0(UtilService::getViewUsageOwner).aqlSelf())
.children(createMembership.build());

return builder
Expand Down
Loading
Loading