Add support for samm-e:Quantity

Author: atextor

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/vocabulary/SAMME.java

@@ -15,6 +15,7 @@
 
 import java.util.stream.Stream;
 
+import org.eclipse.esmf.metamodel.QuantityKind;
 import org.eclipse.esmf.samm.KnownVersion;
 
 import org.apache.jena.rdf.model.Property;
@@ -57,6 +58,11 @@ public Resource FileResource() {
       return resource( "FileResource" );
    }
 
+   @SuppressWarnings( "checkstyle:MethodName" )
+   public Resource Quantity() {
+      return resource( "Quantity" );
+   }
+
    public Property resource() {
       return property( "resource" );
    }
@@ -88,7 +94,12 @@ public Property z() {
       return property( "z" );
    }
 
+   @SuppressWarnings( "checkstyle:MethodName" )
+   public Property unit() {
+      return property( "unit" );
+   }
+
    public Stream<Resource> allEntities() {
-      return Stream.of( TimeSeriesEntity(), Point3d() );
+      return Stream.of( TimeSeriesEntity(), Point3d(), FileResource(), Quantity() );
    }
 }

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/resolver/modelfile/MetaModelFile.java

@@ -51,6 +51,7 @@ public enum MetaModelFile implements AspectModelFile {
    FILE_RESOURCE( "entity", "FileResource.ttl", SammNs.SAMME, MetaModelFileType.ELEMENT_DEFINITION ),
    POINT_3D( "entity", "Point3d.ttl", SammNs.SAMME, MetaModelFileType.ELEMENT_DEFINITION ),
    TIME_SERIES_ENTITY( "entity", "TimeSeriesEntity.ttl", SammNs.SAMME, MetaModelFileType.ELEMENT_DEFINITION ),
+   QUANTITY( "entity", "Quantity.ttl", SammNs.SAMME, MetaModelFileType.ELEMENT_DEFINITION ),
    CHARACTERISTIC_INSTANCES( "characteristic", "characteristic-instances.ttl", SammNs.SAMMC,
          MetaModelFileType.ELEMENT_DEFINITION ),
 

core/esmf-test-aspect-models/src/main/java/org/eclipse/esmf/test/TestAspect.java

@@ -47,7 +47,9 @@ public enum TestAspect implements TestModel {
    ASPECT_WITH_COMPLEX_ENTITY_COLLECTION_ENUM,
    ASPECT_WITH_COMPLEX_ENUM,
    ASPECT_WITH_COMPLEX_ENUM_INCL_OPTIONAL,
+   ASPECT_WITH_COMPLEX_SET,
    ASPECT_WITH_CONSTRAINED_COLLECTION,
+   ASPECT_WITH_CONSTRAINED_SET,
    ASPECT_WITH_CONSTRAINT,
    ASPECT_WITH_CONSTRAINTS,
    ASPECT_WITH_CONSTRAINT_WITHOUT_SEE_ATTRIBUTE,
@@ -116,6 +118,7 @@ public enum TestAspect implements TestModel {
    ASPECT_WITH_LIST_WITH_LENGTH_CONSTRAINT,
    ASPECT_WITH_MEASUREMENT,
    ASPECT_WITH_MEASUREMENT_WITH_UNIT,
+   ASPECT_WITH_MULTILANGUAGE_EXAMPLE_VALUE,
    ASPECT_WITH_MULTIPLE_COLLECTIONS_OF_SIMPLE_TYPE,
    ASPECT_WITH_MULTIPLE_ENTITIES,
    ASPECT_WITH_MULTIPLE_ENTITIES_AND_EITHER,
@@ -152,6 +155,7 @@ public enum TestAspect implements TestModel {
    ASPECT_WITH_QUANTIFIABLE_AND_UNIT,
    ASPECT_WITH_QUANTIFIABLE_WITHOUT_UNIT,
    ASPECT_WITH_QUANTIFIABLE_WITH_UNIT,
+   ASPECT_WITH_QUANTITY,
    ASPECT_WITH_RANGE_CONSTRAINT,
    ASPECT_WITH_RANGE_CONSTRAINT_INCL_BOUND_DEFINITION_PROPERTIES,
    ASPECT_WITH_RANGE_CONSTRAINT_ON_CONSTRAINED_NUMERIC_TYPE,
@@ -193,14 +197,8 @@ public enum TestAspect implements TestModel {
    ENTITY_INSTANCE_TEST2,
    ENTITY_INSTANCE_TEST3,
    ENTITY_INSTANCE_TEST4,
-
-   MODEL_WITH_BROKEN_CYCLES,
-
-   ASPECT_WITH_CONSTRAINED_SET,
-   ASPECT_WITH_MULTILANGUAGE_EXAMPLE_VALUE,
-   ASPECT_WITH_COMPLEX_SET,
-
-   MODEL_WITH_BLANK_AND_ADDITIONAL_NODES;
+   MODEL_WITH_BLANK_AND_ADDITIONAL_NODES,
+   MODEL_WITH_BROKEN_CYCLES;
 
    @Override
    public String getName() {

core/esmf-test-aspect-models/src/main/resources/valid/org.eclipse.esmf.test/1.0.0/AspectWithQuantity.ttl

@@ -0,0 +1,43 @@
+# Copyright (c) 2025 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.2.0#> .
+@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
+@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.2.0#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.0#> .
+
+:AspectWithQuantity a samm:Aspect ;
+   samm:preferredName "Test Aspect"@en ;
+   samm:description "This is a test description"@en ;
+   samm:see <http://example.com/> ;
+   samm:properties ( :testProperty ) ;
+   samm:operations ( ) .
+
+:testProperty a samm:Property ;
+   samm:preferredName "Test Property"@en ;
+   samm:description "This is a test property."@en ;
+   samm:see <http://example.com/> ;
+   samm:see <http://example.com/me> ;
+   samm:characteristic [
+     a samm-c:SingleEntity ;
+     samm:dataType :TestQuantity ;
+   ] .
+
+:TestQuantity a samm:Entity ;
+  samm:extends samm-e:Quantity ;
+  samm:properties (
+    [ samm:extends samm-e:value ; samm:characteristic :QuantityValueCharacteristic ]
+  ) .
+
+:QuantityValueCharacteristic a samm:Characteristic ;
+  samm:dataType xsd:integer .