Skip to content

Commit 6521c2a

Browse files
committed
[1628] Introduce new services modules
Bug: #1628 Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 26828e3 commit 6521c2a

135 files changed

Lines changed: 9016 additions & 17 deletions

File tree

Some content is hidden

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

CHANGELOG.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
- https://github.com/eclipse-syson/syson/issues/1581[#1581] [diagrams] Redefine inherited `PortUsages` when connected as graphical border nodes.
3838
- https://github.com/eclipse-syson/syson/issues/1589[#1589] [explorer] Add a filter to hide expose elements in `ViewUsage`.
3939
- https://github.com/eclipse-syson/syson/issues/1587[#1587] [diagrams] Handle `ActionUsage` and `ActionDefinition` parameters as graphical border nodes.
40+
- https://github.com/eclipse-syson/syson/issues/1628[#1628] [services] Introduce new services organization.
41+
xref:developer-guide:index#services_organization.adoc[See the developer guide in the documentation for more details].
4042

4143
== v2025.10.0
4244

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@
8181
<artifactId>syson-services</artifactId>
8282
<version>2025.10.1</version>
8383
</dependency>
84+
<dependency>
85+
<groupId>org.eclipse.syson</groupId>
86+
<artifactId>syson-model-services</artifactId>
87+
<version>2025.10.1</version>
88+
</dependency>
8489
<dependency>
8590
<groupId>org.eclipse.syson</groupId>
8691
<artifactId>syson-siriusweb-customnodes-metamodel</artifactId>

