Skip to content

Commit 72f65c7

Browse files
AxelRICHARDAxelRICHARD
committed
[releng] Switch to Sirius Web 2025.1.6
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 6b127d9 commit 72f65c7

File tree

65 files changed

+543
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+543
-423
lines changed

‎CHANGELOG.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ It replaces the public methods _UtilService.moveMembership_ and _ToolService.mov
1414

1515
=== Dependency update
1616

17-
- Switch to Sirius Web 2025.1.5
17+
- Switch to Sirius Web 2025.1.6
1818
- https://github.com/eclipse-syson/syson/issues/953[#953] [rest-apis] Backend module `syson-sysml-rest-api-services` now depends on `jackson-datatype-jsr310` for JSON dates serialization
1919

2020
=== Bug fixes

‎backend/application/syson-application-configuration/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>17</java.version>
32-
<sirius.web.version>2025.1.5</sirius.web.version>
32+
<sirius.web.version>2025.1.6</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024 Obeo.
2+
* Copyright (c) 2024, 2025 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
1818

1919
import org.eclipse.emf.ecore.resource.Resource;
2020
import org.eclipse.emf.edit.domain.EditingDomain;
21-
import org.eclipse.sirius.components.collaborative.widget.reference.api.IReferenceWidgetRootCandidateSearchProvider;
21+
import org.eclipse.sirius.components.collaborative.browser.api.IModelBrowserRootCandidateSearchProvider;
2222
import org.eclipse.sirius.components.core.api.IEditingContext;
2323
import org.eclipse.sirius.components.emf.ResourceMetadataAdapter;
2424
import org.eclipse.sirius.components.emf.services.api.IEMFEditingContext;
@@ -32,7 +32,7 @@
3232
* @author arichard
3333
*/
3434
@Service
35-
public class SysONReferenceWidgetRootCandidateSearchProvider implements IReferenceWidgetRootCandidateSearchProvider {
35+
public class SysONReferenceWidgetRootCandidateSearchProvider implements IModelBrowserRootCandidateSearchProvider {
3636

3737
@Override
3838
public boolean canHandle(String descriptionId) {

‎backend/application/syson-application/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>17</java.version>
32-
<sirius.web.version>2025.1.5</sirius.web.version>
32+
<sirius.web.version>2025.1.6</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

‎backend/application/syson-application/src/test/java/org/eclipse/syson/application/controller/editingContext/checkers/SemanticCheckerService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024 Obeo.
2+
* Copyright (c) 2024, 2025 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -46,7 +46,7 @@ public ISemanticChecker getElementInParentSemanticChecker(String parentLabel, ER
4646
}
4747

4848
public void checkEditingContext(ISemanticChecker semanticChecker, Step<DiagramRefreshedEventPayload> verifier) {
49-
Runnable runnableChecker = this.semanticRunnableFactory.createRunnable(SysMLv2Identifiers.GENERAL_VIEW_WITH_TOP_NODES_PROJECT,
49+
Runnable runnableChecker = this.semanticRunnableFactory.createRunnable(SysMLv2Identifiers.GENERAL_VIEW_WITH_TOP_NODES_EDITING_CONTEXT_ID,
5050
(editingContext, executeEditingContextFunctionInput) -> {
5151
semanticChecker.check(editingContext);
5252
return new ExecuteEditingContextFunctionSuccessPayload(executeEditingContextFunctionInput.id(), true);

‎backend/application/syson-application/src/test/java/org/eclipse/syson/application/controller/explorer/testers/ExpandTreeItemTester.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024 Obeo.
2+
* Copyright (c) 2024, 2025 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -20,7 +20,6 @@
2020
import java.util.Map;
2121

2222
import org.eclipse.sirius.components.trees.tests.graphql.ExpandAllTreePathQueryRunner;
23-
import org.eclipse.syson.application.data.SysMLv2Identifiers;
2423
import org.springframework.beans.factory.annotation.Autowired;
2524
import org.springframework.stereotype.Service;
2625

@@ -41,9 +40,9 @@ public class ExpandTreeItemTester {
4140
@Autowired
4241
private ExpandAllTreePathQueryRunner expandAllTreePathQueryRunner;
4342

44-
public List<String> expandTreeItem(String projectId, String treeId, String treeItemId) {
43+
public List<String> expandTreeItem(String editingContextId, String treeId, String treeItemId) {
4544
Map<String, Object> expandVariables = Map.of(
46-
"editingContextId", SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT,
45+
"editingContextId", editingContextId,
4746
"treeId", treeId,
4847
"treeItemId", treeItemId);
4948
String result = this.expandAllTreePathQueryRunner.run(expandVariables);

‎backend/application/syson-application/src/test/java/org/eclipse/syson/application/controller/explorer/view/SysONExplorerTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void getAvailableExplorersForSysMLv2Project() {
109109
TestTransaction.end();
110110
TestTransaction.start();
111111
Map<String, Object> explorerVariables = Map.of(
112-
"editingContextId", SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT);
112+
"editingContextId", SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID);
113113
var explorerResult = this.explorerDescriptionsQueryRunner.run(explorerVariables);
114114
List<String> explorerIds = JsonPath.read(explorerResult, "$.data.viewer.editingContext.explorerDescriptions[*].id");
115115
assertThat(explorerIds).hasSize(1);
@@ -125,7 +125,7 @@ public void getAvailableExplorersForStudioProject() {
125125
TestTransaction.end();
126126
TestTransaction.start();
127127
Map<String, Object> explorerVariables = Map.of(
128-
"editingContextId", SysMLv2Identifiers.SYSON_STUDIO_PROJECT);
128+
"editingContextId", SysMLv2Identifiers.SYSON_STUDIO_EDITING_CONTEXT_ID);
129129
var explorerResult = this.explorerDescriptionsQueryRunner.run(explorerVariables);
130130
List<String> explorerIds = JsonPath.read(explorerResult, "$.data.viewer.editingContext.explorerDescriptions[*].id");
131131
assertThat(explorerIds).hasSize(1);
@@ -139,7 +139,7 @@ public void getAvailableExplorersForStudioProject() {
139139
public void getExplorerContentWithDefaultFilters() {
140140

141141
var explorerRepresentationId = this.representationIdBuilder.buildExplorerRepresentationId(this.treeDescriptionId, List.of(), this.defaultFilters);
142-
var input = new ExplorerEventInput(UUID.randomUUID(), SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT, explorerRepresentationId);
142+
var input = new ExplorerEventInput(UUID.randomUUID(), SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID, explorerRepresentationId);
143143
var flux = this.explorerEventSubscriptionRunner.run(input);
144144

145145
AtomicReference<String> sysmlModelTreeItemId = new AtomicReference<>();
@@ -169,14 +169,14 @@ public void getExplorerContentWithDefaultFilters() {
169169

170170
StepVerifier.create(flux)
171171
.consumeNextWith(initialExplorerContentConsumer)
172-
.then(() -> expandedTreeItemIds.addAll(this.expandTreeItemTester.expandTreeItem(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT, treeId.get(), sysmlModelTreeItemId.get())))
172+
.then(() -> expandedTreeItemIds.addAll(this.expandTreeItemTester.expandTreeItem(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID, treeId.get(), sysmlModelTreeItemId.get())))
173173
.then(() -> expandedTreeItemIds
174-
.addAll(this.expandTreeItemTester.expandTreeItem(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT, treeId.get(), librariesDirectoryTreeItemId.get())))
174+
.addAll(this.expandTreeItemTester.expandTreeItem(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID, treeId.get(), librariesDirectoryTreeItemId.get())))
175175
.thenCancel()
176176
.verify(Duration.ofSeconds(10));
177177

178178
var updatedExplorerRepresentationId = this.representationIdBuilder.buildExplorerRepresentationId(this.treeDescriptionId, expandedTreeItemIds, this.defaultFilters);
179-
var updatedInput = new ExplorerEventInput(UUID.randomUUID(), SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT, updatedExplorerRepresentationId);
179+
var updatedInput = new ExplorerEventInput(UUID.randomUUID(), SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID, updatedExplorerRepresentationId);
180180
var updatedFlux = this.explorerEventSubscriptionRunner.run(updatedInput);
181181

182182
var updatedExplorerContentConsumer = this.getTreeSubscriptionConsumer(tree -> {
@@ -220,7 +220,7 @@ public void getRootContentWithHideMembershipsAndHideKerMLStandardLibraries() {
220220

221221
List<String> filters = List.of(SysONTreeFilterProvider.HIDE_MEMBERSHIPS_TREE_ITEM_FILTER_ID, SysONTreeFilterProvider.HIDE_KERML_STANDARD_LIBRARIES_TREE_FILTER_ID);
222222
var explorerRepresentationId = this.representationIdBuilder.buildExplorerRepresentationId(this.treeDescriptionId, List.of(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_MODEL), filters);
223-
var input = new ExplorerEventInput(UUID.randomUUID(), SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT, explorerRepresentationId);
223+
var input = new ExplorerEventInput(UUID.randomUUID(), SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID, explorerRepresentationId);
224224
var flux = this.explorerEventSubscriptionRunner.run(input);
225225

226226
var initialExplorerContentConsumer = this.getTreeSubscriptionConsumer(tree -> {

‎backend/application/syson-application/src/test/java/org/eclipse/syson/application/controller/objects/ObjectCreationTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024 Obeo.
2+
* Copyright (c) 2024, 2025 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -78,7 +78,7 @@ public void setUp() {
7878
public void givenImportedDocumentWhenRootObjectIsCreatedThenItIsCreatedProperlyAndDocumentIsNotImported() {
7979
this.givenCommittedTransaction.commit();
8080

81-
this.semanticRunnableFactory.createRunnable(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT,
81+
this.semanticRunnableFactory.createRunnable(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID,
8282
(editingContext, executeEditingContextFunctionInput) -> {
8383
Optional<Resource> optResource = this.getResource(editingContext, SysMLv2Identifiers.GENERAL_VIEW_EMPTY_MODEL);
8484
assertThat(optResource).isPresent();
@@ -89,7 +89,7 @@ public void givenImportedDocumentWhenRootObjectIsCreatedThenItIsCreatedProperlyA
8989

9090
var input = new CreateRootObjectInput(
9191
UUID.randomUUID(),
92-
SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT,
92+
SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID,
9393
UUID.fromString(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_MODEL),
9494
SysmlPackage.eNS_URI,
9595
"SysMLv2EditService-Package");
@@ -108,7 +108,7 @@ public void givenImportedDocumentWhenRootObjectIsCreatedThenItIsCreatedProperlyA
108108
String objectKind = JsonPath.read(result, "$.data.createRootObject.object.kind");
109109
assertThat(objectKind).isEqualTo("siriusComponents://semantic?domain=sysml&entity=Package");
110110

111-
this.semanticRunnableFactory.createRunnable(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_PROJECT,
111+
this.semanticRunnableFactory.createRunnable(SysMLv2Identifiers.GENERAL_VIEW_EMPTY_EDITING_CONTEXT_ID,
112112
(editingContext, executeEditingContextFunctionInput) -> {
113113
Optional<Resource> optResource = this.getResource(editingContext, SysMLv2Identifiers.GENERAL_VIEW_EMPTY_MODEL);
114114
assertThat(optResource).isPresent();

‎backend/application/syson-application/src/test/java/org/eclipse/syson/application/controller/relatedelements/view/RelatedElementsViewTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024 Obeo.
2+
* Copyright (c) 2024, 2025 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -71,7 +71,7 @@ public void beforeEach() {
7171
@Test
7272
public void getRelatedElementsView() {
7373
var relatedElementRepresentationId = this.representationIdBuilder.buildRelatedElementsRepresentationId(List.of(SysMLv2Identifiers.INTERCONNECTION_VIEW_EMPTY_DIAGRAM_OBJECT.toString()));
74-
var input = new RelatedElementsEventInput(UUID.randomUUID(), SysMLv2Identifiers.INTERCONNECTION_VIEW_EMPTY_PROJECT.toString(), relatedElementRepresentationId);
74+
var input = new RelatedElementsEventInput(UUID.randomUUID(), SysMLv2Identifiers.INTERCONNECTION_VIEW_EMPTY_EDITING_CONTEXT_ID.toString(), relatedElementRepresentationId);
7575
var flux = this.relatedElementsEventSubscriptionRunner.run(input);
7676

7777
Predicate<Form> formPredicate = form -> {

‎backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVAddExistingElementsTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024 Obeo.
2+
* Copyright (c) 2024, 2025 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -105,12 +105,12 @@ public class GVAddExistingElementsTests extends AbstractIntegrationTests {
105105
public void setUp() {
106106
this.givenInitialServerState.initialize();
107107
var diagramEventInput = new DiagramEventInput(UUID.randomUUID(),
108-
SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_PROJECT,
108+
SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_EDITING_CONTEXT_ID,
109109
SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_DIAGRAM);
110110
var flux = this.givenDiagramSubscription.subscribe(diagramEventInput);
111111
this.verifier = StepVerifier.create(flux);
112112
this.diagram = this.givenDiagram.getDiagram(this.verifier);
113-
this.diagramDescription = this.givenDiagramDescription.getDiagramDescription(SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_PROJECT,
113+
this.diagramDescription = this.givenDiagramDescription.getDiagramDescription(SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_EDITING_CONTEXT_ID,
114114
SysMLv2Identifiers.GENERAL_VIEW_DIAGRAM_DESCRIPTION_ID);
115115
this.diagramDescriptionIdProvider = new DiagramDescriptionIdProvider(this.diagramDescription, this.diagramIdProvider);
116116
}
@@ -129,7 +129,7 @@ public void tearDown() {
129129
public void addExistingElementsOnDiagram() {
130130
String creationToolId = this.diagramDescriptionIdProvider.getDiagramCreationToolId("Add existing elements");
131131
assertThat(creationToolId).as("The tool 'Add existing elements' should exist on the diagram").isNotNull();
132-
this.verifier.then(() -> this.nodeCreationTester.createNodeOnDiagram(SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_PROJECT, this.diagram, creationToolId));
132+
this.verifier.then(() -> this.nodeCreationTester.createNodeOnDiagram(SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_EDITING_CONTEXT_ID, this.diagram, creationToolId));
133133

134134
Consumer<DiagramRefreshedEventPayload> updatedDiagramConsumer = payload -> Optional.of(payload)
135135
.map(DiagramRefreshedEventPayload::diagram)
@@ -153,7 +153,7 @@ public void addExistingElementsOnDiagram() {
153153
public void addExistingElementsRecursiveOnDiagram() {
154154
String creationToolId = this.diagramDescriptionIdProvider.getDiagramCreationToolId("Add existing elements (recursive)");
155155
assertThat(creationToolId).as("The tool 'Add existing elements (recursive)' should exist on the diagram").isNotNull();
156-
this.verifier.then(() -> this.nodeCreationTester.createNodeOnDiagram(SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_PROJECT, this.diagram, creationToolId));
156+
this.verifier.then(() -> this.nodeCreationTester.createNodeOnDiagram(SysMLv2Identifiers.GENERAL_VIEW_ADD_EXISTING_ELEMENTS_EDITING_CONTEXT_ID, this.diagram, creationToolId));
157157

158158
Consumer<DiagramRefreshedEventPayload> updatedDiagramConsumer = payload -> Optional.of(payload)
159159
.map(DiagramRefreshedEventPayload::diagram)

0 commit comments

Comments
 (0)