From a8363c56419468b3bc5f2f1995b7cc1b93431e2a Mon Sep 17 00:00:00 2001 From: Michael Charfadi Date: Fri, 17 Mar 2023 11:12:30 +0100 Subject: [PATCH] [1860] Change descriptionId type of Node and Edge from UUID to String MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug : https://github.com/eclipse-sirius/sirius-components/issues/1860 Signed-off-by: Michaël Charfadi --- CHANGELOG.adoc | 1 + .../CreateViewOperationHandler.java | 9 +- .../diagrams/EdgeMappingConverterTests.java | 31 +++--- .../CreateViewOperationHandlerTests.java | 4 +- .../DeleteViewOperationHandlerTests.java | 6 +- .../AbstractNodeMappingConverter.java | 7 +- .../diagrams/EdgeMappingConverter.java | 8 +- ...RelationBasedSemanticElementsProvider.java | 9 +- .../diagrams/ConnectorToolsProvider.java | 7 +- ...ptionNodeAndEdgeDescriptionsPopulator.java | 3 +- .../services/diagrams/IToolProvider.java | 3 +- .../services/diagrams/ToolProvider.java | 68 +++++++------- .../DomainBasedSourceNodesProviderTests.java | 4 +- .../diagrams/MappingConverterTests.java | 68 ++++++-------- ...RelationBasedSourceNodesProviderTests.java | 4 +- .../diagrams/DiagramDescriptionService.java | 7 +- .../api/IDiagramDescriptionService.java | 11 +-- .../handlers/GetToolSectionsEventHandler.java | 5 +- .../DeleteFromDiagramEventHandlerTests.java | 10 +- .../GetConnectorToolsEventHandlerTests.java | 2 +- ...OnDiagramElementToolEventHandlerTests.java | 16 ++-- .../ReconnectEdgeEventHandlerTests.java | 14 +-- ...DefaultTestDiagramDescriptionProvider.java | 94 +++++++++---------- .../diagrams/tests/TestDiagramBuilder.java | 4 +- .../tests/TestDiagramDescriptionBuilder.java | 25 +++-- .../builder/TestLayoutDiagramBuilder.java | 6 +- .../builder/node/IconlabelNodeBuilder.java | 36 +++---- .../tests/builder/node/ImageNodeBuilder.java | 36 +++---- .../builder/node/RectangleNodeBuilder.java | 36 +++---- .../sirius/components/diagrams/Edge.java | 9 +- .../sirius/components/diagrams/Node.java | 9 +- .../diagrams/ViewCreationRequest.java | 11 +-- .../components/INodeDescriptionRequestor.java | 5 +- .../diagrams/components/NodeComponent.java | 15 ++- .../components/NodeDescriptionRequestor.java | 5 +- .../diagrams/description/EdgeDescription.java | 15 ++- .../IDiagramElementDescription.java | 4 +- .../diagrams/description/NodeDescription.java | 35 ++++--- .../diagrams/elements/EdgeElementProps.java | 11 +-- .../diagrams/elements/NodeElementProps.java | 9 +- .../DiagramElementChangeVisibilityTests.java | 4 +- .../renderer/DiagramRendererEdgeTests.java | 14 +-- .../renderer/DiagramRendererNodeTests.java | 10 +- .../renderer/UnsynchronizedDiagramTests.java | 10 +- .../ConnectorToolsProviderDiagram.java | 7 +- ...RelationBasedSemanticElementsProvider.java | 9 +- .../view/emf/diagram/TargetNodesProvider.java | 9 +- .../ViewDiagramDescriptionConverter.java | 8 +- ...InitialDirectEditElementLabelProvider.java | 14 +-- 49 files changed, 357 insertions(+), 390 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index d3605534bd1..8df53ef784c 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -11,6 +11,7 @@ === Breaking changes +- https://github.com/eclipse-sirius/sirius-components/issues/1860[1860] [view] Changed the type of descriptionId of Node and Edge from UUID to String - https://github.com/eclipse-sirius/sirius-components/issues/1643[1643] [core] Removed our dependencies to Spring Security - https://github.com/eclipse-sirius/sirius-components/issues/1592[#1592] [view] In View-based diagram definition, all tools applicable on a given element are now configured inside the new _Palette_ element directly inside the element (diagram, node or edge) description. - https://github.com/eclipse-sirius/sirius-components/issues/1761[#1761] [core] Remove `sirius-web-graphql-schema` since it was not really used anymore diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java index 79de225837a..7d3ce3ea4d3 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java @@ -17,7 +17,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.UUID; import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext; import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; @@ -102,7 +101,7 @@ public IStatus handle(Map variables) { containmentKind = NodeContainmentKind.BORDER_NODE; } - UUID descriptionId = UUID.fromString(diagramElementMappingId); + String descriptionId = diagramElementMappingId; ViewCreationRequest viewCreationRequest = ViewCreationRequest.newViewCreationRequest() .parentElementId(optionalParentElementId.get()) .descriptionId(descriptionId) @@ -111,9 +110,9 @@ public IStatus handle(Map variables) { .build(); Optional.ofNullable(variables.get(IDiagramContext.DIAGRAM_CONTEXT)) - .filter(IDiagramContext.class::isInstance) - .map(IDiagramContext.class::cast) - .ifPresent(diagramContext -> diagramContext.getViewCreationRequests().add(viewCreationRequest)); + .filter(IDiagramContext.class::isInstance) + .map(IDiagramContext.class::cast) + .ifPresent(diagramContext -> diagramContext.getViewCreationRequests().add(viewCreationRequest)); } catch (IllegalArgumentException exception) { this.logger.warn(exception.getMessage(), exception); } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java index e8e4ffe5a3f..3e28e7aa6bd 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; -import java.util.UUID; import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; import org.eclipse.sirius.components.compatibility.api.IModelOperationHandlerSwitchProvider; @@ -64,12 +63,12 @@ public void testEdgeFromNodeToContainer() { edgeMapping.getTargetMapping().add(containerMapping); // @formatter:off - UUID nodeMappingUUID = UUID.nameUUIDFromBytes(nodeMapping.getName().getBytes()); - UUID containerMappingUUID = UUID.nameUUIDFromBytes(containerMapping.getName().getBytes()); - Map id2NodeDescriptions = Map.of( + String nodeMappingUUID = nodeMapping.getName(); + String containerMappingUUID = containerMapping.getName(); + Map id2NodeDescriptions = Map.of( nodeMappingUUID, this.createNodeDescription(nodeMappingUUID), containerMappingUUID, this.createNodeDescription(containerMappingUUID) - ); + ); // @formatter:on IObjectService objectService = new IObjectService.NoOp(); @@ -90,7 +89,7 @@ public String getIdentifier(Object element) { assertThat(edgeDescription.getTargetNodeDescriptions()).contains(id2NodeDescriptions.get(containerMappingUUID)); } - private NodeDescription createNodeDescription(UUID id) { + private NodeDescription createNodeDescription(String nodeMappingUUID) { // @formatter:off LabelStyleDescription styleDescription = LabelStyleDescription.newLabelStyleDescription() .colorProvider(variableManager -> "") @@ -102,13 +101,13 @@ private NodeDescription createNodeDescription(UUID id) { .iconURLProvider(variableManager -> "") .build(); - LabelDescription labelDescription = LabelDescription.newLabelDescription(id.toString()) + LabelDescription labelDescription = LabelDescription.newLabelDescription(nodeMappingUUID.toString()) .idProvider(variableManager -> "") .textProvider(variableManager -> "") .styleDescriptionProvider(variableManager -> styleDescription) .build(); - return NodeDescription.newNodeDescription(id) + return NodeDescription.newNodeDescription(nodeMappingUUID) .typeProvider(variableManager -> "") .targetObjectIdProvider(variableManager -> "") .targetObjectKindProvider(variableManager -> "") @@ -141,12 +140,12 @@ public void testEdgeFromContainerToNode() { edgeMapping.getTargetMapping().add(nodeMapping); // @formatter:off - UUID nodeMappingUUID = UUID.nameUUIDFromBytes(nodeMapping.getName().getBytes()); - UUID containerMappingUUID = UUID.nameUUIDFromBytes(containerMapping.getName().getBytes()); - Map id2NodeDescriptions = Map.of( + String nodeMappingUUID = nodeMapping.getName(); + String containerMappingUUID = containerMapping.getName(); + Map id2NodeDescriptions = Map.of( nodeMappingUUID, this.createNodeDescription(nodeMappingUUID), containerMappingUUID, this.createNodeDescription(containerMappingUUID) - ); + ); // @formatter:on IObjectService objectService = new IObjectService.NoOp(); IRepresentationMetadataSearchService representationMetadataSearchService = new IRepresentationMetadataSearchService.NoOp(); @@ -182,12 +181,12 @@ public void testEdgeFromContainerToContainer() { edgeMapping.getTargetMapping().add(targetContainerMapping); // @formatter:off - UUID sourceContainerMappingUUID = UUID.nameUUIDFromBytes(sourceContainerMapping.getName().getBytes()); - UUID targetContainerMappingUUID = UUID.nameUUIDFromBytes(targetContainerMapping.getName().getBytes()); - Map id2NodeDescriptions = Map.of( + String sourceContainerMappingUUID = sourceContainerMapping.getName(); + String targetContainerMappingUUID = targetContainerMapping.getName(); + Map id2NodeDescriptions = Map.of( sourceContainerMappingUUID, this.createNodeDescription(sourceContainerMappingUUID), targetContainerMappingUUID, this.createNodeDescription(targetContainerMappingUUID) - ); + ); // @formatter:on IObjectService objectService = new IObjectService.NoOp(); IRepresentationMetadataSearchService representationMetadataSearchService = new IRepresentationMetadataSearchService.NoOp(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java index 1297efca008..0376cbf5d9f 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java @@ -85,7 +85,7 @@ public void initialize() { .canCreatePredicate(variableManager -> true) .labelProvider(variableManager -> "Diagram") .toolSections(List.of()) - .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID()))) + .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID().toString()))) .edgeDescriptions(List.of()) .dropHandler(variableManager -> new Failure("")) .build(); @@ -184,7 +184,7 @@ private void handleAndCheckExecution(String variableName, ENamedElement renamedE assertEquals(newName, renamedElement.getName()); } - private NodeDescription getNodeDescription(UUID nodeDescriptionId) { + private NodeDescription getNodeDescription(String nodeDescriptionId) { // @formatter:off LabelStyleDescription labelStyleDescription = LabelStyleDescription.newLabelStyleDescription() .colorProvider(variableManager -> "#000000") diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java index 3219b2c1b52..afa2f28671f 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java @@ -86,13 +86,13 @@ public void initialize() { .canCreatePredicate(variableManager -> true) .labelProvider(variableManager -> "Diagram") .toolSections(List.of()) - .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID()))) + .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID().toString()))) .edgeDescriptions(List.of()) .dropHandler(variableManager -> new Failure("")) .build(); Node node = Node.newNode(UUID.randomUUID().toString()) - .descriptionId(UUID.randomUUID()) + .descriptionId(UUID.randomUUID().toString()) .type("Node") .targetObjectId(UUID.randomUUID().toString()) .targetObjectKind("ecore::EPackage") @@ -158,7 +158,7 @@ public void deleteViewOperationHandlerNominalCaseTest() { assertTrue(handleResult instanceof Success); } - private NodeDescription getNodeDescription(UUID nodeDescriptionId) { + private NodeDescription getNodeDescription(String nodeDescriptionId) { // @formatter:off LabelStyleDescription labelStyleDescription = LabelStyleDescription.newLabelStyleDescription() .colorProvider(variableManager -> "#000000") diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java index bf1e5319253..beb2706f323 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java @@ -17,7 +17,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.UUID; import java.util.function.Function; import org.eclipse.sirius.components.compatibility.api.IIdentifierProvider; @@ -75,7 +74,7 @@ public AbstractNodeMappingConverter(IObjectService objectService, IEditService e this.imageSizeProvider = Objects.requireNonNull(imageSizeService); } - public NodeDescription convert(AbstractNodeMapping abstractNodeMapping, AQLInterpreter interpreter, Map id2NodeDescriptions) { + public NodeDescription convert(AbstractNodeMapping abstractNodeMapping, AQLInterpreter interpreter, Map id2NodeDescriptions) { LabelStyleDescriptionConverter labelStyleDescriptionConverter = new LabelStyleDescriptionConverter(interpreter, this.objectService); Function abstractNodeMappingDescriptionProvider = new LabelStyleDescriptionProvider(interpreter, abstractNodeMapping); @@ -146,7 +145,7 @@ public NodeDescription convert(AbstractNodeMapping abstractNodeMapping, AQLInter } // @formatter:off - NodeDescription description = NodeDescription.newNodeDescription(UUID.fromString(this.identifierProvider.getIdentifier(abstractNodeMapping))) + NodeDescription description = NodeDescription.newNodeDescription(this.identifierProvider.getIdentifier(abstractNodeMapping)) .typeProvider(typeProvider) .targetObjectIdProvider(semanticTargetIdProvider) .targetObjectKindProvider(semanticTargetKindProvider) @@ -195,7 +194,7 @@ private Function getLabelIdProvider() { }; } - private List getChildNodeDescriptions(AbstractNodeMapping abstractNodeMapping, AQLInterpreter interpreter, Map id2NodeDescriptions) { + private List getChildNodeDescriptions(AbstractNodeMapping abstractNodeMapping, AQLInterpreter interpreter, Map id2NodeDescriptions) { // @formatter:off List childNodeDescriptions = new ArrayList<>(); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java index 24ebb5ac3b5..81ddd1cca61 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java @@ -68,7 +68,7 @@ public EdgeMappingConverter(IObjectService objectService, IEditService editServi this.modelOperationHandlerSwitchProvider = Objects.requireNonNull(modelOperationHandlerSwitchProvider); } - public EdgeDescription convert(EdgeMapping edgeMapping, AQLInterpreter interpreter, Map id2NodeDescriptions) { + public EdgeDescription convert(EdgeMapping edgeMapping, AQLInterpreter interpreter, Map id2NodeDescriptions) { Function targetIdProvider = variableManager -> { return variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getId).orElse(null); }; @@ -115,7 +115,7 @@ public EdgeDescription convert(EdgeMapping edgeMapping, AQLInterpreter interpret var deleteHandler = toolConverter.createDeleteToolHandler(edgeMapping.getDeletionDescription()); var labelEditHandler = toolConverter.createEdgeDirectEditToolHandler(edgeMapping.getLabelDirectEdit()); - Builder builder = EdgeDescription.newEdgeDescription(UUID.fromString(this.identifierProvider.getIdentifier(edgeMapping))) + Builder builder = EdgeDescription.newEdgeDescription(this.identifierProvider.getIdentifier(edgeMapping)) .targetObjectIdProvider(targetIdProvider) .targetObjectKindProvider(targetKindProvider) .targetObjectLabelProvider(targetLabelProvider) @@ -166,7 +166,7 @@ private LabelDescription createLabelDescription(AQLInterpreter interpreter, Labe * The mappings referenced by the edge description (source or target) * @return The relevant node descriptions created by the node and container description converters */ - private List getNodeDescriptions(List mappings, Map id2NodeDescriptions) { + private List getNodeDescriptions(List mappings, Map id2NodeDescriptions) { // @formatter:off return mappings.stream() .filter(AbstractNodeMapping.class::isInstance) @@ -188,7 +188,7 @@ private Function> getSemanticElementsProvider(AQLInterp semanticElementsProvider = this.semanticCandidatesProviderFactory.getSemanticCandidatesProvider(interpreter, domainClass, semanticCandidatesExpression, preconditionExpression); } else { // @formatter:off - List sourceNodeDescriptionIds = sourceNodeDescriptions.stream() + List sourceNodeDescriptionIds = sourceNodeDescriptions.stream() .map(NodeDescription::getId) .toList(); // @formatter:on diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSemanticElementsProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSemanticElementsProvider.java index d6eccd85996..2a26bedafb0 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSemanticElementsProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSemanticElementsProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2023 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 @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.UUID; import java.util.function.Function; import org.eclipse.sirius.components.diagrams.description.DiagramDescription; @@ -31,10 +30,10 @@ */ public class RelationBasedSemanticElementsProvider implements Function> { - private final List sourceNodeDescriptionIds; + private final List sourceNodeDescriptionIds; - public RelationBasedSemanticElementsProvider(List sourceNodeDescriptionIds) { - this.sourceNodeDescriptionIds = Objects.requireNonNull(sourceNodeDescriptionIds); + public RelationBasedSemanticElementsProvider(List sourceNodeDescriptionIds2) { + this.sourceNodeDescriptionIds = Objects.requireNonNull(sourceNodeDescriptionIds2); } @Override diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ConnectorToolsProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ConnectorToolsProvider.java index f0862fda81d..b534ea39a40 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ConnectorToolsProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ConnectorToolsProvider.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.UUID; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -150,8 +149,8 @@ private Optional mapDiagramElementToTargetObjectId(Object object) { return targetObjectId; } - private Optional mapDiagramElementToDescriptionId(Object object) { - Optional descriptionId = Optional.empty(); + private Optional mapDiagramElementToDescriptionId(Object object) { + Optional descriptionId = Optional.empty(); if (object instanceof Node) { descriptionId = Optional.of(((Node) object).getDescriptionId()); } else if (object instanceof Edge) { @@ -160,7 +159,7 @@ private Optional mapDiagramElementToDescriptionId(Object object) { return descriptionId; } - private Optional mapDescriptionIdToDescription(UUID descriptionId, DiagramDescription diagramDescription, Object diagramElement) { + private Optional mapDescriptionIdToDescription(String descriptionId, DiagramDescription diagramDescription, Object diagramElement) { Optional result = Optional.empty(); if (diagramElement instanceof Node) { var description = this.diagramDescriptionService.findNodeDescriptionById(diagramDescription, descriptionId); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java index f5b9d65a1ba..4de1ac5c6a4 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java @@ -19,7 +19,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.UUID; import java.util.function.Function; import org.eclipse.emf.ecore.EObject; @@ -86,7 +85,7 @@ public DiagramDescriptionNodeAndEdgeDescriptionsPopulator(IToolProvider toolProv @Override public Builder populate(Builder builder, DiagramDescription siriusDiagramDescription, AQLInterpreter interpreter) { - Map id2NodeDescriptions = new LinkedHashMap<>(); + Map id2NodeDescriptions = new LinkedHashMap<>(); // @formatter:off List layers = LayerModelHelper.getAllLayers(siriusDiagramDescription).stream() diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/IToolProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/IToolProvider.java index 1feb369d47d..36de619e5fc 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/IToolProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/IToolProvider.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Map; -import java.util.UUID; import org.eclipse.sirius.components.diagrams.description.EdgeDescription; import org.eclipse.sirius.components.diagrams.description.NodeDescription; @@ -28,5 +27,5 @@ * @author sbegaudeau */ public interface IToolProvider { - List getToolSections(Map id2NodeDescriptions, List edgeDescriptions, DiagramDescription siriusDiagramDescription, List layers); + List getToolSections(Map id2NodeDescriptions, List edgeDescriptions, DiagramDescription siriusDiagramDescription, List layers); } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java index a6999b3009d..90ebd91b892 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java @@ -123,16 +123,16 @@ public ToolProvider(IIdentifierProvider identifierProvider, IAQLInterpreterFacto } @Override - public List getToolSections(Map id2NodeDescriptions, List edgeDescriptions, DiagramDescription siriusDiagramDescription, List layers) { + public List getToolSections(Map id2NodeDescriptions, List edgeDescriptions, DiagramDescription siriusDiagramDescription, List layers) { List result = new ArrayList<>(); // @formatter:off var siriusToolSections = layers - .stream() - .flatMap(layer -> layer.getToolSections().stream()) - .filter(org.eclipse.sirius.diagram.description.tool.ToolSection.class::isInstance) - .map(org.eclipse.sirius.diagram.description.tool.ToolSection.class::cast) - .toList(); + .stream() + .flatMap(layer -> layer.getToolSections().stream()) + .filter(org.eclipse.sirius.diagram.description.tool.ToolSection.class::isInstance) + .map(org.eclipse.sirius.diagram.description.tool.ToolSection.class::cast) + .toList(); // @formatter:on AQLInterpreter interpreter = this.interpreterFactory.create(siriusDiagramDescription); for (var siriusToolSection : siriusToolSections) { @@ -175,8 +175,8 @@ private ToolSection convertToolSection(org.eclipse.sirius.diagram.description.to private List getToolDescriptions(org.eclipse.sirius.diagram.description.tool.ToolSection toolSection) { //@formatter:off return Stream.concat( - toolSection.getOwnedTools().stream(), - toolSection.getReusedTools().stream() + toolSection.getOwnedTools().stream(), + toolSection.getReusedTools().stream() ) .flatMap(toolEntry -> { if (toolEntry instanceof ToolGroup) { @@ -191,7 +191,7 @@ private List getToolDescriptions(org.eclipse.sirius.dia //@formatter:on } - private List getParentNodeDescriptions(List nodeMappings, Map id2NodeDescriptions) { + private List getParentNodeDescriptions(List nodeMappings, Map id2NodeDescriptions) { //@formatter:off return nodeMappings.stream() .map(AbstractNodeMapping::eContainer) @@ -214,7 +214,7 @@ private boolean atLeastOneRootMapping(List nodeMa //@formatter:on } - private Optional convertTool(Map id2NodeDescriptions, List edgeDescriptions, + private Optional convertTool(Map id2NodeDescriptions, List edgeDescriptions, org.eclipse.sirius.diagram.description.DiagramDescription siriusDiagramDescription, AbstractToolDescription siriusTool, AQLInterpreter interpreter) { Optional result = Optional.empty(); if (siriusTool instanceof NodeCreationDescription) { @@ -240,7 +240,7 @@ private Optional convertTool(Map id2NodeDescriptio return result; } - private SingleClickOnDiagramElementTool convertNodeCreationDescription(Map id2NodeDescriptions, AQLInterpreter interpreter, NodeCreationDescription nodeCreationTool) { + private SingleClickOnDiagramElementTool convertNodeCreationDescription(Map id2NodeDescriptions, AQLInterpreter interpreter, NodeCreationDescription nodeCreationTool) { String id = this.identifierProvider.getIdentifier(nodeCreationTool); String label = new IdentifiedElementQuery(nodeCreationTool).getLabel(); String imagePath = this.toolImageProvider.getImage(nodeCreationTool); @@ -262,7 +262,7 @@ private SingleClickOnDiagramElementTool convertNodeCreationDescription(Map id2NodeDescriptions, AQLInterpreter interpreter, + private SingleClickOnDiagramElementTool convertContainerCreationDescription(Map id2NodeDescriptions, AQLInterpreter interpreter, ContainerCreationDescription containerCreationDescription) { String id = this.identifierProvider.getIdentifier(containerCreationDescription); String label = new IdentifiedElementQuery(containerCreationDescription).getLabel(); @@ -285,7 +285,7 @@ private SingleClickOnDiagramElementTool convertContainerCreationDescription(Map< // @formatter:on } - private SingleClickOnDiagramElementTool convertToolDescription(Map id2NodeDescriptions, List edgeDescriptions, AQLInterpreter interpreter, + private SingleClickOnDiagramElementTool convertToolDescription(Map id2NodeDescriptions, List edgeDescriptions, AQLInterpreter interpreter, DiagramDescription siriusDiagramDescription, ToolDescription toolDescription) { String id = this.identifierProvider.getIdentifier(toolDescription); String label = new IdentifiedElementQuery(toolDescription).getLabel(); @@ -326,7 +326,7 @@ private SingleClickOnDiagramElementTool convertToolDescription(Map id2NodeDescriptions, List edgeDescriptions, AQLInterpreter interpreter, + private SingleClickOnDiagramElementTool convertOperationAction(Map id2NodeDescriptions, List edgeDescriptions, AQLInterpreter interpreter, DiagramDescription siriusDiagramDescription, OperationAction operationAction) { String id = this.identifierProvider.getIdentifier(operationAction); String label = new IdentifiedElementQuery(operationAction).getLabel(); @@ -390,7 +390,7 @@ private Collection getAllSubMappings(List id2NodeDescriptions, AQLInterpreter interpreter, + private SingleClickOnTwoDiagramElementsTool convertEdgeCreationDescription(Map id2NodeDescriptions, AQLInterpreter interpreter, EdgeCreationDescription edgeCreationDescription) { String id = this.identifierProvider.getIdentifier(edgeCreationDescription); String label = new IdentifiedElementQuery(edgeCreationDescription).getLabel(); @@ -411,9 +411,9 @@ private SingleClickOnTwoDiagramElementsTool convertEdgeCreationDescription(Map id2NodeDescriptions, AQLInterpreter interpreter, + private SingleClickOnDiagramElementTool convertDeleteElementDescription(Map id2NodeDescriptions, AQLInterpreter interpreter, DeleteElementDescription deleteElementDescription) { String id = this.identifierProvider.getIdentifier(deleteElementDescription); String label = new IdentifiedElementQuery(deleteElementDescription).getLabel(); @@ -466,11 +466,11 @@ private Function createContainerCreationHandler(AQLInt } else { // @formatter:off Optional.ofNullable(variables.get(IDiagramContext.DIAGRAM_CONTEXT)) - .filter(IDiagramContext.class::isInstance) - .map(IDiagramContext.class::cast) - .ifPresent(diagramContext -> { - variables.put(CONTAINER_VIEW, diagramContext.getDiagram()); - }); + .filter(IDiagramContext.class::isInstance) + .map(IDiagramContext.class::cast) + .ifPresent(diagramContext -> { + variables.put(CONTAINER_VIEW, diagramContext.getDiagram()); + }); // @formatter:on } var selectModelelementVariableOpt = new SelectModelElementVariableProvider().getSelectModelElementVariable(toolDescription.getVariable()); @@ -499,11 +499,11 @@ private Function createNodeCreationHandler(AQLInterpre } else { // @formatter:off Optional.ofNullable(variables.get(IDiagramContext.DIAGRAM_CONTEXT)) - .filter(IDiagramContext.class::isInstance) - .map(IDiagramContext.class::cast) - .ifPresent(diagramContext -> { - variables.put(CONTAINER_VIEW, diagramContext.getDiagram()); - }); + .filter(IDiagramContext.class::isInstance) + .map(IDiagramContext.class::cast) + .ifPresent(diagramContext -> { + variables.put(CONTAINER_VIEW, diagramContext.getDiagram()); + }); // @formatter:on } @@ -586,11 +586,11 @@ private Function createDeleteToolHandler(AQLInterprete variables.put(ELEMENT_VIEW, selectedNode); // @formatter:off Optional.ofNullable(variables.get(IDiagramContext.DIAGRAM_CONTEXT)) - .filter(IDiagramContext.class::isInstance) - .map(IDiagramContext.class::cast) - .ifPresent(diagramContext -> { - variables.put(CONTAINER_VIEW, this.getParentNode((Node) selectedNode, diagramContext.getDiagram())); - }); + .filter(IDiagramContext.class::isInstance) + .map(IDiagramContext.class::cast) + .ifPresent(diagramContext -> { + variables.put(CONTAINER_VIEW, this.getParentNode((Node) selectedNode, diagramContext.getDiagram())); + }); // @formatter:on } var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(interpreter); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java index a57e89a76a8..42cf8c98484 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java @@ -57,7 +57,7 @@ public void testComputeSourceNodes() { variableManager.put(VariableManager.SELF, object); DiagramRenderingCache cache = new DiagramRenderingCache(); - Element nodeElement = this.createNodeElement(UUID.fromString(nodeMapping.getName())); + Element nodeElement = this.createNodeElement(nodeMapping.getName()); cache.put(object, nodeElement); AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); @@ -75,7 +75,7 @@ public String getIdentifier(Object element) { assertThat(sourceNodes).contains(nodeElement); } - private Element createNodeElement(UUID descriptionId) { + private Element createNodeElement(String descriptionId) { // @formatter:off INodeStyle style = ImageNodeStyle.newImageNodeStyle() .imageURL("") diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java index 3d55da40691..8efa6832b10 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java @@ -72,32 +72,28 @@ public void testContainerStylePropertiesFromConditionalStyle() { // @formatter:off ContainerStyleDescription defaultStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(defaultStyle) - .labelExpression("aql: defaultStyle") - .labelSize(10) - .labelColor(this.getColor(1, 1, 1)); + .labelExpression("aql: defaultStyle") + .labelSize(10).labelColor(this.getColor(1, 1, 1)); ContainerStyleDescription firstConditionalStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(firstConditionalStyle) - .labelExpression("aql:'firstConditionalStyle'") - .labelSize(4) - .labelColor(this.getColor(3, 3, 3)); + .labelExpression("aql:'firstConditionalStyle'") + .labelSize(4).labelColor(this.getColor(3, 3, 3)); ContainerStyleDescription secondConditionalStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(secondConditionalStyle) - .labelExpression("aql:'secondConditionalStyle'") - .labelSize(6) - .bold() - .italic() - .underline() - .strikeThrough() - .labelColor(this.getColor(2, 2, 2)) - .iconPath(PLUGIN_ID + ICON_PATH); + .labelExpression("aql:'secondConditionalStyle'") + .labelSize(6) + .bold() + .italic() + .underline() + .strikeThrough() + .labelColor(this.getColor(2, 2, 2)).iconPath(PLUGIN_ID + ICON_PATH); ContainerStyleDescription thirdConditionalStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(thirdConditionalStyle) - .labelExpression("aql:'thirdConditionalStyle'") - .labelSize(8) - .labelColor(this.getColor(4, 4, 4)); + .labelExpression("aql:'thirdConditionalStyle'") + .labelSize(8).labelColor(this.getColor(4, 4, 4)); // @formatter:on containerMapping.setStyle(defaultStyle); @@ -119,7 +115,7 @@ public String getIdentifier(Object element) { var converter = new AbstractNodeMappingConverter(new IObjectService.NoOp(), new IEditService.NoOp(), identifierProvider, semanticCandidatesProviderFactory, modelOperationHandlerSwitchProvider, new ImageSizeProvider()); - NodeDescription convertedNodeDescription = converter.convert(containerMapping, interpreter, new HashMap()); + NodeDescription convertedNodeDescription = converter.convert(containerMapping, interpreter, new HashMap()); LabelDescription labelDescription = convertedNodeDescription.getLabelDescription(); String text = labelDescription.getTextProvider().apply(variableManager); @@ -178,7 +174,7 @@ public String getIdentifier(Object element) { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); var converter = new AbstractNodeMappingConverter(new IObjectService.NoOp(), new IEditService.NoOp(), identifierProvider, semanticCandidatesProviderFactory, modelOperationHandlerSwitchProvider, new ImageSizeProvider()); - NodeDescription convertedNodeDescription = converter.convert(containerMapping, interpreter, new HashMap()); + NodeDescription convertedNodeDescription = converter.convert(containerMapping, interpreter, new HashMap()); VariableManager variableManager = new VariableManager(); @@ -186,7 +182,7 @@ public String getIdentifier(Object element) { assertThat(convertedNodeDescription.getTypeProvider().apply(variableManager)).isEqualTo(NodeType.NODE_RECTANGLE); assertThat(convertedNodeDescription.getStyleProvider().apply(variableManager)).isInstanceOf(RectangularNodeStyle.class); assertThat(convertedNodeDescription.getStyleProvider().apply(variableManager)).asInstanceOf(InstanceOfAssertFactories.type(RectangularNodeStyle.class)) - .matches(RectangularNodeStyle::isWithHeader); + .matches(RectangularNodeStyle::isWithHeader); assertThat(convertedNodeDescription.getChildNodeDescriptions()).hasSize(1); NodeDescription subNodeDescription = convertedNodeDescription.getChildNodeDescriptions().get(0); @@ -204,32 +200,28 @@ public void testNodeStylePropertiesFromConditionalStyle() { // @formatter:off NodeStyleDescription defaultStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(defaultStyle) - .labelExpression("aql:'defaultStyle'") - .labelSize(10) - .labelColor(this.getColor(1, 1, 1)); + .labelExpression("aql:'defaultStyle'") + .labelSize(10).labelColor(this.getColor(1, 1, 1)); NodeStyleDescription firstConditionalStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(firstConditionalStyle) - .labelExpression("aql:'firstConditionalStyle'") - .labelSize(4) - .labelColor(this.getColor(3, 3, 3)); + .labelExpression("aql:'firstConditionalStyle'") + .labelSize(4).labelColor(this.getColor(3, 3, 3)); NodeStyleDescription secondConditionalStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(secondConditionalStyle) - .labelExpression("aql:'secondConditionalStyle'") - .labelSize(6) - .bold() - .italic() - .underline() - .strikeThrough() - .labelColor(this.getColor(2, 2, 2)) - .iconPath(PLUGIN_ID + ICON_PATH); + .labelExpression("aql:'secondConditionalStyle'") + .labelSize(6) + .bold() + .italic() + .underline() + .strikeThrough() + .labelColor(this.getColor(2, 2, 2)).iconPath(PLUGIN_ID + ICON_PATH); NodeStyleDescription thirdConditionalStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(thirdConditionalStyle) - .labelExpression("aql:'thirdConditionalStyle'") - .labelSize(8) - .labelColor(this.getColor(4, 4, 4)); + .labelExpression("aql:'thirdConditionalStyle'") + .labelSize(8).labelColor(this.getColor(4, 4, 4)); // @formatter:on nodeMapping.setStyle(defaultStyle); @@ -251,7 +243,7 @@ public String getIdentifier(Object element) { var converter = new AbstractNodeMappingConverter(new IObjectService.NoOp(), new IEditService.NoOp(), identifierProvider, semanticCandidatesProviderFactory, modelOperationHandlerSwitchProvider, new ImageSizeProvider()); - NodeDescription convertedNodeDescription = converter.convert(nodeMapping, interpreter, new HashMap()); + NodeDescription convertedNodeDescription = converter.convert(nodeMapping, interpreter, new HashMap()); LabelDescription labelDescription = convertedNodeDescription.getLabelDescription(); String text = labelDescription.getTextProvider().apply(variableManager); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java index 669383cccc1..c91e2f8cf9b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java @@ -54,7 +54,7 @@ public void testComputeSourceNodes() { variableManager.put(VariableManager.SELF, object); DiagramRenderingCache cache = new DiagramRenderingCache(); - Element nodeElement = this.createNodeElement(UUID.fromString(nodeMapping.getName())); + Element nodeElement = this.createNodeElement(nodeMapping.getName()); cache.put(object, nodeElement); variableManager.put(DiagramDescription.CACHE, cache); @@ -69,7 +69,7 @@ public String getIdentifier(Object element) { assertThat(sourceNodes).hasSize(1).contains(nodeElement); } - private Element createNodeElement(UUID descriptionId) { + private Element createNodeElement(String descriptionId) { // @formatter:off INodeStyle style = ImageNodeStyle.newImageNodeStyle() .imageURL("") diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramDescriptionService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramDescriptionService.java index 0ebe4082b06..5d02d3f0623 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramDescriptionService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramDescriptionService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2023 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 @@ -15,7 +15,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.UUID; import java.util.function.Predicate; import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramDescriptionService; @@ -33,7 +32,7 @@ public class DiagramDescriptionService implements IDiagramDescriptionService { @Override - public Optional findNodeDescriptionById(DiagramDescription diagramDescription, UUID nodeDescriptionId) { + public Optional findNodeDescriptionById(DiagramDescription diagramDescription, String nodeDescriptionId) { return this.findNodeDescription(nodeDesc -> Objects.equals(nodeDesc.getId(), nodeDescriptionId), diagramDescription.getNodeDescriptions()); } @@ -53,7 +52,7 @@ private Optional findNodeDescription(Predicate } @Override - public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, UUID edgeDescriptionId) { + public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, String edgeDescriptionId) { return this.findEdgeDescription(edgeDesc -> Objects.equals(edgeDesc.getId(), edgeDescriptionId), diagramDescription.getEdgeDescriptions()); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramDescriptionService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramDescriptionService.java index f3c190ffccd..a47fe4cd13c 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramDescriptionService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramDescriptionService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * Copyright (c) 2019, 2023 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 @@ -13,7 +13,6 @@ package org.eclipse.sirius.components.collaborative.diagrams.api; import java.util.Optional; -import java.util.UUID; import org.eclipse.sirius.components.diagrams.description.DiagramDescription; import org.eclipse.sirius.components.diagrams.description.EdgeDescription; @@ -26,9 +25,9 @@ */ public interface IDiagramDescriptionService { - Optional findNodeDescriptionById(DiagramDescription diagramDescription, UUID nodeDescriptionId); + Optional findNodeDescriptionById(DiagramDescription diagramDescription, String nodeDescriptionId); - Optional findEdgeDescriptionById(DiagramDescription diagramDescription, UUID edgeDescriptionId); + Optional findEdgeDescriptionById(DiagramDescription diagramDescription, String string); /** * Implementation which does nothing, used for mocks in unit tests. @@ -38,12 +37,12 @@ public interface IDiagramDescriptionService { class NoOp implements IDiagramDescriptionService { @Override - public Optional findNodeDescriptionById(DiagramDescription diagramDescription, UUID nodeDescriptionId) { + public Optional findNodeDescriptionById(DiagramDescription diagramDescription, String nodeDescriptionId) { return Optional.empty(); } @Override - public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, UUID edgeDescriptionId) { + public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, String edgeDescriptionId) { return Optional.empty(); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetToolSectionsEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetToolSectionsEventHandler.java index a3eb9aa79e6..e2f78525875 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetToolSectionsEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetToolSectionsEventHandler.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.UUID; import org.eclipse.sirius.components.collaborative.api.ChangeDescription; import org.eclipse.sirius.components.collaborative.api.ChangeKind; @@ -152,13 +151,13 @@ private Optional findDiagramElementDescription(Diagram diagram, String d if (appliesToRootDiagram) { diagramElementDescription = diagramDescription; } else if (diagramElement instanceof Node) { - UUID descriptionId = ((Node) diagramElement).getDescriptionId(); + String descriptionId = ((Node) diagramElement).getDescriptionId(); var optionalNodeDescription = this.diagramDescriptionService.findNodeDescriptionById(diagramDescription, descriptionId); if (optionalNodeDescription.isPresent()) { diagramElementDescription = optionalNodeDescription.get(); } } else if (diagramElement instanceof Edge) { - UUID descriptionId = ((Edge) diagramElement).getDescriptionId(); + String descriptionId = ((Edge) diagramElement).getDescriptionId(); var optionalEdgeDescription = this.diagramDescriptionService.findEdgeDescriptionById(diagramDescription, descriptionId); if (optionalEdgeDescription.isPresent()) { diagramElementDescription = optionalEdgeDescription.get(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java index bef49da88be..202eef1f212 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Obeo. + * Copyright (c) 2022, 2023 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 @@ -82,13 +82,13 @@ public Optional findEdgeById(Diagram diagram, String edgeId) { private final IDiagramDescriptionService diagramDescriptionService = new IDiagramDescriptionService.NoOp() { @Override - public Optional findNodeDescriptionById(DiagramDescription diagramDescription, UUID nodeDescriptionId) { - return Optional.of(new TestDiagramDescriptionBuilder().getNodeDescription(UUID.randomUUID(), variableManager -> List.of())); + public Optional findNodeDescriptionById(DiagramDescription diagramDescription, String nodeDescriptionId) { + return Optional.of(new TestDiagramDescriptionBuilder().getNodeDescription(UUID.randomUUID().toString(), variableManager -> List.of())); } @Override - public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, UUID edgeDescriptionId) { - return Optional.of(new TestDiagramDescriptionBuilder().getEdgeDescription(UUID.randomUUID(), this.findNodeDescriptionById(diagramDescription, UUID.randomUUID()).get())); + public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, String edgeDescriptionId) { + return Optional.of(new TestDiagramDescriptionBuilder().getEdgeDescription(UUID.randomUUID().toString(), this.findNodeDescriptionById(diagramDescription, UUID.randomUUID().toString()).get())); } }; diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java index b3ad707d130..938d5ed2f26 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java @@ -65,7 +65,7 @@ */ public class GetConnectorToolsEventHandlerTests { - private static final UUID NODE_DESCRIPTION_ID = UUID.randomUUID(); + private static final String NODE_DESCRIPTION_ID = UUID.randomUUID().toString(); private static final UUID DIAGRAM_DESCRIPTION_ID = UUID.randomUUID(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java index 47dfd3fd0e7..5778f031798 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java @@ -152,7 +152,7 @@ public Optional getObject(IEditingContext editingContext, String objectI } }; - var nodeDescriptionId = UUID.nameUUIDFromBytes(NODE_DESCRIPTION_ID.getBytes()); + var nodeDescriptionId = NODE_DESCRIPTION_ID; var nodeDescription = this.createNodeDescription(nodeDescriptionId); var node1 = this.createNode(NODE_1_ID, nodeDescriptionId, OBJECT_1_ID); @@ -206,7 +206,7 @@ public Optional getObject(IEditingContext editingContext, String objectI } }; - var nodeDescriptionId = UUID.nameUUIDFromBytes(NODE_DESCRIPTION_ID.getBytes()); + var nodeDescriptionId = NODE_DESCRIPTION_ID; var nodeDescription = this.createNodeDescription(nodeDescriptionId); var node1 = this.createNode(NODE_1_ID, nodeDescriptionId, OBJECT_1_ID); @@ -263,7 +263,7 @@ public Optional getObject(IEditingContext editingContext, String objectI } }; - var edgeDescriptionId = UUID.nameUUIDFromBytes(EDGE_DESCRIPTION_ID.getBytes()); + var edgeDescriptionId = EDGE_DESCRIPTION_ID; var edgeDescription = this.createEdgeDescription(edgeDescriptionId); var edge1 = this.createEdge(EDGE_1_ID, edgeDescriptionId, LINK_1_ID); @@ -320,7 +320,7 @@ public Optional getObject(IEditingContext editingContext, String objectI } }; - var edgeDescriptionId = UUID.nameUUIDFromBytes(EDGE_DESCRIPTION_ID.getBytes()); + var edgeDescriptionId = EDGE_DESCRIPTION_ID; var edgeDescription = this.createEdgeDescription(edgeDescriptionId); var edge1 = this.createEdge(EDGE_1_ID, edgeDescriptionId, LINK_1_ID); @@ -379,7 +379,7 @@ private SingleClickOnDiagramElementTool createTool(String toolId, boolean applie // @formatter:on } - private Node createNode(String nodeId, UUID nodeDescriptionId, String targetObjectId) { + private Node createNode(String nodeId, String nodeDescriptionId, String targetObjectId) { // @formatter:off var labelStyle = LabelStyle.newLabelStyle() .color("#000001") @@ -415,7 +415,7 @@ private Node createNode(String nodeId, UUID nodeDescriptionId, String targetObje // @formatter:on } - private NodeDescription createNodeDescription(UUID nodeDescriptionId) { + private NodeDescription createNodeDescription(String nodeDescriptionId) { // @formatter:off var styleDescription = LabelStyleDescription.newLabelStyleDescription() .colorProvider(variableManager -> "") @@ -453,7 +453,7 @@ private NodeDescription createNodeDescription(UUID nodeDescriptionId) { // @formatter:on } - private Edge createEdge(String edgeId, UUID edgeDescriptionId, String targetObjectId) { + private Edge createEdge(String edgeId, String edgeDescriptionId, String targetObjectId) { // @formatter:off var labelStyle = LabelStyle.newLabelStyle() .color("#000002") @@ -499,7 +499,7 @@ private Edge createEdge(String edgeId, UUID edgeDescriptionId, String targetObje // @formatter:on } - private EdgeDescription createEdgeDescription(UUID edgeDescriptionId) { + private EdgeDescription createEdgeDescription(String edgeDescriptionId) { // @formatter:off var edgeStyle = EdgeStyle.newEdgeStyle() .color("#000003") diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java index 7771f3f4117..ac8c5682f88 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java @@ -74,9 +74,9 @@ public void testReconnectEdge() { Diagram initialDiagram = new TestDiagramBuilder().getDiagram(UUID.randomUUID().toString()); // @formatter:off Diagram diagram = Diagram.newDiagram(initialDiagram) - .edges(List.of(edge)) - .nodes(List.of(sourceEdgeEnd, previousEdgeEnd, newEdgeEnd)) - .build(); + .edges(List.of(edge)) + .nodes(List.of(sourceEdgeEnd, previousEdgeEnd, newEdgeEnd)) + .build(); // @formatter:on var diagramQueryService = new IDiagramQueryService.NoOp() { @@ -90,13 +90,13 @@ public Optional findEdgeById(Diagram diagram, String edgeId) { var diagramDescriptionService = new IDiagramDescriptionService.NoOp() { @Override - public Optional findNodeDescriptionById(DiagramDescription diagramDescription, UUID nodeDescriptionId) { - return Optional.of(new TestDiagramDescriptionBuilder().getNodeDescription(UUID.randomUUID(), variableManager -> List.of())); + public Optional findNodeDescriptionById(DiagramDescription diagramDescription, String nodeDescriptionId) { + return Optional.of(new TestDiagramDescriptionBuilder().getNodeDescription(UUID.randomUUID().toString(), variableManager -> List.of())); } @Override - public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, UUID edgeDescriptionId) { - return Optional.of(new TestDiagramDescriptionBuilder().getEdgeDescription(UUID.randomUUID(), this.findNodeDescriptionById(diagramDescription, UUID.randomUUID()).get())); + public Optional findEdgeDescriptionById(DiagramDescription diagramDescription, String edgeDescriptionId) { + return Optional.of(new TestDiagramDescriptionBuilder().getEdgeDescription(UUID.randomUUID().toString(), this.findNodeDescriptionById(diagramDescription, UUID.randomUUID().toString()).get())); } }; diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java index 385bf2bc205..81070d14fb7 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java @@ -92,40 +92,40 @@ public class DefaultTestDiagramDescriptionProvider { case NODE_RECT_PREFIX: // @formatter:off nodeStyle = RectangularNodeStyle.newRectangularNodeStyle() - .withHeader(false) - .borderSize(1) - .borderRadius(3) - .borderStyle(LineStyle.Solid) - .color("#E5F5F8") - .borderColor("#33B0C3") - .build(); + .withHeader(false) + .borderSize(1) + .borderRadius(3) + .borderStyle(LineStyle.Solid) + .color("#E5F5F8") + .borderColor("#33B0C3") + .build(); // @formatter:on break; case NODE_IMG_PREFIX: // @formatter:off nodeStyle = ImageNodeStyle.newImageNodeStyle() - .imageURL("") - .scalingFactor(1) - .build(); + .imageURL("") + .scalingFactor(1) + .build(); // @formatter:on break; case NODE_LIST_PREFIX: // @formatter:off nodeStyle = RectangularNodeStyle.newRectangularNodeStyle() - .withHeader(true) - .borderColor("black") - .borderRadius(0) - .borderSize(1) - .borderStyle(LineStyle.Solid) - .color("white") - .build(); + .withHeader(true) + .borderColor("black") + .borderRadius(0) + .borderSize(1) + .borderStyle(LineStyle.Solid) + .color("white") + .build(); // @formatter:on break; case NODE_LIST_ITEM_PREFIX: // @formatter:off nodeStyle = IconLabelNodeStyle.newIconLabelNodeStyle() - .backgroundColor("white") - .build(); + .backgroundColor("white") + .build(); // @formatter:on break; default: @@ -211,11 +211,11 @@ public class DefaultTestDiagramDescriptionProvider { // @formatter:off List children = new ArrayList<>(); variableManager.get(VariableManager.SELF, Element.class) - .map(Element::getChildren) - .orElse(List.of()) - .stream() - .filter(element -> !element.getName().startsWith("edge:")) - .forEach(children::add); + .map(Element::getChildren) + .orElse(List.of()) + .stream() + .filter(element -> !element.getName().startsWith("edge:")) + .forEach(children::add); return children; // @formatter:on }; @@ -254,8 +254,8 @@ private Function targetObjectIdToNodeId.computeIfAbsent(id, k -> UUID.randomUUID().toString())); + .map(this.objectService::getId) + .ifPresent(id -> targetObjectIdToNodeId.computeIfAbsent(id, k -> UUID.randomUUID().toString())); // @formatter:on // @formatter:off @@ -270,16 +270,16 @@ private Function element.getName().startsWith("edge:")) - .map(this.objectService::getId) - .map(targetObjectIdToNodeId::get) - .map(idToElement::get) - .map(cache::getElementsRepresenting) - .flatMap(Collection::stream) - .toList(); + .map(Element::getChildren) + .orElseGet(List::of) + .stream() + .filter(element -> element.getName().startsWith("edge:")) + .map(this.objectService::getId) + .map(targetObjectIdToNodeId::get) + .map(idToElement::get) + .map(cache::getElementsRepresenting) + .flatMap(Collection::stream) + .toList(); // @formatter:on }; } @@ -295,23 +295,23 @@ public DiagramDescription getDefaultDiagramDescription(Diagram diagram) { // @formatter:off DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(TestLayoutDiagramBuilder.DIAGRAM_DESCRIPTION_ID) - .label("") - .autoLayout(false) - .targetObjectIdProvider(this.targetObjectIdProvider) - .canCreatePredicate(variableManager -> false) - .labelProvider(variableManager -> variableManager.get(DiagramDescription.LABEL, String.class).orElse("")) - .toolSections(List.of()) - .nodeDescriptions(List.of(nodeDescription)) - .edgeDescriptions(List.of(edgeDescription)) - .dropHandler(variableManager -> new Failure("")) - .build(); + .label("") + .autoLayout(false) + .targetObjectIdProvider(this.targetObjectIdProvider) + .canCreatePredicate(variableManager -> false) + .labelProvider(variableManager -> variableManager.get(DiagramDescription.LABEL, String.class).orElse("")) + .toolSections(List.of()) + .nodeDescriptions(List.of(nodeDescription)) + .edgeDescriptions(List.of(edgeDescription)) + .dropHandler(variableManager -> new Failure("")) + .build(); // @formatter:on return diagramDescription; } private EdgeDescription getDefaultEdgeDescription(Diagram diagram, LabelDescription labelDescription, NodeDescription nodeDescription) { - List nodeDescriptionIds = List.of(TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID, TestLayoutDiagramBuilder.CHILD_NODE_DESCRIPTION_ID); + List nodeDescriptionIds = List.of(TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID, TestLayoutDiagramBuilder.CHILD_NODE_DESCRIPTION_ID); // @formatter:off return EdgeDescription.newEdgeDescription(TestLayoutDiagramBuilder.EDGE_DESCRIPTION_ID) diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java index 443567e7430..6fdcfc41de0 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java @@ -104,7 +104,7 @@ public Node getNode(String id) { .targetObjectId("nodeTargetObjectId") .targetObjectKind("") .targetObjectLabel("") - .descriptionId(UUID.randomUUID()) + .descriptionId(UUID.randomUUID().toString()) .label(label) .style(this.getRectangularNodeStyle()) .childrenLayoutStrategy(new FreeFormLayoutStrategy()) @@ -134,7 +134,7 @@ public Edge getEdge(String id, String sourceId, String targetId) { .targetObjectId("edgeTargetObjectId") .targetObjectKind("") .targetObjectLabel("") - .descriptionId(UUID.randomUUID()) + .descriptionId(UUID.randomUUID().toString()) .sourceId(sourceId) .targetId(targetId) .style(style) diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java index 8677de36559..d6a52d0884b 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.UUID; import java.util.function.Function; import org.eclipse.sirius.components.diagrams.ArrowStyle; @@ -45,19 +44,19 @@ public class TestDiagramDescriptionBuilder { public DiagramDescription getDiagramDescription(String diagramDescriptionId, List nodeDescriptions, List edgeDescriptions, List toolSections) { // @formatter:off return DiagramDescription.newDiagramDescription(diagramDescriptionId) - .label("") - .canCreatePredicate(variableManager -> Boolean.TRUE) - .targetObjectIdProvider(variableManager -> "targetObjectId") - .labelProvider(variableManager -> "Diagram") - .nodeDescriptions(nodeDescriptions) - .edgeDescriptions(edgeDescriptions) - .toolSections(toolSections) - .dropHandler(variableManager -> new Failure("")) - .build(); + .label("") + .canCreatePredicate(variableManager -> Boolean.TRUE) + .targetObjectIdProvider(variableManager -> "targetObjectId") + .labelProvider(variableManager -> "Diagram") + .nodeDescriptions(nodeDescriptions) + .edgeDescriptions(edgeDescriptions) + .toolSections(toolSections) + .dropHandler(variableManager -> new Failure("")) + .build(); // @formatter:on } - public EdgeDescription getEdgeDescription(UUID edgeDescriptionId, NodeDescription nodeDescription) { + public EdgeDescription getEdgeDescription(String edgeDescriptionId, NodeDescription nodeDescription) { // @formatter:off Function> sourceNodesProvider = variableManager -> List.of(); Function> targetNodesProvider = variableManager -> List.of(); @@ -92,7 +91,7 @@ public EdgeDescription getEdgeDescription(UUID edgeDescriptionId, NodeDescriptio // @formatter:on } - public NodeDescription getNodeDescription(UUID nodeDescriptionId, Function> semanticElementsProvider) { + public NodeDescription getNodeDescription(String nodeDescriptionId, Function> semanticElementsProvider) { // @formatter:off LabelStyleDescription labelStyleDescription = LabelStyleDescription.newLabelStyleDescription() .colorProvider(variableManager -> "#000000") @@ -145,7 +144,7 @@ public NodeDescription getNodeDescription(UUID nodeDescriptionId, Function targetObjectIdToNodeId) { String nodeId = UUID.randomUUID().toString(); targetObjectIdToNodeId.put(labelText, nodeId); - UUID descriptionId = TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID; + String descriptionId = TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID; if (this.nodesBuilder.and() instanceof NodeBuilder) { descriptionId = TestLayoutDiagramBuilder.CHILD_NODE_DESCRIPTION_ID; } // @formatter:off return Node.newNode(nodeId) - .type(NodeType.NODE_ICON_LABEL) - .label(this.label) - .position(Objects.requireNonNull(this.position)) - .size(Objects.requireNonNull(this.size)) - .borderNode(this.isBorderNode) - .borderNodes(borderNodes) - .childNodes(childNodes) - .customizedProperties(this.customizedProperties) - .descriptionId(descriptionId) - .targetObjectId(labelText) - .targetObjectKind("") - .targetObjectLabel(labelText) - .style(Objects.requireNonNull(style)) - .modifiers(Set.of()) - .state(ViewModifier.Normal) - .collapsingState(CollapsingState.EXPANDED) - .build(); + .type(NodeType.NODE_ICON_LABEL) + .label(this.label) + .position(Objects.requireNonNull(this.position)) + .size(Objects.requireNonNull(this.size)) + .borderNode(this.isBorderNode) + .borderNodes(borderNodes) + .childNodes(childNodes) + .customizedProperties(this.customizedProperties) + .descriptionId(descriptionId) + .targetObjectId(labelText) + .targetObjectKind("") + .targetObjectLabel(labelText) + .style(Objects.requireNonNull(style)) + .modifiers(Set.of()) + .state(ViewModifier.Normal) + .collapsingState(CollapsingState.EXPANDED) + .build(); // @formatter:on } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java index 2fb94325d19..f6069b58ddb 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java @@ -110,30 +110,30 @@ public Node build(Map targetObjectIdToNodeId) { String nodeId = UUID.randomUUID().toString(); targetObjectIdToNodeId.put(labelText, nodeId); - UUID descriptionId = TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID; + String descriptionId = TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID; if (this.nodesBuilder.and() instanceof NodeBuilder) { descriptionId = TestLayoutDiagramBuilder.CHILD_NODE_DESCRIPTION_ID; } // @formatter:off return Node.newNode(nodeId) - .type(NodeType.NODE_IMAGE) - .label(this.label) - .position(Objects.requireNonNull(this.position)) - .size(Objects.requireNonNull(this.size)) - .borderNode(this.isBorderNode) - .borderNodes(borderNodes) - .childNodes(childNodes) - .customizedProperties(this.customizedProperties) - .descriptionId(descriptionId) - .targetObjectId(labelText) - .targetObjectKind("") - .targetObjectLabel(labelText) - .style(Objects.requireNonNull(style)) - .modifiers(Set.of()) - .state(ViewModifier.Normal) - .collapsingState(CollapsingState.EXPANDED) - .build(); + .type(NodeType.NODE_IMAGE) + .label(this.label) + .position(Objects.requireNonNull(this.position)) + .size(Objects.requireNonNull(this.size)) + .borderNode(this.isBorderNode) + .borderNodes(borderNodes) + .childNodes(childNodes) + .customizedProperties(this.customizedProperties) + .descriptionId(descriptionId) + .targetObjectId(labelText) + .targetObjectKind("") + .targetObjectLabel(labelText) + .style(Objects.requireNonNull(style)) + .modifiers(Set.of()) + .state(ViewModifier.Normal) + .collapsingState(CollapsingState.EXPANDED) + .build(); // @formatter:on } } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java index ebece87f0f8..41f614e9f40 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java @@ -141,30 +141,30 @@ public Node build(Map targetObjectIdToNodeId) { String nodeId = UUID.randomUUID().toString(); targetObjectIdToNodeId.put(labeltext, nodeId); - UUID descriptionId = TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID; + String descriptionId = TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID; if (this.nodesBuilder.and() instanceof NodeBuilder) { descriptionId = TestLayoutDiagramBuilder.CHILD_NODE_DESCRIPTION_ID; } // @formatter:off Builder nodeBuilder = Node.newNode(nodeId) - .type(NodeType.NODE_RECTANGLE) - .label(this.label) - .position(Objects.requireNonNull(this.position)) - .size(Objects.requireNonNull(this.size)) - .borderNode(this.isBorderNode) - .borderNodes(borderNodes) - .childNodes(childNodes) - .customizedProperties(this.customizedProperties) - .descriptionId(descriptionId) - .targetObjectId(labeltext) - .targetObjectKind("") - .targetObjectLabel(this.label.getText()) - .style(Objects.requireNonNull(style)) - .modifiers(Set.of()) - .state(ViewModifier.Normal) - .userResizable(this.userResizable) - .collapsingState(this.collapsingState); + .type(NodeType.NODE_RECTANGLE) + .label(this.label) + .position(Objects.requireNonNull(this.position)) + .size(Objects.requireNonNull(this.size)) + .borderNode(this.isBorderNode) + .borderNodes(borderNodes) + .childNodes(childNodes) + .customizedProperties(this.customizedProperties) + .descriptionId(descriptionId) + .targetObjectId(labeltext) + .targetObjectKind("") + .targetObjectLabel(this.label.getText()) + .style(Objects.requireNonNull(style)) + .modifiers(Set.of()) + .state(ViewModifier.Normal) + .userResizable(this.userResizable) + .collapsingState(this.collapsingState); if (this.childrenLayoutStrategy != null) { nodeBuilder.childrenLayoutStrategy(this.childrenLayoutStrategy); diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java index 4cddc5553d2..d54a3333311 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.UUID; import org.eclipse.sirius.components.annotations.Immutable; @@ -49,7 +48,7 @@ public final class Edge { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private Label beginLabel; @@ -97,7 +96,7 @@ public String getTargetObjectLabel() { return this.targetObjectLabel; } - public UUID getDescriptionId() { + public String getDescriptionId() { return this.descriptionId; } @@ -177,7 +176,7 @@ public static final class Builder { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private Label beginLabel; @@ -245,7 +244,7 @@ public Builder targetObjectLabel(String targetObjectLabel) { return this; } - public Builder descriptionId(UUID descriptionId) { + public Builder descriptionId(String descriptionId) { this.descriptionId = Objects.requireNonNull(descriptionId); return this; } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java index 8a2760837e9..cc024dda952 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.UUID; import org.eclipse.sirius.components.annotations.Immutable; @@ -40,7 +39,7 @@ public final class Node { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private boolean borderNode; @@ -92,7 +91,7 @@ public String getTargetObjectLabel() { return this.targetObjectLabel; } - public UUID getDescriptionId() { + public String getDescriptionId() { return this.descriptionId; } @@ -180,7 +179,7 @@ public static final class Builder { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private boolean borderNode; @@ -254,7 +253,7 @@ public Builder targetObjectLabel(String targetObjectLabel) { return this; } - public Builder descriptionId(UUID descriptionId) { + public Builder descriptionId(String descriptionId) { this.descriptionId = Objects.requireNonNull(descriptionId); return this; } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java index 7dc6acab906..001a95607f4 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java @@ -14,7 +14,6 @@ import java.text.MessageFormat; import java.util.Objects; -import java.util.UUID; import org.eclipse.sirius.components.annotations.Immutable; import org.eclipse.sirius.components.diagrams.components.NodeContainmentKind; @@ -29,7 +28,7 @@ public final class ViewCreationRequest { private String parentElementId; - private UUID descriptionId; + private String descriptionId; private String targetObjectId; @@ -53,7 +52,7 @@ public String getParentElementId() { * * @return the description identifier */ - public UUID getDescriptionId() { + public String getDescriptionId() { return this.descriptionId; } @@ -94,7 +93,7 @@ public String toString() { public static final class Builder { private String parentElementId; - private UUID descriptionId; + private String descriptionId; private String targetObjectId; @@ -109,8 +108,8 @@ public Builder parentElementId(String parentElementId) { return this; } - public Builder descriptionId(UUID descriptionId) { - this.descriptionId = Objects.requireNonNull(descriptionId); + public Builder descriptionId(String descriptionId2) { + this.descriptionId = Objects.requireNonNull(descriptionId2); return this; } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/INodeDescriptionRequestor.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/INodeDescriptionRequestor.java index 0b9c12f9bdd..9bb4d362d99 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/INodeDescriptionRequestor.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/INodeDescriptionRequestor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Obeo. + * Copyright (c) 2022, 2023 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 @@ -13,7 +13,6 @@ package org.eclipse.sirius.components.diagrams.components; import java.util.Optional; -import java.util.UUID; import org.eclipse.sirius.components.diagrams.description.NodeDescription; @@ -23,5 +22,5 @@ * @author sbegaudeau */ public interface INodeDescriptionRequestor { - Optional findById(UUID nodeDescriptionId); + Optional findById(String nodeDescriptionId); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java index ba1632c79e3..df5dba320b3 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java @@ -19,7 +19,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.UUID; import org.eclipse.sirius.components.diagrams.CollapsingState; import org.eclipse.sirius.components.diagrams.CustomizableProperties; @@ -138,7 +137,7 @@ private boolean shouldRender(String targetObjectId, Optional optionalPrevi private boolean existsViewCreationRequested(String targetObjectId) { String parentElementId = this.props.getParentElementId(); - UUID nodeDescriptionId = this.props.getNodeDescription().getId(); + String nodeDescriptionId = this.props.getNodeDescription().getId(); NodeContainmentKind containmentKind = this.props.getContainmentKind(); // @formatter:off return this.props.getViewCreationRequests().stream() @@ -384,9 +383,9 @@ private List getBorderNodes(Optional optionalPreviousNode, Variab //@formatter:off var borderNodeDescriptions = new ArrayList<>(nodeDescription.getBorderNodeDescriptions()); nodeDescription.getReusedBorderNodeDescriptionIds().stream() - .map(nodeDescriptionRequestor::findById) - .flatMap(Optional::stream) - .forEach(borderNodeDescriptions::add); + .map(nodeDescriptionRequestor::findById) + .flatMap(Optional::stream) + .forEach(borderNodeDescriptions::add); return borderNodeDescriptions.stream().map(borderNodeDescription -> { List previousBorderNodes = optionalPreviousNode.map(previousNode -> new DiagramElementRequestor().getBorderNodes(previousNode, borderNodeDescription)).orElse(List.of()); @@ -420,9 +419,9 @@ private List getChildNodes(Optional optionalPreviousNode, Variabl //@formatter:off var childNodeDescriptions = new ArrayList<>(nodeDescription.getChildNodeDescriptions()); nodeDescription.getReusedChildNodeDescriptionIds().stream() - .map(nodeDescriptionRequestor::findById) - .flatMap(Optional::stream) - .forEach(childNodeDescriptions::add); + .map(nodeDescriptionRequestor::findById) + .flatMap(Optional::stream) + .forEach(childNodeDescriptions::add); return childNodeDescriptions.stream().map(childNodeDescription -> { List previousChildNodes = optionalPreviousNode.map(previousNode -> new DiagramElementRequestor().getChildNodes(previousNode, childNodeDescription)).orElse(List.of()); diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeDescriptionRequestor.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeDescriptionRequestor.java index 740471b3017..50c2f319669 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeDescriptionRequestor.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeDescriptionRequestor.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.UUID; import org.eclipse.sirius.components.diagrams.description.DiagramDescription; import org.eclipse.sirius.components.diagrams.description.NodeDescription; @@ -28,7 +27,7 @@ */ public class NodeDescriptionRequestor implements INodeDescriptionRequestor { - private final Map id2nodeDescription = new HashMap<>(); + private final Map id2nodeDescription = new HashMap<>(); public NodeDescriptionRequestor(List diagramDescriptions) { diagramDescriptions.stream().flatMap(description -> description.getNodeDescriptions().stream()).forEach(this::cache); @@ -41,7 +40,7 @@ private void cache(NodeDescription nodeDescription) { } @Override - public Optional findById(UUID nodeDescriptionId) { + public Optional findById(String nodeDescriptionId) { return Optional.ofNullable(this.id2nodeDescription.get(nodeDescriptionId)); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java index 0f901f01ee9..ffb7ea8c587 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java @@ -15,7 +15,6 @@ import java.text.MessageFormat; import java.util.List; import java.util.Objects; -import java.util.UUID; import java.util.function.Function; import java.util.function.Predicate; @@ -57,7 +56,7 @@ public final class EdgeDescription implements IDiagramElementDescription { public static final String GRAPHICAL_EDGE_TARGET = "graphicalEdgeTarget"; - private UUID id; + private String id; private SynchronizationPolicy synchronizationPolicy; @@ -96,7 +95,7 @@ private EdgeDescription() { } @Override - public UUID getId() { + public String getId() { return this.id; } @@ -164,8 +163,8 @@ public IEdgeEditLabelHandler getLabelEditHandler() { return this.labelEditHandler; } - public static Builder newEdgeDescription(UUID id) { - return new Builder(id); + public static Builder newEdgeDescription(String edgeDescriptionId) { + return new Builder(edgeDescriptionId); } @Override @@ -181,7 +180,7 @@ public String toString() { */ @SuppressWarnings("checkstyle:HiddenField") public static final class Builder { - private UUID id; + private String id; private SynchronizationPolicy synchronizationPolicy = SynchronizationPolicy.SYNCHRONIZED; @@ -215,8 +214,8 @@ public static final class Builder { private IEdgeEditLabelHandler labelEditHandler; - private Builder(UUID id) { - this.id = Objects.requireNonNull(id); + private Builder(String edgeDescriptionId) { + this.id = Objects.requireNonNull(edgeDescriptionId); } public Builder synchronizationPolicy(SynchronizationPolicy synchronizationPolicy) { diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/IDiagramElementDescription.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/IDiagramElementDescription.java index 3e6e26a619c..6adbeb52087 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/IDiagramElementDescription.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/IDiagramElementDescription.java @@ -12,8 +12,6 @@ *******************************************************************************/ package org.eclipse.sirius.components.diagrams.description; -import java.util.UUID; - /** * The description of a diagram element. * @@ -21,6 +19,6 @@ */ public interface IDiagramElementDescription { - UUID getId(); + String getId(); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java index 50ab7bbb0b4..1375186e32e 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.UUID; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; @@ -35,7 +34,7 @@ */ @Immutable public final class NodeDescription implements IDiagramElementDescription { - private UUID id; + private String id; private SynchronizationPolicy synchronizationPolicy; @@ -67,9 +66,9 @@ public final class NodeDescription implements IDiagramElementDescription { private boolean collapsible; - private List reusedBorderNodeDescriptionIds; + private List reusedBorderNodeDescriptionIds; - private List reusedChildNodeDescriptionIds; + private List reusedChildNodeDescriptionIds; private BiFunction labelEditHandler; @@ -80,7 +79,7 @@ private NodeDescription() { } @Override - public UUID getId() { + public String getId() { return this.id; } @@ -144,11 +143,11 @@ public boolean isCollapsible() { return this.collapsible; } - public List getReusedBorderNodeDescriptionIds() { + public List getReusedBorderNodeDescriptionIds() { return this.reusedBorderNodeDescriptionIds; } - public List getReusedChildNodeDescriptionIds() { + public List getReusedChildNodeDescriptionIds() { return this.reusedChildNodeDescriptionIds; } @@ -160,8 +159,8 @@ public BiFunction getLabelEditHandler() { return this.labelEditHandler; } - public static Builder newNodeDescription(UUID id) { - return new Builder(id); + public static Builder newNodeDescription(String nodeDescriptionId) { + return new Builder(nodeDescriptionId); } public static Builder newNodeDescription(NodeDescription nodeDescription) { @@ -181,7 +180,7 @@ public String toString() { */ @SuppressWarnings("checkstyle:HiddenField") public static final class Builder { - private UUID id; + private String id; private SynchronizationPolicy synchronizationPolicy = SynchronizationPolicy.SYNCHRONIZED; @@ -213,16 +212,16 @@ public static final class Builder { private boolean collapsible; - private List reusedBorderNodeDescriptionIds = new ArrayList<>(); + private List reusedBorderNodeDescriptionIds = new ArrayList<>(); - private List reusedChildNodeDescriptionIds = new ArrayList<>(); + private List reusedChildNodeDescriptionIds = new ArrayList<>(); private BiFunction labelEditHandler; private Function deleteHandler; - public Builder(UUID id) { - this.id = Objects.requireNonNull(id); + public Builder(String nodeDescriptionId) { + this.id = Objects.requireNonNull(nodeDescriptionId); } private Builder(NodeDescription nodeDescription) { @@ -322,13 +321,13 @@ public Builder collapsible(boolean collapsible) { return this; } - public Builder reusedBorderNodeDescriptionIds(List reusedBorderNodeDescriptionIds) { - this.reusedBorderNodeDescriptionIds = Objects.requireNonNull(reusedBorderNodeDescriptionIds); + public Builder reusedBorderNodeDescriptionIds(List reusedBorderNodeDescriptionIds2) { + this.reusedBorderNodeDescriptionIds = Objects.requireNonNull(reusedBorderNodeDescriptionIds2); return this; } - public Builder reusedChildNodeDescriptionIds(List reusedChildNodeDescriptionIds) { - this.reusedChildNodeDescriptionIds = Objects.requireNonNull(reusedChildNodeDescriptionIds); + public Builder reusedChildNodeDescriptionIds(List reusedChildNodeDescriptionIds2) { + this.reusedChildNodeDescriptionIds = Objects.requireNonNull(reusedChildNodeDescriptionIds2); return this; } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java index 302ad247344..cb345b2b2f2 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2022 Obeo. + * Copyright (c) 2019, 2023 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 @@ -17,7 +17,6 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.UUID; import org.eclipse.sirius.components.annotations.Immutable; import org.eclipse.sirius.components.diagrams.EdgeStyle; @@ -47,7 +46,7 @@ public final class EdgeElementProps implements IProps { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private String sourceId; @@ -91,7 +90,7 @@ public String getTargetObjectLabel() { return this.targetObjectLabel; } - public UUID getDescriptionId() { + public String getDescriptionId() { return this.descriptionId; } @@ -159,7 +158,7 @@ public static final class Builder { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private String sourceId; @@ -203,7 +202,7 @@ public Builder targetObjectLabel(String targetObjectLabel) { return this; } - public Builder descriptionId(UUID descriptionId) { + public Builder descriptionId(String descriptionId) { this.descriptionId = Objects.requireNonNull(descriptionId); return this; } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java index 9d636c2cfeb..6502b4ec568 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.UUID; import org.eclipse.sirius.components.annotations.Immutable; import org.eclipse.sirius.components.diagrams.CollapsingState; @@ -49,7 +48,7 @@ public final class NodeElementProps implements IProps { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private boolean borderNode; @@ -97,7 +96,7 @@ public String getTargetObjectLabel() { return this.targetObjectLabel; } - public UUID getDescriptionId() { + public String getDescriptionId() { return this.descriptionId; } @@ -173,7 +172,7 @@ public static final class Builder { private String targetObjectLabel; - private UUID descriptionId; + private String descriptionId; private boolean borderNode; @@ -221,7 +220,7 @@ public Builder targetObjectLabel(String targetObjectLabel) { return this; } - public Builder descriptionId(UUID descriptionId) { + public Builder descriptionId(String descriptionId) { this.descriptionId = Objects.requireNonNull(descriptionId); return this; } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java index 90fe54ee25c..fcb036b43ca 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java @@ -99,7 +99,7 @@ public class DiagramElementChangeVisibilityTests { }; private NodeDescription createNodeDescription(String elementId, List borderNodes, List children) { - final var id = UUID.randomUUID(); + final String id = UUID.randomUUID().toString(); Function targetObjectIdProvider = variableManager -> { Object object = variableManager.getVariables().get(VariableManager.SELF); @@ -169,7 +169,7 @@ private EdgeDescription createEdgeDescription(NodeDescription sourceDescription, return targetNodes; }; - EdgeDescription edgeDescription = EdgeDescription.newEdgeDescription(UUID.randomUUID()) + EdgeDescription edgeDescription = EdgeDescription.newEdgeDescription(UUID.randomUUID().toString()) .styleProvider(STYLE_EDGE_PROVIDER) .sourceNodeDescriptions(List.of(sourceDescription)) .targetNodeDescriptions(List.of(targetDescription)) diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java index 4fb9a2a7f1c..dc8c7c0b375 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java @@ -55,13 +55,13 @@ */ public class DiagramRendererEdgeTests { - private static final UUID EDGE_DESCRIPTION_ID = UUID.randomUUID(); + private static final String EDGE_DESCRIPTION_ID = UUID.randomUUID().toString(); private static final String DIAGRAM_DESCRIPTION_ID = UUID.randomUUID().toString(); - private static final UUID NODE_DESCRIPTION_ID1 = UUID.randomUUID(); + private static final String NODE_DESCRIPTION_ID1 = UUID.randomUUID().toString(); - private static final UUID NODE_DESCRIPTION_ID2 = UUID.randomUUID(); + private static final String NODE_DESCRIPTION_ID2 = UUID.randomUUID().toString(); private static final String FIRST_OBJECT_ID = "First"; @@ -126,8 +126,8 @@ public void testEdgeRendering() { public void testNoDuplicateEdgeId() { NodeDescription nodeDescription1 = this.getNodeDescription(NODE_DESCRIPTION_ID1); NodeDescription nodeDescription2 = this.getNodeDescription(NODE_DESCRIPTION_ID2); - EdgeDescription edgeDescription1 = this.getEdgeDescription(nodeDescription1, UUID.randomUUID()); - EdgeDescription edgeDescription2 = this.getEdgeDescription(nodeDescription1, UUID.randomUUID()); + EdgeDescription edgeDescription1 = this.getEdgeDescription(nodeDescription1, UUID.randomUUID().toString()); + EdgeDescription edgeDescription2 = this.getEdgeDescription(nodeDescription1, UUID.randomUUID().toString()); Diagram diagram = this.renderDiagram(List.of(nodeDescription1, nodeDescription2), List.of(edgeDescription1, edgeDescription2)); @@ -167,7 +167,7 @@ private Diagram renderDiagram(List nodeDescriptions, List "#000000") @@ -220,7 +220,7 @@ private NodeDescription getNodeDescription(UUID nodeDescriptionId) { // @formatter:on } - private EdgeDescription getEdgeDescription(NodeDescription nodeDescription, UUID id) { + private EdgeDescription getEdgeDescription(NodeDescription nodeDescription, String id) { // @formatter:off Function> sourceNodesProvider = variableManager -> { var optionalCache = variableManager.get(DiagramDescription.CACHE, DiagramRenderingCache.class); diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java index 17dee247815..23008c3fee8 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java @@ -52,7 +52,7 @@ */ public class DiagramRendererNodeTests { - private static final UUID NODE_DESCRIPTION_ID = UUID.randomUUID(); + private static final String NODE_DESCRIPTION_ID = UUID.randomUUID().toString(); private static final String LABEL_TEXT = "Node"; @@ -224,12 +224,12 @@ public void testImageNodeRendering() { assertThat(diagram.getNodes()).extracting(Node::getStyle).allMatch(s -> s instanceof ImageNodeStyle); // @formatter:off assertThat(diagram.getNodes()) - .extracting(n -> (ImageNodeStyle) n.getStyle()) - .extracting(ImageNodeStyle::getImageURL).noneMatch(String::isBlank); + .extracting(n -> (ImageNodeStyle) n.getStyle()) + .extracting(ImageNodeStyle::getImageURL).noneMatch(String::isBlank); assertThat(diagram.getNodes()) - .extracting(n -> (ImageNodeStyle) n.getStyle()) - .extracting(ImageNodeStyle::getScalingFactor).allMatch(scalingFactor -> scalingFactor == 1); + .extracting(n -> (ImageNodeStyle) n.getStyle()) + .extracting(ImageNodeStyle::getScalingFactor).allMatch(scalingFactor -> scalingFactor == 1); // @formatter:on } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java index 82c50a7ae4b..9c52425d458 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java @@ -177,7 +177,7 @@ public List apply(VariableManager variableManager) { .build(); Diagram diagramAfterFirstNodeCreation = this.render(diagramDescription, List.of(viewCreationRequest), List.of(), Optional.of(initialDiagram)); - UUID descriptionId = diagramDescription.getNodeDescriptions().get(0).getChildNodeDescriptions().get(0).getId(); + String descriptionId = diagramDescription.getNodeDescriptions().get(0).getChildNodeDescriptions().get(0).getId(); String parentNodeId = diagramAfterFirstNodeCreation.getNodes().get(0).getId(); ViewCreationRequest childViewCreationRequest = ViewCreationRequest.newViewCreationRequest() @@ -224,7 +224,7 @@ public void testUnsynchronizedRenderingOnNodeContainerAfterDeletion() { .build(); Diagram diagramAfterFirstNodeCreation = this.render(diagramDescription, List.of(viewCreationRequest), List.of(), Optional.of(initialDiagram)); - UUID descriptionId = diagramDescription.getNodeDescriptions().get(0).getChildNodeDescriptions().get(0).getId(); + String descriptionId = diagramDescription.getNodeDescriptions().get(0).getChildNodeDescriptions().get(0).getId(); String parentNodeId = diagramAfterFirstNodeCreation.getNodes().get(0).getId(); ViewCreationRequest childViewCreationRequest = ViewCreationRequest.newViewCreationRequest() @@ -304,7 +304,7 @@ private DiagramDescription getDiagramDescription(Function NODE_TYPE) .semanticElementsProvider(semanticElementsProvider) @@ -321,7 +321,7 @@ private DiagramDescription getDiagramDescription(Function new Success()) .build(); - NodeDescription unsynchronizedNodeDescription = NodeDescription.newNodeDescription(UUID.nameUUIDFromBytes("unsynchronized".getBytes())) + NodeDescription unsynchronizedNodeDescription = NodeDescription.newNodeDescription("unsynchronized") .synchronizationPolicy(SynchronizationPolicy.UNSYNCHRONIZED) .typeProvider(variableManager -> NODE_TYPE) .semanticElementsProvider(semanticElementsProvider) @@ -338,7 +338,7 @@ private DiagramDescription getDiagramDescription(Function new Success()) .build(); - NodeDescription synchronizedNodeDescription = NodeDescription.newNodeDescription(UUID.nameUUIDFromBytes("synchronized".getBytes())) + NodeDescription synchronizedNodeDescription = NodeDescription.newNodeDescription("synchronized") .synchronizationPolicy(SynchronizationPolicy.SYNCHRONIZED) .typeProvider(variableManager -> NODE_TYPE) .semanticElementsProvider(variableManager -> List.of(new Object())) diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ConnectorToolsProviderDiagram.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ConnectorToolsProviderDiagram.java index 87b13aa864a..052d1d7e5eb 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ConnectorToolsProviderDiagram.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ConnectorToolsProviderDiagram.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Optional; -import java.util.UUID; import java.util.stream.Collectors; import org.eclipse.sirius.components.collaborative.diagrams.api.IConnectorToolsProvider; @@ -89,8 +88,8 @@ public List getConnectorTools(Object sourceDiagramElement, Object targetD return result; } - private Optional mapDiagramElementToDescriptionId(Object object) { - Optional descriptionId = Optional.empty(); + private Optional mapDiagramElementToDescriptionId(Object object) { + Optional descriptionId = Optional.empty(); if (object instanceof Node) { descriptionId = Optional.of(((Node) object).getDescriptionId()); } else if (object instanceof Edge) { @@ -99,7 +98,7 @@ private Optional mapDiagramElementToDescriptionId(Object object) { return descriptionId; } - private Optional mapDescriptionIdToDescription(UUID descriptionId, DiagramDescription diagramDescription, Object diagramElement) { + private Optional mapDescriptionIdToDescription(String descriptionId, DiagramDescription diagramDescription, Object diagramElement) { Optional result = Optional.empty(); if (diagramElement instanceof Node) { var description = this.diagramDescriptionService.findNodeDescriptionById(diagramDescription, descriptionId); diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/RelationBasedSemanticElementsProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/RelationBasedSemanticElementsProvider.java index ed14e49cebe..b272e754be5 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/RelationBasedSemanticElementsProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/RelationBasedSemanticElementsProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2023 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 @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.UUID; import java.util.function.Function; import org.eclipse.sirius.components.diagrams.description.DiagramDescription; @@ -31,10 +30,10 @@ */ public class RelationBasedSemanticElementsProvider implements Function> { - private final List sourceNodeDescriptionIds; + private final List sourceNodeDescriptionIds; - public RelationBasedSemanticElementsProvider(List sourceNodeDescriptionIds) { - this.sourceNodeDescriptionIds = Objects.requireNonNull(sourceNodeDescriptionIds); + public RelationBasedSemanticElementsProvider(List list) { + this.sourceNodeDescriptionIds = Objects.requireNonNull(list); } @Override diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/TargetNodesProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/TargetNodesProvider.java index f610ab7072a..39076618923 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/TargetNodesProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/TargetNodesProvider.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Objects; -import java.util.UUID; import java.util.function.Function; import org.eclipse.sirius.components.diagrams.description.DiagramDescription; @@ -39,14 +38,14 @@ */ public class TargetNodesProvider implements Function> { - private final Function idProvider; + private final Function idProvider; private final EdgeDescription edgeDescription; private final AQLInterpreter interpreter; - public TargetNodesProvider(Function idProvider, EdgeDescription edgeDescription, AQLInterpreter interpreter) { - this.idProvider = Objects.requireNonNull(idProvider); + public TargetNodesProvider(Function idProvider2, EdgeDescription edgeDescription, AQLInterpreter interpreter) { + this.idProvider = Objects.requireNonNull(idProvider2); this.edgeDescription = Objects.requireNonNull(edgeDescription); this.interpreter = Objects.requireNonNull(interpreter); } @@ -75,7 +74,7 @@ public List apply(VariableManager variableManager) { private boolean isFromCompatibleTargetMapping(Element nodeElement) { // @formatter:off return this.edgeDescription.getTargetNodeDescriptions().stream() - .anyMatch(nodeDescription -> this.isFromDescription(nodeElement, nodeDescription)); + .anyMatch(nodeDescription -> this.isFromDescription(nodeElement, nodeDescription)); // @formatter:on } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java index dcf1f46c034..2d09a3ab073 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewDiagramDescriptionConverter.java @@ -98,9 +98,9 @@ public class ViewDiagramDescriptionConverter implements IRepresentationDescripti private final Function semanticTargetLabelProvider; - private final Function idProvider = (diagramElementDescription) -> { + private final Function idProvider = (diagramElementDescription) -> { // DiagramElementDescription should have a proper id. - return UUID.nameUUIDFromBytes(EcoreUtil.getURI(diagramElementDescription).toString().getBytes()); + return EcoreUtil.getURI(diagramElementDescription).toString(); }; private final IViewToolImageProvider viewToolImageProvider; @@ -236,10 +236,10 @@ private NodeDescription convert(org.eclipse.sirius.components.view.NodeDescripti Function sizeProvider = variableManager -> this.computeSize(viewNodeDescription, interpreter, variableManager); // @formatter:off - List reusedChildNodeDescriptionIds = viewNodeDescription.getReusedChildNodeDescriptions().stream() + List reusedChildNodeDescriptionIds = viewNodeDescription.getReusedChildNodeDescriptions().stream() .map(this.idProvider) .toList(); - List reusedBorderNodeDescriptionIds = viewNodeDescription.getReusedBorderNodeDescriptions().stream() + List reusedBorderNodeDescriptionIds = viewNodeDescription.getReusedBorderNodeDescriptions().stream() .map(this.idProvider) .toList(); diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java index e426a686bc4..8ac393a54b4 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java @@ -108,12 +108,12 @@ public String getInitialDirectEditElementLabel(Object diagramElement, String lab Optional semanticElement = Optional.empty(); if (diagramElement instanceof Node node) { - UUID descriptionId = node.getDescriptionId(); + String descriptionId = node.getDescriptionId(); optionalLabelEditTool = this.getNodeDescription(diagramDescription.getNodeDescriptions(), descriptionId).map(NodeDescription::getPalette).map(NodePalette::getLabelEditTool); semanticElement = this.objectService.getObject(editingContext, node.getTargetObjectId()); initialDirectEditElementLabel = node.getLabel().getText(); } else if (diagramElement instanceof Edge edge) { - UUID descriptionId = edge.getDescriptionId(); + String descriptionId = edge.getDescriptionId(); semanticElement = this.objectService.getObject(editingContext, edge.getTargetObjectId()); var optionalEdgeDescription = this.getEdgeDescription(diagramDescription.getEdgeDescriptions(), descriptionId); @@ -171,7 +171,7 @@ private Optional getLabelEditTool(org.eclipse.sirius.components.v }); } - private Optional getNodeDescription(List nodeDescriptions, UUID descriptionId) { + private Optional getNodeDescription(List nodeDescriptions, String descriptionId) { var optionalNodeDescription = nodeDescriptions.stream().filter(nodeDescription -> descriptionId.equals(this.idProvider.apply(nodeDescription))).findFirst(); if (optionalNodeDescription.isEmpty()) { @@ -184,7 +184,7 @@ private Optional getNodeDescription(List nodeD return optionalNodeDescription; } - private Optional getEdgeDescription(List edgeDescriptions, UUID descriptionId) { + private Optional getEdgeDescription(List edgeDescriptions, String descriptionId) { // @formatter:off return edgeDescriptions.stream() .filter(edgeDescription -> descriptionId.equals(this.idProvider.apply(edgeDescription))) @@ -197,9 +197,9 @@ private List getAccessibleEPackages(IEditingContext editingContext) { Registry packageRegistry = ((EditingContext) editingContext).getDomain().getResourceSet().getPackageRegistry(); // @formatter:off return packageRegistry.values().stream() - .filter(EPackage.class::isInstance) - .map(EPackage.class::cast) - .toList(); + .filter(EPackage.class::isInstance) + .map(EPackage.class::cast) + .toList(); // @formatter:on } else { return List.of();