backend/application/syson-application/src/test/java/org/eclipse/syson/application/validation/ValidationRulesTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ public void givenAProjectWithManyElementsWhenWeSubscribeToItsValidationEventsThe
134134
.map(ValidationRefreshedEventPayload::validation)
135135
.ifPresentOrElse(validation -> {
136136
assertNotNull(validation);
137-
// It remains some AQL Errors in console, should be false when all validation rules will be valid
138-
assertTrue(capturedOutput.getOut().contains("AQLInterpreter"));
137+
assertFalse(capturedOutput.getOut().contains("AQLInterpreter"));
139138
// Some constraints are not respected, should be 0 when all validation rules will be valid, all
140139
// derived references will be implemented and all implicit specialization added.
141140
assertTrue(validation.getDiagnostics().size() > 0);

backend/application/syson-sysml-validation/src/main/java/org/eclipse/syson/sysml/validation/SysMLv2ValidationRules.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public class SysMLv2ValidationRules {
284284
new ValidationRule(SysmlPackage.eINSTANCE.getEventOccurrenceUsage(), "validateEventOccurrenceUsageReference", "aql:self.referencedFeatureTarget() <> null implies self.referencedFeatureTarget().oclIsKindOf(sysml::OccurrenceUsage)", "If an EventOccurrenceUsage has an ownedReferenceSubsetting, then the featureTarget of the referencedFeature must be an OccurrenceUsage."),
285285
new ValidationRule(SysmlPackage.eINSTANCE.getExhibitStateUsage(), "validateExhibitStateUsageReference", "aql:self.referencedFeatureTarget() <> null implies self.referencedFeatureTarget().oclIsKindOf(sysml::StateUsage)", "If an ExhibitStateUsage has an ownedReferenceSubsetting, then the featureTarget of the referencedFeature must be a StateUsage."),
286286
new ValidationRule(SysmlPackage.eINSTANCE.getExpose(), "validateExposeIsImportAll", "aql:self.isImportAll", "An Expose always imports all Elements, regardless of visibility."),
287-
new ValidationRule(SysmlPackage.eINSTANCE.getExpose(), "validateExposeOwningNamespace", "aql:self.importOwningNamespace.ocIsTypeOf(sysml::ViewUsage)", "The importOwningNamespace of an Expose must be a ViewUsage."),
287+
new ValidationRule(SysmlPackage.eINSTANCE.getExpose(), "validateExposeOwningNamespace", "aql:self.importOwningNamespace.oclIsTypeOf(sysml::ViewUsage)", "The importOwningNamespace of an Expose must be a ViewUsage."),
288288
new ValidationRule(SysmlPackage.eINSTANCE.getExpose(), "validateExposeVisibility", "aql:self.visibility = sysml::VisibilityKind::protected", "An Expose always has protected visibility."),
289289
new ValidationRule(SysmlPackage.eINSTANCE.getExpression(), "validateExpressionResultExpressionMembership", "aql:self.membership->filter(sysml::ResultExpressionMembership)->size() <= 1", "An Expression must have at most one ResultExpressionMembership."),
290290
new ValidationRule(SysmlPackage.eINSTANCE.getExpression(), "validateExpressionResultParameterMembership", "aql:self.featureMembership->filter(sysml::ReturnParameterMembership)->size() = 1", "An Expression must have exactly one featureMembership (owned or inherited) that is a ResultParameterMembership."),

backend/releng/syson-test-coverage/pom.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,46 @@
6565
<artifactId>syson-direct-edit-grammar</artifactId>
6666
<version>2025.10.1</version>
6767
</dependency>
68+
<dependency>
69+
<groupId>org.eclipse.syson</groupId>
70+
<artifactId>syson-diagram-services</artifactId>
71+
<version>2025.10.1</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.eclipse.syson</groupId>
75+
<artifactId>syson-form-services</artifactId>
76+
<version>2025.10.1</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.eclipse.syson</groupId>
80+
<artifactId>syson-model-services</artifactId>
81+
<version>2025.10.1</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.eclipse.syson</groupId>
85+
<artifactId>syson-representation-services</artifactId>
86+
<version>2025.10.1</version>
87+
</dependency>
6888
<dependency>
6989
<groupId>org.eclipse.syson</groupId>
7090
<artifactId>syson-services</artifactId>
7191
<version>2025.10.1</version>
7292
</dependency>
93+
<dependency>
94+
<groupId>org.eclipse.syson</groupId>
95+
<artifactId>syson-table-services</artifactId>
96+
<version>2025.10.1</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.eclipse.syson</groupId>
100+
<artifactId>syson-tree-services</artifactId>
101+
<version>2025.10.1</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.eclipse.syson</groupId>
105+
<artifactId>syson-sysml-metamodel-services</artifactId>
106+
<version>2025.10.1</version>
107+
</dependency>
73108
<dependency>
74109
<groupId>org.eclipse.syson</groupId>
75110
<artifactId>syson-sysml-rest-api-services</artifactId>

backend/services/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,14 @@
3333

3434
<modules>
3535
<module>syson-direct-edit-grammar</module>
36+
<module>syson-diagram-services</module>
37+
<module>syson-form-services</module>
38+
<module>syson-model-services</module>
39+
<module>syson-representation-services</module>
3640
<module>syson-services</module>
41+
<module>syson-table-services</module>
42+
<module>syson-tree-services</module>
43+
<module>syson-sysml-metamodel-services</module>
3744
<module>syson-sysml-rest-api-services</module>
3845
</modules>
3946
</project>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
4+
<fileset name="all" enabled="true" check-config-name="SysON" local="false">
5+
<file-match-pattern match-pattern="." include-pattern="true"/>
6+
</fileset>
7+
<filter name="FilesFromPackage" enabled="true">
8+
<filter-data value="src/main/resources"/>
9+
<filter-data value="src/test/resources"/>
10+
</filter>
11+
</fileset-config>
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
14+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
15+
<attributes>
16+
<attribute name="test" value="true"/>
17+
<attribute name="optional" value="true"/>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
21+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
22+
<attributes>
23+
<attribute name="ignore_optional_problems" value="true"/>
24+
<attribute name="test" value="true"/>
25+
<attribute name="maven.pomderived" value="true"/>
26+
</attributes>
27+
</classpathentry>
28+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
29+
<attributes>
30+
<attribute name="module" value="true"/>
31+
<attribute name="maven.pomderived" value="true"/>
32+
</attributes>
33+
</classpathentry>
34+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
35+
<attributes>
36+
<attribute name="maven.pomderived" value="true"/>
37+
</attributes>
38+
</classpathentry>
39+
<classpathentry kind="output" path="target/classes"/>
40+
</classpath>
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>syson-diagram-services</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.m2e.core.maven2Builder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
</buildSpec>
24+
<natures>
25+
<nature>org.eclipse.jdt.core.javanature</nature>
26+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
27+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
28+
</natures>
29+
</projectDescription>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding//src/test/resources=UTF-8
6+
encoding/<project>=UTF-8

0 commit comments

Comments
 (0)