[699] Pass metadata to IDiagramEventHandlers

Bug: #699 Signed-off-by: Pierre-Charles David <[email protected]>
eclipse-sirius · Sep 7, 2021 · c700d9e · c700d9e
1 parent 92974a5
commit c700d9e
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 11 deletions.
diff --git a/...main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/DiagramEventProcessor.java b/...main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/DiagramEventProcessor.java
@@ -118,7 +118,7 @@ public Optional<EventHandlerResponse> handle(IRepresentationInput representation
 
             if (optionalDiagramEventHandler.isPresent()) {
                 IDiagramEventHandler diagramEventHandler = optionalDiagramEventHandler.get();
-                EventHandlerResponse eventHandlerResponse = diagramEventHandler.handle(this.editingContext, this.diagramContext, diagramInput);
+                EventHandlerResponse eventHandlerResponse = diagramEventHandler.handle(this.editingContext, this.diagramContext, this.diagramMetadata, diagramInput);
 
                 this.refresh(representationInput, eventHandlerResponse.getChangeDescription());
 

diff --git a/...n/java/org/eclipse/sirius/web/spring/collaborative/diagrams/api/IDiagramEventHandler.java b/...n/java/org/eclipse/sirius/web/spring/collaborative/diagrams/api/IDiagramEventHandler.java
@@ -13,6 +13,7 @@
 package org.eclipse.sirius.web.spring.collaborative.diagrams.api;
 
 import org.eclipse.sirius.web.core.api.IEditingContext;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.spring.collaborative.api.EventHandlerResponse;
 
 /**
@@ -24,6 +25,6 @@ public interface IDiagramEventHandler {
 
     boolean canHandle(IDiagramInput diagramInput);
 
-    EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput);
+    EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput);
 
 }
diff --git a/...org/eclipse/sirius/web/spring/collaborative/diagrams/handlers/ArrangeAllEventHandler.java b/...org/eclipse/sirius/web/spring/collaborative/diagrams/handlers/ArrangeAllEventHandler.java
@@ -17,6 +17,7 @@
 import org.eclipse.sirius.web.core.api.ErrorPayload;
 import org.eclipse.sirius.web.core.api.IEditingContext;
 import org.eclipse.sirius.web.diagrams.events.ArrangeAllEvent;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeKind;
 import org.eclipse.sirius.web.spring.collaborative.api.EventHandlerResponse;
@@ -62,7 +63,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
         if (diagramInput instanceof ArrangeAllInput) {
             diagramContext.setDiagramEvent(new ArrangeAllEvent());

diff --git a/...ipse/sirius/web/spring/collaborative/diagrams/handlers/DeleteFromDiagramEventHandler.java b/...ipse/sirius/web/spring/collaborative/diagrams/handlers/DeleteFromDiagramEventHandler.java
@@ -28,6 +28,7 @@
 import org.eclipse.sirius.web.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.web.diagrams.description.EdgeDescription;
 import org.eclipse.sirius.web.diagrams.description.NodeDescription;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.representations.Status;
 import org.eclipse.sirius.web.representations.VariableManager;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
@@ -92,7 +93,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
 
         EventHandlerResponse result;

diff --git a/.../org/eclipse/sirius/web/spring/collaborative/diagrams/handlers/EditLabelEventHandler.java b/.../org/eclipse/sirius/web/spring/collaborative/diagrams/handlers/EditLabelEventHandler.java
@@ -24,6 +24,7 @@
 import org.eclipse.sirius.web.diagrams.Node;
 import org.eclipse.sirius.web.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.web.diagrams.description.NodeDescription;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.representations.VariableManager;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeKind;
@@ -87,7 +88,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
 
         if (diagramInput instanceof EditLabelInput) {

diff --git a/...irius/web/spring/collaborative/diagrams/handlers/InvokeEdgeToolOnDiagramEventHandler.java b/...irius/web/spring/collaborative/diagrams/handlers/InvokeEdgeToolOnDiagramEventHandler.java
@@ -23,6 +23,7 @@
 import org.eclipse.sirius.web.diagrams.Node;
 import org.eclipse.sirius.web.diagrams.description.EdgeDescription;
 import org.eclipse.sirius.web.diagrams.tools.CreateEdgeTool;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.representations.Status;
 import org.eclipse.sirius.web.representations.VariableManager;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
@@ -81,7 +82,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
 
         if (diagramInput instanceof InvokeEdgeToolOnDiagramInput) {

diff --git a/...irius/web/spring/collaborative/diagrams/handlers/InvokeNodeToolOnDiagramEventHandler.java b/...irius/web/spring/collaborative/diagrams/handlers/InvokeNodeToolOnDiagramEventHandler.java
@@ -25,6 +25,7 @@
 import org.eclipse.sirius.web.diagrams.Position;
 import org.eclipse.sirius.web.diagrams.events.CreationEvent;
 import org.eclipse.sirius.web.diagrams.tools.CreateNodeTool;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.representations.Status;
 import org.eclipse.sirius.web.representations.VariableManager;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
@@ -86,7 +87,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
 
         if (diagramInput instanceof InvokeNodeToolOnDiagramInput) {

diff --git a/.../eclipse/sirius/web/spring/collaborative/diagrams/handlers/RenameDiagramEventHandler.java b/.../eclipse/sirius/web/spring/collaborative/diagrams/handlers/RenameDiagramEventHandler.java
@@ -19,6 +19,7 @@
 import org.eclipse.sirius.web.core.api.ErrorPayload;
 import org.eclipse.sirius.web.core.api.IEditingContext;
 import org.eclipse.sirius.web.diagrams.Diagram;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeKind;
 import org.eclipse.sirius.web.spring.collaborative.api.EventHandlerResponse;
@@ -71,7 +72,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
 
         if (diagramInput instanceof RenameDiagramInput) {

diff --git a/...lipse/sirius/web/spring/collaborative/diagrams/handlers/UpdateNodeBoundsEventHandler.java b/...lipse/sirius/web/spring/collaborative/diagrams/handlers/UpdateNodeBoundsEventHandler.java
@@ -21,6 +21,7 @@
 import org.eclipse.sirius.web.diagrams.Position;
 import org.eclipse.sirius.web.diagrams.Size;
 import org.eclipse.sirius.web.diagrams.events.ResizeEvent;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeKind;
 import org.eclipse.sirius.web.spring.collaborative.api.EventHandlerResponse;
@@ -69,7 +70,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
 
         EventHandlerResponse result;

diff --git a/...pse/sirius/web/spring/collaborative/diagrams/handlers/UpdateNodePositionEventHandler.java b/...pse/sirius/web/spring/collaborative/diagrams/handlers/UpdateNodePositionEventHandler.java
@@ -20,6 +20,7 @@
 import org.eclipse.sirius.web.diagrams.Node;
 import org.eclipse.sirius.web.diagrams.Position;
 import org.eclipse.sirius.web.diagrams.events.MoveEvent;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
 import org.eclipse.sirius.web.spring.collaborative.api.ChangeKind;
 import org.eclipse.sirius.web.spring.collaborative.api.EventHandlerResponse;
@@ -68,7 +69,7 @@ public boolean canHandle(IDiagramInput diagramInput) {
     }
 
     @Override
-    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) {
+    public EventHandlerResponse handle(IEditingContext editingContext, IDiagramContext diagramContext, ISemanticRepresentationMetadata diagramMetadata, IDiagramInput diagramInput) {
         this.counter.increment();
 
         EventHandlerResponse result;

diff --git a/...pse/sirius/web/spring/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java b/...pse/sirius/web/spring/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java
@@ -28,6 +28,7 @@
 import org.eclipse.sirius.web.diagrams.tests.TestDiagramDescriptionBuilder;
 import org.eclipse.sirius.web.representations.IRepresentation;
 import org.eclipse.sirius.web.representations.ISemanticRepresentation;
+import org.eclipse.sirius.web.representations.ISemanticRepresentationMetadata;
 import org.eclipse.sirius.web.spring.collaborative.api.EventHandlerResponse;
 import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationPersistenceService;
 import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationSearchService;
@@ -88,7 +89,35 @@ public void save(IEditingContext editingContext, ISemanticRepresentation represe
 
         assertThat(handler.canHandle(input)).isTrue();
 
-        EventHandlerResponse handlerResponse = handler.handle(new IEditingContext.NoOp(), new NoOpDiagramContext(), input);
+        ISemanticRepresentationMetadata diagramMetadata = new ISemanticRepresentationMetadata() {
+
+            @Override
+            public String getLabel() {
+                return OLD_LABEL;
+            }
+
+            @Override
+            public String getKind() {
+                return "Diagram"; //$NON-NLS-1$
+            }
+
+            @Override
+            public UUID getId() {
+                return representationId;
+            }
+
+            @Override
+            public UUID getDescriptionId() {
+                return UUID.randomUUID();
+            }
+
+            @Override
+            public String getTargetObjectId() {
+                return targetObjectId.toString();
+            }
+        };
+        EventHandlerResponse handlerResponse = handler.handle(new IEditingContext.NoOp(), new NoOpDiagramContext(), diagramMetadata, input);
+
         IPayload payload = handlerResponse.getPayload();
         assertThat(payload).isInstanceOf(RenameRepresentationSuccessPayload.class);
     }