[241] Move concepts such as IEditingContext to Sirius Web Core API

Bug: #241
Signed-off-by: Stéphane Bégaudeau <[email protected]>

backend/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2020 Obeo.
+ Copyright (c) 2020, 2021 Obeo.
  All rights reserved. This program and the accompanying materials
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -33,10 +33,12 @@
 		<module>sirius-web-annotations-spring</module>
 		<module>sirius-web-annotations</module>
 		<module>sirius-web-api</module>
+		<module>sirius-web-core-api</module>
 		<module>sirius-web-collaborative-api</module>
 		<module>sirius-web-collaborative-diagrams-api</module>
 		<module>sirius-web-collaborative-forms-api</module>
 		<module>sirius-web-collaborative-trees-api</module>
+		<module>sirius-web-services-api</module>
 		<module>sirius-web-components</module>
 		<module>sirius-web-diagrams-layout-api</module>
 		<module>sirius-web-diagrams-layout</module>
@@ -50,7 +52,6 @@
 		<module>sirius-web-graphql-voyager</module>
 		<module>sirius-web-graphql</module>
 		<module>sirius-web-representations</module>
-		<module>sirius-web-services-api</module>
 		<module>sirius-web-spring-collaborative-diagrams</module>
 		<module>sirius-web-spring-collaborative-forms</module>
 		<module>sirius-web-spring-collaborative-trees</module>

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/CreateRepresentationInput.java

@@ -20,7 +20,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLInputObjectType;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
-import org.eclipse.sirius.web.services.api.dto.IProjectInput;
+import org.eclipse.sirius.web.services.api.projects.IProjectInput;
 
 /**
  * The input object of the create representation mutation.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/CreateRepresentationSuccessPayload.java

@@ -18,8 +18,8 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.representations.IRepresentation;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * The payload of the create representation mutation.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/DeleteRepresentationInput.java

@@ -20,7 +20,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLInputObjectType;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
-import org.eclipse.sirius.web.services.api.dto.IProjectInput;
+import org.eclipse.sirius.web.services.api.projects.IProjectInput;
 
 /**
  * The input of the delete representation mutation.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/DeleteRepresentationSuccessPayload.java

@@ -18,7 +18,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.services.api.projects.Project;
 
 /**

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/PreDestroyPayload.java

@@ -19,7 +19,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * Payload used to indicate that the server is about to close.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/ProjectEventInput.java

@@ -19,7 +19,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLInputObjectType;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
-import org.eclipse.sirius.web.services.api.dto.IInput;
+import org.eclipse.sirius.web.core.api.IInput;
 
 /**
  * The input of the project event subscription.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/ProjectRenamedEventPayload.java

@@ -20,7 +20,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * Payload used to indicate that the project has been renamed.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/RenameRepresentationSuccessPayload.java

@@ -18,8 +18,8 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.representations.IRepresentation;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * The payload returned by the rename representation mutation.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/RepresentationRenamedEventPayload.java

@@ -20,7 +20,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * Payload used to indicate that the representation has been renamed.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/dto/SubscribersUpdatedEventPayload.java

@@ -19,7 +19,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * Payload used to indicate that list of subscribers of the representation has been updated.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/EventHandlerResponse.java

@@ -15,8 +15,8 @@
 import java.util.Objects;
 import java.util.function.Predicate;
 
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.representations.IRepresentation;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * Response of the event handlers used to indicate how the execution of the event handler should impact the project.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/IProjectEventHandler.java

@@ -12,9 +12,9 @@
  *******************************************************************************/
 package org.eclipse.sirius.web.collaborative.api.services;
 
+import org.eclipse.sirius.web.core.api.IEditingContext;
 import org.eclipse.sirius.web.services.api.Context;
