[285][287] Refactor changes to squash with previous commit

Bug: eclipse-sirius#285
Bug: eclipse-sirius#287
Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>

backend/sirius-web-diagrams-layout-api/src/main/java/org/eclipse/sirius/web/diagrams/layout/api/ILayoutService.java

@@ -12,8 +12,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.web.diagrams.layout.api;
 
-import java.util.Optional;
-
 import org.eclipse.sirius.web.diagrams.Diagram;
 import org.eclipse.sirius.web.diagrams.MoveEvent;
 import org.eclipse.sirius.web.diagrams.Position;
@@ -38,5 +36,5 @@ public interface ILayoutService {
      *            for instance.
      * @return the new layouted diagram.
      */
-    Diagram incrementalLayout(Diagram diagram, Optional<MoveEvent> moveEvent, Position startingPosition);
+    Diagram incrementalLayout(Diagram diagram, MoveEvent moveEvent, Position startingPosition);
 }

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/ConvertedDiagram.java → backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/ELKConvertedDiagram.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2020 Obeo.
+ * Copyright (c) 2019, 2021 Obeo and others.
  * 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
@@ -24,12 +24,12 @@
  *
  * @author sbegaudeau
  */
-public class ConvertedDiagram {
+public class ELKConvertedDiagram {
     private final ElkNode elkDiagram;
 
     private final Map<String, ElkGraphElement> id2ElkGraphElements;
 
-    public ConvertedDiagram(ElkNode elkDiagram, Map<String, ElkGraphElement> id2ElkGraphElements) {
+    public ELKConvertedDiagram(ElkNode elkDiagram, Map<String, ElkGraphElement> id2ElkGraphElements) {
         this.elkDiagram = Objects.requireNonNull(elkDiagram);
         this.id2ElkGraphElements = Objects.requireNonNull(id2ElkGraphElements);
     }

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/DiagramConverter.java → backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/ELKDiagramConverter.java

@@ -54,7 +54,7 @@
  * @author sbegaudeau
  */
 @Service
-public class DiagramConverter {
+public class ELKDiagramConverter {
 
     public static final IProperty<String> PROPERTY_TYPE = new Property<>("org.eclipse.sirius.web.layout.type"); //$NON-NLS-1$
 
@@ -68,23 +68,23 @@ public class DiagramConverter {
 
     private final ImageNodeStyleSizeProvider imageNodeStyleSizeProvider;
 
-    private final Logger logger = LoggerFactory.getLogger(DiagramConverter.class);
+    private final Logger logger = LoggerFactory.getLogger(ELKDiagramConverter.class);
 
-    public DiagramConverter(TextBoundsService textBoundsService) {
+    public ELKDiagramConverter(TextBoundsService textBoundsService) {
         this.textBoundsService = Objects.requireNonNull(textBoundsService);
         this.imageSizeProvider = new ImageSizeProvider();
         this.imageNodeStyleSizeProvider = new ImageNodeStyleSizeProvider(this.imageSizeProvider);
     }
 
-    public ConvertedDiagram convert(Diagram diagram) {
+    public ELKConvertedDiagram convert(Diagram diagram) {
         ElkNode elkDiagram = this.convertDiagram(diagram);
 
         Map<String, ElkGraphElement> id2ElkGraphElements = new HashMap<>();
         Map<String, ElkConnectableShape> connectableShapeIndex = new LinkedHashMap<>();
         diagram.getNodes().stream().forEach(node -> this.convertNode(node, elkDiagram, connectableShapeIndex, id2ElkGraphElements));
         diagram.getEdges().stream().forEach(edge -> this.convertEdge(edge, elkDiagram, connectableShapeIndex, id2ElkGraphElements));
 
-        return new ConvertedDiagram(elkDiagram, id2ElkGraphElements);
+        return new ELKConvertedDiagram(elkDiagram, id2ElkGraphElements);
     }
 
     private ElkNode convertDiagram(Diagram diagram) {

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/LayoutedDiagramProvider.java → backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/ELKLayoutedDiagramProvider.java

@@ -41,7 +41,7 @@
  * @author hmarchadour
  */
 @Service
-public class LayoutedDiagramProvider {
+public class ELKLayoutedDiagramProvider {
 
     public Diagram getLayoutedDiagram(Diagram diagram, ElkNode elkDiagram, Map<String, ElkGraphElement> id2ElkGraphElements) {
         Size size = Size.of(elkDiagram.getWidth(), elkDiagram.getHeight());

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/LayoutConfiguratorRegistry.java

@@ -69,7 +69,7 @@ public LayoutConfiguratorRegistry(List<IDiagramLayoutConfiguratorProvider> custo
     public LayoutConfigurator getDefaultLayoutConfigurator() {
         // @formatter:off
         SiriusWebLayoutConfigurator configurator = new SiriusWebLayoutConfigurator();
-        configurator.configureByType(DiagramConverter.DEFAULT_DIAGRAM_TYPE)
+        configurator.configureByType(ELKDiagramConverter.DEFAULT_DIAGRAM_TYPE)
                 .setProperty(CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID)
                 .setProperty(CoreOptions.HIERARCHY_HANDLING, HierarchyHandling.INCLUDE_CHILDREN)
                 .setProperty(LayeredOptions.LAYERING_STRATEGY, LayeringStrategy.NETWORK_SIMPLEX)
@@ -88,7 +88,7 @@ public LayoutConfigurator getDefaultLayoutConfigurator() {
                 .setProperty(CoreOptions.NODE_LABELS_PLACEMENT, NodeLabelPlacement.outsideTopCenter());
 
         // This image type does not match any diagram item. We add it to define the image size as constraint for the node image parent.
-        configurator.configureByType(DiagramConverter.DEFAULT_IMAGE_TYPE)
+        configurator.configureByType(ELKDiagramConverter.DEFAULT_IMAGE_TYPE)
                 .setProperty(CoreOptions.NODE_SIZE_CONSTRAINTS, SizeConstraint.fixed());
         // @formatter:on
 

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/LayoutService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2020 Obeo.
+ * Copyright (c) 2019, 2021 Obeo and others.
  * 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
@@ -14,7 +14,6 @@
 
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 import org.eclipse.elk.alg.layered.options.LayeredOptions;
 import org.eclipse.elk.core.IGraphLayoutEngine;
@@ -30,7 +29,10 @@
 import org.eclipse.sirius.web.diagrams.Position;
 import org.eclipse.sirius.web.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.web.diagrams.layout.api.ILayoutService;
+import org.eclipse.sirius.web.diagrams.layout.incremental.IncrementalLayoutConvertedDiagram;
+import org.eclipse.sirius.web.diagrams.layout.incremental.IncrementalLayoutDiagramConverter;
 import org.eclipse.sirius.web.diagrams.layout.incremental.IncrementalLayoutEngine;
+import org.eclipse.sirius.web.diagrams.layout.incremental.IncrementalLayoutedDiagramProvider;
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.DiagramLayoutData;
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.ILayoutData;
 import org.eclipse.sirius.web.services.api.representations.IRepresentationDescriptionService;
@@ -44,25 +46,32 @@
 @Service
 public class LayoutService implements ILayoutService {
 
-    private final DiagramConverter diagramConverter;
+    private final ELKDiagramConverter elkDiagramConverter;
 
     private final LayoutConfiguratorRegistry layoutConfiguratorRegistry;
 
-    private final LayoutedDiagramProvider layoutedDiagramProvider;
+    private final ELKLayoutedDiagramProvider elkLayoutedDiagramProvider;
+
+    private final IncrementalLayoutedDiagramProvider incrementalLayoutedDiagramProvider;
 
     private final IRepresentationDescriptionService representationDescriptionService;
 
-    public LayoutService(DiagramConverter diagramConverter, LayoutConfiguratorRegistry layoutConfiguratorRegistry, LayoutedDiagramProvider layoutedDiagramProvider,
+    private final IncrementalLayoutDiagramConverter incrementalLayoutDiagramConverter;
+
+    public LayoutService(ELKDiagramConverter elkDiagramConverter, IncrementalLayoutDiagramConverter incrementalLayoutDiagramConverter, LayoutConfiguratorRegistry layoutConfiguratorRegistry,
+            ELKLayoutedDiagramProvider layoutedDiagramProvider, IncrementalLayoutedDiagramProvider incrementalLayoutedDiagramProvider,
             IRepresentationDescriptionService representationDescriptionService) {
-        this.diagramConverter = Objects.requireNonNull(diagramConverter);
+        this.elkDiagramConverter = Objects.requireNonNull(elkDiagramConverter);
+        this.incrementalLayoutDiagramConverter = Objects.requireNonNull(incrementalLayoutDiagramConverter);
         this.layoutConfiguratorRegistry = Objects.requireNonNull(layoutConfiguratorRegistry);
-        this.layoutedDiagramProvider = Objects.requireNonNull(layoutedDiagramProvider);
+        this.elkLayoutedDiagramProvider = Objects.requireNonNull(layoutedDiagramProvider);
+        this.incrementalLayoutedDiagramProvider = Objects.requireNonNull(incrementalLayoutedDiagramProvider);
         this.representationDescriptionService = Objects.requireNonNull(representationDescriptionService);
     }
 
     @Override
     public Diagram layout(Diagram diagram) {
-        ConvertedDiagram convertedDiagram = this.diagramConverter.convert(diagram);
+        ELKConvertedDiagram convertedDiagram = this.elkDiagramConverter.convert(diagram);
 
         ElkNode elkDiagram = convertedDiagram.getElkDiagram();
         var representationDescription = this.representationDescriptionService.findRepresentationDescriptionById(diagram.getDescriptionId());
@@ -80,18 +89,18 @@ public Diagram layout(Diagram diagram) {
         engine.layout(elkDiagram, new BasicProgressMonitor());
 
         Map<String, ElkGraphElement> id2ElkGraphElements = convertedDiagram.getId2ElkGraphElements();
-        Diagram layoutedDiagram = this.layoutedDiagramProvider.getLayoutedDiagram(diagram, elkDiagram, id2ElkGraphElements);
+        Diagram layoutedDiagram = this.elkLayoutedDiagramProvider.getLayoutedDiagram(diagram, elkDiagram, id2ElkGraphElements);
 
         return layoutedDiagram;
     }
 
     @Override
-    public Diagram incrementalLayout(Diagram newDiagram, Optional<MoveEvent> optionalMoveEvent, Position startingPosition) {
-        org.eclipse.sirius.web.diagrams.layout.incremental.ConvertedDiagram convertedDiagram = new org.eclipse.sirius.web.diagrams.layout.incremental.DiagramConverter().convert(newDiagram);
+    public Diagram incrementalLayout(Diagram newDiagram, MoveEvent moveEvent, Position startingPosition) {
+        IncrementalLayoutConvertedDiagram convertedDiagram = this.incrementalLayoutDiagramConverter.convert(newDiagram);
         DiagramLayoutData diagramLayoutData = convertedDiagram.getDiagramLayoutData();
-        new IncrementalLayoutEngine(optionalMoveEvent, startingPosition).layout(diagramLayoutData);
+        new IncrementalLayoutEngine(moveEvent, startingPosition).layout(diagramLayoutData);
         Map<String, ILayoutData> id2LayoutData = convertedDiagram.getId2LayoutData();
-        return new org.eclipse.sirius.web.diagrams.layout.incremental.LayoutedDiagramProvider().getLayoutedDiagram(newDiagram, diagramLayoutData, id2LayoutData);
+        return this.incrementalLayoutedDiagramProvider.getLayoutedDiagram(newDiagram, diagramLayoutData, id2LayoutData);
     }
 
 }

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/SiriusWebLayoutConfigurator.java

@@ -48,7 +48,7 @@ public IPropertyHolder configureByType(String type) {
     public void visit(final ElkGraphElement element) {
         super.visit(element);
 
-        IPropertyHolder typeProperties = this.getPropertiesByType(element.getProperty(DiagramConverter.PROPERTY_TYPE));
+        IPropertyHolder typeProperties = this.getPropertiesByType(element.getProperty(ELKDiagramConverter.PROPERTY_TYPE));
         this.applyProperties(element, typeProperties);
 
         IPropertyHolder idProperties = this.getPropertiesById(element.getIdentifier());

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/ConvertedDiagram.java → backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/IncrementalLayoutConvertedDiagram.java

@@ -24,13 +24,13 @@
  *
  * @author wpiers
  */
-public class ConvertedDiagram {
+public class IncrementalLayoutConvertedDiagram {
 
     private final DiagramLayoutData diagramLayoutData;
 
     private final Map<String, ILayoutData> id2LayoutData;
 
-    public ConvertedDiagram(DiagramLayoutData diagramLayoutData, Map<String, ILayoutData> id2LayoutData) {
+    public IncrementalLayoutConvertedDiagram(DiagramLayoutData diagramLayoutData, Map<String, ILayoutData> id2LayoutData) {
         this.diagramLayoutData = Objects.requireNonNull(diagramLayoutData);
         this.id2LayoutData = Objects.requireNonNull(id2LayoutData);
     }

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/DiagramConverter.java → backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/IncrementalLayoutDiagramConverter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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
@@ -29,15 +29,17 @@
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.ILayoutData;
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.LabelLayoutData;
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.NodeLayoutData;
+import org.springframework.stereotype.Service;
 
 /**
  * Used to convert the diagram into layout data. During the transformation.
  *
  * @author wpiers
  */
-public class DiagramConverter {
+@Service
+public class IncrementalLayoutDiagramConverter {
 
-    public ConvertedDiagram convert(Diagram diagram) {
+    public IncrementalLayoutConvertedDiagram convert(Diagram diagram) {
         Map<String, ILayoutData> id2LayoutData = new HashMap<>();
 
         DiagramLayoutData layoutData = new DiagramLayoutData();
@@ -60,7 +62,7 @@ public ConvertedDiagram convert(Diagram diagram) {
         }
         layoutData.setEdges(edges);
 
-        return new ConvertedDiagram(layoutData, id2LayoutData);
+        return new IncrementalLayoutConvertedDiagram(layoutData, id2LayoutData);
     }
 
     private NodeLayoutData convertNode(Node node, IContainerLayoutData parent, Map<String, ILayoutData> id2LayoutData) {

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/IncrementalLayoutEngine.java

@@ -12,8 +12,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.web.diagrams.layout.incremental;
 
-import java.util.Optional;
-
 import org.eclipse.sirius.web.diagrams.MoveEvent;
 import org.eclipse.sirius.web.diagrams.Position;
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.DiagramLayoutData;
@@ -44,7 +42,7 @@ public class IncrementalLayoutEngine {
      */
     public static final double NODES_GAP = 30;
 
-    private Optional<MoveEvent> optionalMoveEvent;
+    private MoveEvent moveEvent;
 
     private NodeLabelPositionProvider nodeLabelPositionProvider;
 
@@ -56,8 +54,8 @@ public class IncrementalLayoutEngine {
 
     private NodePositionProvider nodePositionProvider;
 
-    public IncrementalLayoutEngine(Optional<MoveEvent> optionalMoveEvent, Position startingPosition) {
-        this.optionalMoveEvent = optionalMoveEvent;
+    public IncrementalLayoutEngine(MoveEvent moveEvent, Position startingPosition) {
+        this.moveEvent = moveEvent;
         this.edgeRoutingPointsProvider = new EdgeRoutingPointsProvider();
         this.nodeLabelPositionProvider = new NodeLabelPositionProvider();
         this.edgeLabelPositionProvider = new EdgeLabelPositionProvider();
@@ -101,8 +99,8 @@ private void layoutNode(NodeLayoutData node) {
         }
 
         // recompute the node position
-        if (this.optionalMoveEvent.isPresent() && this.optionalMoveEvent.get().getNodeId().toString().equals(node.getId())) {
-            Position newPosition = this.optionalMoveEvent.get().getNewPosition();
+        if (this.moveEvent != null && this.moveEvent.getNodeId().toString().equals(node.getId())) {
+            Position newPosition = this.moveEvent.getNewPosition();
             node.setPosition(newPosition);
             node.setChanged(true);
             node.setPinned(true);

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/LayoutedDiagramProvider.java → backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/IncrementalLayoutedDiagramProvider.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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
@@ -26,14 +26,16 @@
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.ILayoutData;
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.LabelLayoutData;
 import org.eclipse.sirius.web.diagrams.layout.incremental.data.NodeLayoutData;
+import org.springframework.stereotype.Service;
 
 /**
  * This class is used to include layout data in an existing diagram by producing a brand new immutable diagram with the
  * proper layout information.
  *
  * @author wpiers
  */
-public class LayoutedDiagramProvider {
+@Service
+public class IncrementalLayoutedDiagramProvider {
 
     public Diagram getLayoutedDiagram(Diagram diagram, DiagramLayoutData diagramLayoutData, Map<String, ILayoutData> id2LayoutData) {
         List<Node> nodes = this.getLayoutedNodes(diagram.getNodes(), id2LayoutData);

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/data/EdgeLayoutData.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/data/IConnectable.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/data/ILayoutData.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/data/LabelLayoutData.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/data/NodeLayoutData.java

@@ -151,7 +151,7 @@ public Position getAbsolutePosition() {
             NodeLayoutData parentLayoutData = (NodeLayoutData) parentContainerLayoutData;
             double absoluteX = this.getPosition().getX() + parentLayoutData.getAbsolutePosition().getX();
             double absoluteY = this.getPosition().getY() + parentLayoutData.getAbsolutePosition().getY();
-            return Position.newPosition().x(absoluteX).y(absoluteY).build();
+            return Position.at(absoluteX, absoluteY);
         }
         return this.getPosition();
     }

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/provider/EdgeLabelPositionProvider.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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
@@ -35,7 +35,7 @@ public Position getCenterPosition(EdgeLayoutData edge, LabelLayoutData label) {
             Position targetAnchor = routingPoints.get(routingPoints.size() - 1);
             double x = ((sourceAnchor.getX() + targetAnchor.getX()) / 2) - (label.getTextBounds().getSize().getWidth() / 2);
             double y = (sourceAnchor.getY() + targetAnchor.getY()) / 2;
-            return Position.newPosition().x(x).y(y).build();
+            return Position.at(x, y);
         }
         return position;
     }

backend/sirius-web-diagrams-layout/src/main/java/org/eclipse/sirius/web/diagrams/layout/incremental/provider/EdgeRoutingPointsProvider.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Thales.
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
  * 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