Merge pull request #721 from bci-oss/720-initial-support-for-samm-2.2.0

Add initial support for SAMM 2.2.0

Author: atextor

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/RdfUtil.java

@@ -118,6 +118,7 @@ public static void cleanPrefixes( final Model model ) {
             .map( Statement::getSubject )
             .filter( Resource::isURIResource )
             .map( Resource::getURI )
+            .map( uri -> uri.endsWith( "#" ) ? uri.replace( "#", "" ) : uri )
             .map( AspectModelUrn::fromUrn )
             .findAny()
             .ifPresent( urn -> model.setNsPrefix( "", urn.getUrnPrefix() ) );

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/ModelElementFactory.java

@@ -257,7 +257,9 @@ private static Optional<AspectModelUrn> getUrn( final Resource modelElement ) {
          }
          return Optional.empty();
       }
-      return Optional.of( AspectModelUrn.fromUrn( modelElement.getURI() ) );
+      return modelElement.getURI().endsWith( "#" )
+            ? Optional.of( AspectModelUrn.fromUrn( modelElement.getURI().replace( "#", "" ) ) )
+            : Optional.of( AspectModelUrn.fromUrn( modelElement.getURI() ) );
    }
 
    /**

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/serializer/PrettyPrinter.java

@@ -481,7 +481,9 @@ public Object visitLiteral( final Node_Literal it, final String lex, final Strin
       public Object visitURI( final Node_URI it, final String uri ) {
          final String suri = model.shortForm( uri );
          if ( uri.equals( suri ) ) {
-            return "<" + uri + ">";
+            return uri.startsWith( "urn:samm:" ) && !uri.contains( "#" )
+                  ? "<" + uri + "#>"
+                  : "<" + uri + ">";
          } else {
             return suri;
          }

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/versionupdate/MetaModelVersionMigrator.java

@@ -45,6 +45,7 @@ private MetaModelVersionMigrator() {
    }
 
    private final List<Migrator> migrators = ImmutableList.<Migrator> builder()
+         .add( new SammMetaModelVersionUriRewriter( KnownVersion.SAMM_2_1_0, KnownVersion.SAMM_2_2_0 ) )
          .add( new SammMetaModelVersionUriRewriter( KnownVersion.SAMM_2_0_0, KnownVersion.SAMM_2_1_0 ) )
          .add( new SammMetaModelVersionUriRewriter( KnownVersion.SAMM_1_0_0, KnownVersion.SAMM_2_0_0 ) )
          .add( new SammRemoveSammNameMigrator( KnownVersion.SAMM_1_0_0, KnownVersion.SAMM_2_0_0 ) )

core/esmf-aspect-meta-model-java/src/test-shared/java/org/eclipse/esmf/test/AssertTest.java

@@ -13,7 +13,7 @@
 
 package org.eclipse.esmf.test;
 
-import static org.eclipse.esmf.metamodel.DataTypes.xsd;
+import static org.eclipse.esmf.metamodel.DataTypes.*;
 import static org.eclipse.esmf.metamodel.Elements.*;
 import static org.eclipse.esmf.metamodel.builder.SammBuilder.*;
 import static org.eclipse.esmf.test.shared.AspectModelAsserts.assertThat;
@@ -32,6 +32,7 @@
 import org.eclipse.esmf.metamodel.Property;
 import org.eclipse.esmf.metamodel.constraint.RangeConstraint;
 import org.eclipse.esmf.metamodel.vocabulary.SammNs;
+import org.eclipse.esmf.samm.KnownVersion;
 
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.junit.jupiter.api.Test;
@@ -138,7 +139,7 @@ void testAssertionsWithBuilder() {
             .characteristic()
             .hasDataType( xsd.string )
             .sourceFile()
-            .hasLocation( "urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0" );
+            .hasLocation( "urn:samm:org.eclipse.esmf.samm:characteristic:" + KnownVersion.getLatest().toVersionString() );
 
       final RangeConstraint rangeConstraint = rangeConstraint()
             .minValue( value( 5, xsd.integer ) )

core/esmf-aspect-meta-model-java/src/test/resources/samm_2_2_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-java/src/test/resources/samm_2_2_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-java/src/test/resources/samm_2_2_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-java/src/test/resources/samm_2_2_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.2.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-java/src/test/resources/samm_2_2_0/org.eclipse.esmf.test/1.0.0/AnotherTest.ttl

@@ -0,0 +1,20 @@
+# 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.2.0#> .
+@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
+@prefix : <urn:samm:org.eclipse.esmf.test:1.0.0#> .
+
+:AnotherTest a samm:Aspect ;
+   samm:preferredName "Another Test"@en ;
+   samm:properties ( :foo ) ;
+   samm:operations ( ) .
+