-import org.eclipse.sirius.web.services.api.dto.IProjectInput;
-import org.eclipse.sirius.web.services.api.objects.IEditingContext;
+import org.eclipse.sirius.web.services.api.projects.IProjectInput;
 
 /**
  * Process the given input event.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/IProjectEventProcessor.java

@@ -16,9 +16,9 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import org.eclipse.sirius.web.core.api.IInput;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.services.api.Context;
-import org.eclipse.sirius.web.services.api.dto.IInput;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 import reactor.core.publisher.Flux;
 

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/IProjectEventProcessorRegistry.java

@@ -16,9 +16,9 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import org.eclipse.sirius.web.core.api.IInput;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.services.api.Context;
-import org.eclipse.sirius.web.services.api.dto.IInput;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * Registry of all the project event handlers.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/IRepresentationEventProcessor.java

@@ -14,10 +14,10 @@
 
 import java.util.Optional;
 
+import org.eclipse.sirius.web.core.api.IPayload;
+import org.eclipse.sirius.web.core.api.IRepresentationInput;
 import org.eclipse.sirius.web.representations.IRepresentation;
 import org.eclipse.sirius.web.services.api.Context;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
-import org.eclipse.sirius.web.services.api.dto.IRepresentationInput;
 
 import reactor.core.publisher.Flux;
 

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/IRepresentationEventProcessorComposedFactory.java

@@ -14,8 +14,8 @@
 
 import java.util.Optional;
 
+import org.eclipse.sirius.web.core.api.IEditingContext;
 import org.eclipse.sirius.web.services.api.Context;
-import org.eclipse.sirius.web.services.api.objects.IEditingContext;
 
 /**
  * Interface used to create the various representation event processors.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/IRepresentationEventProcessorFactory.java

@@ -14,8 +14,8 @@
 
 import java.util.Optional;
 
+import org.eclipse.sirius.web.core.api.IEditingContext;
 import org.eclipse.sirius.web.services.api.Context;
-import org.eclipse.sirius.web.services.api.objects.IEditingContext;
 
 /**
  * Interface used to create a specific representation event processor.

backend/sirius-web-collaborative-api/src/main/java/org/eclipse/sirius/web/collaborative/api/services/ISubscriptionManager.java

@@ -14,7 +14,7 @@
 
 import java.util.List;
 
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 import reactor.core.publisher.Flux;
 

backend/sirius-web-collaborative-api/src/test/java/org/eclipse/sirius/web/collaborative/api/architecture/CodingRulesTestCases.java

@@ -19,8 +19,8 @@
 
 import org.eclipse.sirius.web.annotations.graphql.GraphQLInputObjectType;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IInput;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IInput;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.tests.architecture.AbstractCodingRulesTestCases;
 import org.junit.Test;
 

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/IDiagramCreationService.java

@@ -14,9 +14,9 @@
 
 import java.util.Optional;
 
+import org.eclipse.sirius.web.core.api.IEditingContext;
 import org.eclipse.sirius.web.diagrams.Diagram;
 import org.eclipse.sirius.web.diagrams.description.DiagramDescription;
-import org.eclipse.sirius.web.services.api.objects.IEditingContext;
 
 /**
  * Service used to create diagrams from scratch or from an existing diagram.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/IDiagramEventHandler.java

@@ -13,7 +13,7 @@
 package org.eclipse.sirius.web.collaborative.diagrams.api;
 
 import org.eclipse.sirius.web.collaborative.api.services.EventHandlerResponse;
-import org.eclipse.sirius.web.services.api.objects.IEditingContext;
+import org.eclipse.sirius.web.core.api.IEditingContext;
 
 /**
  * Interface of all the diagram event handlers.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/IDiagramInput.java

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.web.collaborative.diagrams.api;
 
-import org.eclipse.sirius.web.services.api.dto.IRepresentationInput;
+import org.eclipse.sirius.web.core.api.IRepresentationInput;
 
 /**
  * Represents an input sent by a client which concerns a diagram representation.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/dto/DeleteFromDiagramSuccessPayload.java

@@ -18,8 +18,8 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * Payload to indicate that a "Delete from diagram" mutation succeeded.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/dto/DiagramEventInput.java

@@ -19,7 +19,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLInputObjectType;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
-import org.eclipse.sirius.web.services.api.dto.IInput;
+import org.eclipse.sirius.web.core.api.IInput;
 
 /**
  * The input of the diagram event subscription.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/dto/DiagramRefreshedEventPayload.java

@@ -18,8 +18,8 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * Payload used to indicate that the diagram has been refreshed.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/dto/EditLabelSuccessPayload.java

@@ -18,8 +18,8 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * The payload of the "Edit Label" mutation returned on success.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/dto/InvokeEdgeToolOnDiagramSuccessPayload.java

@@ -18,8 +18,8 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * The payload of the "Invoke edge tool on diagram" mutation returned on success.

backend/sirius-web-collaborative-diagrams-api/src/main/java/org/eclipse/sirius/web/collaborative/diagrams/api/dto/InvokeNodeToolOnDiagramSuccessPayload.java

@@ -18,8 +18,8 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 /**
  * The payload of the "Invoke node tool on diagram" mutation returned on success.

backend/sirius-web-collaborative-diagrams-api/src/test/java/org/eclipse/sirius/web/collaborative/diagrams/api/architecture/CodingRulesTestCases.java

@@ -19,8 +19,8 @@
 
 import org.eclipse.sirius.web.annotations.graphql.GraphQLInputObjectType;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IInput;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IInput;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.tests.architecture.AbstractCodingRulesTestCases;
 import org.junit.Test;
 

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/FormCreationParameters.java

@@ -17,8 +17,8 @@
 import java.util.UUID;
 
 import org.eclipse.sirius.web.annotations.Immutable;
+import org.eclipse.sirius.web.core.api.IEditingContext;
 import org.eclipse.sirius.web.forms.description.FormDescription;
-import org.eclipse.sirius.web.services.api.objects.IEditingContext;
 
 /**
  * This class is used because creating a form requires sending at once multiple parameters. Since this list of parameter

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/IFormInput.java

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.web.collaborative.forms.api;
 
-import org.eclipse.sirius.web.services.api.dto.IRepresentationInput;
+import org.eclipse.sirius.web.core.api.IRepresentationInput;
 
 /**
  * Represents an input sent by a client which concerns a form representation.

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/IWidgetSubscriptionManager.java

@@ -13,8 +13,8 @@
 package org.eclipse.sirius.web.collaborative.forms.api;
 
 import org.eclipse.sirius.web.collaborative.forms.api.dto.UpdateWidgetFocusInput;
+import org.eclipse.sirius.web.core.api.IPayload;
 import org.eclipse.sirius.web.services.api.Context;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
 
 import reactor.core.publisher.Flux;
 

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/dto/EditCheckboxSuccessPayload.java

@@ -18,7 +18,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * The payload for the checkbox edition mutation.

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/dto/EditRadioSuccessPayload.java

@@ -18,7 +18,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * The payload for the radio edition mutation.

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/dto/EditSelectSuccessPayload.java

@@ -18,7 +18,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * The payload of the edit select mutation.

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/dto/EditTextfieldSuccessPayload.java

@@ -18,7 +18,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLField;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLObjectType;
-import org.eclipse.sirius.web.services.api.dto.IPayload;
+import org.eclipse.sirius.web.core.api.IPayload;
 
 /**
  * The payload for the text field edition mutation.

backend/sirius-web-collaborative-forms-api/src/main/java/org/eclipse/sirius/web/collaborative/forms/api/dto/FormEventInput.java

@@ -19,7 +19,7 @@
 import org.eclipse.sirius.web.annotations.graphql.GraphQLID;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLInputObjectType;
 import org.eclipse.sirius.web.annotations.graphql.GraphQLNonNull;
-import org.eclipse.sirius.web.services.api.dto.IInput;
+import org.eclipse.sirius.web.core.api.IInput;
 
 /**
  * The input of the form event subscription.