Merge pull request #396 from bci-oss/394-support-samm-2-1-0

Add support for SAMM 2.1.0

Author: atextor

core/esmf-aspect-meta-model-interface/src/test/java/org/eclipse/esmf/aspectmodel/VersionNumberTest.java

@@ -118,5 +118,10 @@ public TestVersionNumber( final VersionNumber versionNumber, final String versio
          this.versionNumber = versionNumber;
          this.version = version;
       }
+
+      @Override
+      public String toString() {
+         return version;
+      }
    }
 }

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/AspectModelLoader.java

@@ -60,9 +60,10 @@
 public class AspectModelLoader {
    private static final Logger LOG = LoggerFactory.getLogger( AspectModelLoader.class );
 
-   private static final Set<KnownVersion> supportedVersions = ImmutableSet.of(
+   private static final Set<KnownVersion> SUPPORTED_VERSIONS = ImmutableSet.of(
          KnownVersion.SAMM_1_0_0,
-         KnownVersion.SAMM_2_0_0
+         KnownVersion.SAMM_2_0_0,
+         KnownVersion.SAMM_2_1_0
    );
 
    private static final MigratorService migratorService = new MigratorService();
@@ -115,7 +116,7 @@ public static Try<List<ModelNamespace>> getNamespaces( final VersionedModel vers
     */
    public static Try<List<ModelElement>> getElements( final VersionedModel versionedModel ) {
       final Optional<KnownVersion> metaModelVersion = KnownVersion.fromVersionString( versionedModel.getMetaModelVersion().toString() );
-      if ( metaModelVersion.isEmpty() || !supportedVersions.contains( metaModelVersion.get() ) ) {
+      if ( metaModelVersion.isEmpty() || !SUPPORTED_VERSIONS.contains( metaModelVersion.get() ) ) {
          return Try.failure( new UnsupportedVersionException( versionedModel.getMetaModelVersion() ) );
       }
 

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/CurieRdfType.java

@@ -83,7 +83,7 @@ public int getHashCode( final LiteralLabel lit ) {
 
    @Override
    public Class<Curie> getJavaClass() {
-      return (Class<Curie>) Curie.class;
+      return Curie.class;
    }
 
    @Override

core/esmf-aspect-meta-model-resolver/pom.xml

@@ -30,7 +30,7 @@
 
    <properties>
       <samm-revision>
-         https://raw.githubusercontent.com/eclipse-esmf/esmf-semantic-aspect-meta-model/bf9196547384bf072095cc8300d45ca7117a3211/esmf-semantic-aspect-meta-model
+         https://raw.githubusercontent.com/eclipse-esmf/esmf-semantic-aspect-meta-model/179f97e7f12e3f05d5daa1211ff414d07d3b2f9e/esmf-semantic-aspect-meta-model
       </samm-revision>
    </properties>
 
@@ -185,6 +185,23 @@
                      <skipCache>true</skipCache>
                   </configuration>
                </execution>
+               <execution>
+                  <id>download-meta-model-shapes-2-1-0</id>
+                  <phase>process-resources</phase>
+                  <goals>
+                     <goal>wget</goal>
+                  </goals>
+                  <configuration>
+                     <url>
+                        ${samm-revision}/src/main/resources/samm/meta-model/2.1.0/aspect-meta-model-shapes.ttl
+                     </url>
+                     <outputFileName>aspect-meta-model-shapes.ttl</outputFileName>
+                     <outputDirectory>${project.build.directory}/classes/samm/meta-model/2.1.0</outputDirectory>
+                     <overwrite>true</overwrite>
+                     <followRedirects>true</followRedirects>
+                     <skipCache>true</skipCache>
+                  </configuration>
+               </execution>
                <execution>
                   <id>download-characteristics-shapes-1-0-0</id>
                   <phase>process-resources</phase>
@@ -219,6 +236,23 @@
                      <skipCache>true</skipCache>
                   </configuration>
                </execution>
+               <execution>
+                  <id>download-characteristics-shapes-2-1-0</id>
+                  <phase>process-resources</phase>
+                  <goals>
+                     <goal>wget</goal>
+                  </goals>
+                  <configuration>
+                     <url>
+                        ${samm-revision}/src/main/resources/samm/characteristic/2.1.0/characteristic-shapes.ttl
+                     </url>
+                     <outputFileName>characteristic-shapes.ttl</outputFileName>
+                     <outputDirectory>${project.build.directory}/classes/samm/characteristic/2.1.0</outputDirectory>
+                     <overwrite>true</overwrite>
+                     <followRedirects>true</followRedirects>
+                     <skipCache>true</skipCache>
+                  </configuration>
+               </execution>
             </executions>
          </plugin>
 

core/esmf-aspect-meta-model-resolver/src/test/java/org/eclipse/esmf/aspectmodel/resolver/services/DataTypeTest.java

@@ -31,6 +31,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import org.eclipse.esmf.metamodel.datatypes.Curie;
+
 import lombok.Value;
 
 public class DataTypeTest {
@@ -84,6 +85,11 @@ public <T> void testConfigurableParserChecks( final TestConfiguration<T> testCon
    private static class TestConfiguration<T> {
       TypedRdfDatatype<T> type;
       Map<String, Predicate<T>> predicates;
+
+      @Override
+      public String toString() {
+         return type.toString();
+      }
    }
 
    static Stream<TestConfiguration<?>> getTestConfigurationsWithLexicalErrors() {
@@ -312,13 +318,13 @@ static Stream<TestConfiguration<?>> getValidTestConfigurations() {
 
       final Stream<TestConfiguration<Curie>> curieTypes =
             DataType.getAllSupportedTypes().stream()
-                    .filter( dataType -> dataType.getJavaClass() != null
-                          && dataType.getJavaClass().equals( Curie.class ) )
-                    .map( dataType -> (TypedRdfDatatype<Curie>) dataType )
-                    .map( curieType -> new TestConfiguration<>( curieType, Map.of(
-                          "xsd:string", v -> ((Curie) v).getValue().equals( "xsd:string" ),
-                          "unit:hectopascal", v -> ((Curie) v).getValue().equals( "unit:hectopascal" )
-                    ) ) );
+                  .filter( dataType -> dataType.getJavaClass() != null
+                        && dataType.getJavaClass().equals( Curie.class ) )
+                  .map( dataType -> (TypedRdfDatatype<Curie>) dataType )
+                  .map( curieType -> new TestConfiguration<>( curieType, Map.of(
+                        "xsd:string", v -> ((Curie) v).getValue().equals( "xsd:string" ),
+                        "unit:hectopascal", v -> ((Curie) v).getValue().equals( "unit:hectopascal" )
+                  ) ) );
 
       return Stream.concat( extendedXsdTypes, curieTypes );
    }

core/esmf-aspect-meta-model-resolver/src/test/resources/samm_2_1_0/invalid_aspect_meta_model_urn_element.ttl

@@ -0,0 +1,17 @@
+# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+
+@prefix samm: <urn:org.eclipse.esmf.samm:foo:1.0.0#> .
+
+<urn:samm:org.eclipse.esmf.samm:aspect-model:TestAspect:1.0.0> a samm:Aspect ;
+   samm:preferredName "Test Aspect"@en ;
+   samm:properties ( ) ;
+   samm:operations ( ) .

core/esmf-aspect-meta-model-resolver/src/test/resources/samm_2_1_0/invalid_aspect_urn.ttl

@@ -0,0 +1,17 @@
+# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+
+@prefix samm: <urn:samm:foo:something:else#> .
+
+<urn:samm:org.eclipse.esmf.samm:TestAspect:1.1.0> a samm:Aspect;
+	samm:preferredName "Test Aspect"@en;
+	samm:properties () ;
+	samm:operations () .

core/esmf-aspect-meta-model-resolver/src/test/resources/samm_2_1_0/invalid_aspect_urn_prefix.ttl

@@ -0,0 +1,17 @@
+# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+
+@prefix samm: <urn:foo:org.eclipse.esmf.samm:meta-model:2.0.0#> .
+
+<urn:samm:org.eclipse.esmf.samm:aspect-model:TestAspect:1.1.0> a samm:Aspect ;
+   samm:preferredName "Test Aspect"@en ;
+   samm:properties ( ) ;
+   samm:operations ( ) .

core/esmf-aspect-meta-model-resolver/src/test/resources/samm_2_1_0/invalid_multiple_aspects.ttl

@@ -0,0 +1,22 @@
+# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+
+@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
+
+<urn:samm:org.eclipse.esmf.samm:aspect-model:TestAspect:1.1.0> a samm:Aspect ;
+   samm:preferredName "Test Aspect"@en ;
+   samm:properties ( ) ;
+   samm:operations ( ) .
+
+<urn:samm:org.eclipse.esmf.samm:aspect-model:AnotherTestAspect:1.1.0> a samm:Aspect ;
+   samm:preferredName "Another Test Aspect"@en ;
+   samm:properties ( ) ;
+   samm:operations ( ) .

core/esmf-aspect-meta-model-resolver/src/test/resources/samm_2_1_0/valid_aspect.ttl

@@ -0,0 +1,18 @@
+# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+
+@prefix : <urn:samm:org.eclipse.esmf.test:1.0.0#> .
+@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
+
+:TestAspect a samm:Aspect ;
+   samm:preferredName "Test Aspect"@en ;
+   samm:properties ( ) ;
+   samm:operations ( ) .