Merge branch 'main' into 2.1.x

Author: atextor

core/sds-aspect-meta-model-interface/pom.xml

@@ -40,7 +40,10 @@
             <groupId>io.openmanufacturing</groupId>
             <artifactId>sds-aspect-model-urn</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>io.openmanufacturing</groupId>
+            <artifactId>sds-aspect-meta-model</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>

core/sds-aspect-meta-model-interface/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/AspectMetaModelResourceResolver.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
  *
  * See the AUTHORS file(s) distributed with this work for additional
- * information regarding authorship. 
+ * 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
@@ -19,13 +19,12 @@
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.Statement;
 
+import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
 import io.openmanufacturing.sds.aspectmodel.MissingMetaModelVersionException;
 import io.openmanufacturing.sds.aspectmodel.MultipleMetaModelVersionsException;
 import io.openmanufacturing.sds.aspectmodel.UnsupportedVersionException;
 import io.openmanufacturing.sds.aspectmodel.VersionNumber;
 import io.openmanufacturing.sds.aspectmodel.resolver.services.VersionedModel;
-import io.openmanufacturing.sds.aspectmodel.urn.AspectModelUrn;
-import io.openmanufacturing.sds.aspectmodel.urn.UrnSyntaxException;
 import io.vavr.control.Try;
 
 /**
@@ -43,18 +42,8 @@ public interface AspectMetaModelResourceResolver {
     */
    Try<VersionedModel> mergeMetaModelIntoRawModel( final Model rawModel, final VersionNumber version );
 
-   /**
-    * Parses an Aspect (meta) model URN into an {@link AspectModelUrn}
-    *
-    * @param uri The Aspect (meta) model URN
-    * @return The {@link AspectModelUrn} if parsing succeeds, an {@link UrnSyntaxException} otherwise
-    */
-   default Try<AspectModelUrn> getAspectModelUrn( final String uri ) {
-      try {
-         return Try.success( AspectModelUrn.fromUrn( uri ) );
-      } catch ( final UrnSyntaxException exception ) {
-         return Try.failure( exception );
-      }
+   default Try<VersionedModel> mergeMetaModelIntoRawModel( final Model rawModel, final KnownVersion version ) {
+      return mergeMetaModelIntoRawModel( rawModel, VersionNumber.parse( version.toVersionString() ) );
    }
 
    /**

core/sds-aspect-meta-model-interface/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/services/VersionedModel.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
  *
  * See the AUTHORS file(s) distributed with this work for additional
- * information regarding authorship. 
+ * 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
@@ -15,6 +15,7 @@
 
 import org.apache.jena.rdf.model.Model;
 
+import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
 import io.openmanufacturing.sds.aspectmodel.VersionNumber;
 
 /**
@@ -42,6 +43,10 @@ public VersionedModel( final Model model, final VersionNumber version, final Mod
       this.rawModel = rawModel;
    }
 
+   public VersionedModel( final Model model, final KnownVersion version, final Model rawModel ) {
+      this( model, VersionNumber.parse( version.toVersionString() ), rawModel );
+   }
+
    public Model getModel() {
       return model;
    }

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/AspectContext.java

@@ -0,0 +1,25 @@
+/*
+ * 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
+ */
+
+package io.openmanufacturing.sds.metamodel;
+
+import io.openmanufacturing.sds.aspectmodel.resolver.services.VersionedModel;
+
+/**
+ * The AspectContext wraps a loaded/resolved Aspect Model and a single Aspect that was instantiated from this model, i.e.,
+ * which must be defined in the RDF model.
+ * @param rdfModel the RDF model
+ * @param aspect the Aspect
+ */
+public record AspectContext(VersionedModel rdfModel, Aspect aspect) {
+}

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/loader/AspectModelLoader.java

@@ -13,11 +13,13 @@
 
 package io.openmanufacturing.sds.metamodel.loader;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.apache.jena.rdf.model.Model;
@@ -41,6 +43,7 @@
 import io.openmanufacturing.sds.aspectmodel.versionupdate.MigratorService;
 import io.openmanufacturing.sds.aspectmodel.vocabulary.BAMM;
 import io.openmanufacturing.sds.metamodel.Aspect;
+import io.openmanufacturing.sds.metamodel.AspectContext;
 import io.openmanufacturing.sds.metamodel.ModelElement;
 import io.openmanufacturing.sds.metamodel.ModelNamespace;
 import io.openmanufacturing.sds.metamodel.NamedElement;
@@ -79,7 +82,7 @@ private AspectModelLoader() {
     *
     * @see AspectModelResolver
     */
-   @Deprecated
+   @Deprecated( forRemoval = true )
    public static Try<Aspect> fromVersionedModel( final VersionedModel versionedModel ) {
       return getSingleAspect( versionedModel );
    }
@@ -103,12 +106,12 @@ private static void validateNamespaceOfCustomUnits( final BAMM bamm, final Model
     * Creates an {@link Aspect} instance from a Turtle input model.
     *
     * @param versionedModel The RDF model representation of the Aspect model
-    * @return The Aspect *
+    * @return The Aspect
     * @deprecated use {@link #getSingleAspectUnchecked(VersionedModel)} instead to retain the same semantics, but better use
     * {@link #getElementsUnchecked(VersionedModel)} instead to also properly handle models that contain not exactly one Aspect
     * @see #fromVersionedModel(VersionedModel)
     */
-   @Deprecated
+   @Deprecated( forRemoval = true )
    public static Aspect fromVersionedModelUnchecked( final VersionedModel versionedModel ) {
       return fromVersionedModel( versionedModel ).getOrElseThrow( cause -> {
          LOG.error( "Could not load Aspect", cause );
@@ -228,12 +231,7 @@ public static List<Aspect> getAspectsUnchecked( final VersionedModel versionedMo
     * @return the single Aspect contained in the model
     */
    public static Try<Aspect> getSingleAspect( final VersionedModel versionedModel ) {
-      return getAspects( versionedModel ).flatMap( aspects -> {
-         if ( aspects.size() != 1 ) {
-            return Try.failure( new InvalidRootElementCountException( "Aspect model does not contain exactly one Aspect" ) );
-         }
-         return Try.success( aspects.get( 0 ) );
-      } );
+      return getSingleAspect( versionedModel, aspect -> true );
    }
 
    /**
@@ -252,4 +250,40 @@ public static Aspect getSingleAspectUnchecked( final VersionedModel versionedMod
          throw new AspectLoadingException( cause );
       } );
    }
+
+   /**
+    * Similar to {@link #getSingleAspect(VersionedModel)}, except that a predicate can be provided to select which of potentially
+    * multiple aspects should be selected
+    * @param versionedModel the RDF model reprensentation of the Aspect model
+    * @param selector the predicate to select an Aspect
+    * @return the selected Aspect, or a failure if 0 or more than 1 matching Aspects were found
+    */
+   public static Try<Aspect> getSingleAspect( final VersionedModel versionedModel, final Predicate<Aspect> selector ) {
+      return getAspects( versionedModel ).flatMap( allAspects -> {
+         final List<Aspect> aspects = allAspects.stream().filter( selector::test ).toList();
+         return switch ( aspects.size() ) {
+            case 1 -> Try.success( aspects.iterator().next() );
+            case 0 -> Try.failure( new InvalidRootElementCountException( "No Aspects were found in the model" ) );
+            default -> Try.failure( new AspectLoadingException( "Multiple Aspects were found in the resolved model" ) );
+         };
+      } );
+   }
+
+   /**
+    * Convenience method to create an {@link AspectContext} directly from a model file. This method makes the following assumptions:
+    * <ul>
+    *    <li>The model file is located in a directory structure as required by the {@link io.openmanufacturing.sds.aspectmodel.resolver.FileSystemStrategy}</li>
+    *    <li>The closure of the loaded model contains exactly one Aspect</li>
+    *    <li>The Aspect has the same name as the file's basename</li>
+    * </ul>
+    * The method is intended for use in tests and comparable use cases, not as a general replacement for loading Aspect Models, since it does not
+    * handle model files with less or more than one Aspect.
+    * @param input the model file
+    * @return the loaded Aspect Context
+    */
+   public static Try<AspectContext> getAspectContext( final File input ) {
+      return AspectModelResolver.loadAndResolveModel( input ).flatMap( versionedModel ->
+            getSingleAspect( versionedModel, aspect -> aspect.getName().equals( input.getName() ) )
+                  .map( aspect -> new AspectContext( versionedModel, aspect ) ) );
+   }
 }

core/sds-aspect-meta-model-java/src/main/java/io/openmanufacturing/sds/metamodel/loader/MetaModelBaseAttributes.java

@@ -203,15 +203,15 @@ private static String getSyntheticName( final Resource modelElement, final Model
          throw new AspectLoadingException( "At least one anonymous node in the model does not have a parent with a regular name." );
       }
       final String parentModelElementUri = namedParent.getURI();
-      final String parentModelElementName = metaModelResourceResolver.getAspectModelUrn( parentModelElementUri )
+      final String parentModelElementName = AspectModelUrn.from( parentModelElementUri )
             .toJavaOptional()
             .map( AspectModelUrn::getName )
             .map( StringUtils::capitalize )
             .orElse( "" );
 
       final Resource modelElementType = getModelElementType( modelElement, bamm );
       final String modelElementTypeUri = modelElementType.getURI();
-      final String modelElementTypeName = metaModelResourceResolver.getAspectModelUrn( modelElementTypeUri )
+      final String modelElementTypeName = AspectModelUrn.from( modelElementTypeUri )
             .toJavaOptional()
             .map( AspectModelUrn::getName )
             .orElse( "" );

core/sds-aspect-meta-model-resolver/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/services/ClassPathMetaModelUrnResolver.java

@@ -35,6 +35,8 @@ public Set<URL> apply( final KnownVersion metaModelVersion ) {
             MetaModelUrls.url( "characteristic", metaModelVersion, "characteristic-definitions.ttl" ),
             MetaModelUrls.url( "characteristic", metaModelVersion, "characteristic-instances.ttl" ),
             MetaModelUrls.url( "entity", metaModelVersion, "TimeSeriesEntity.ttl" ),
+            MetaModelUrls.url( "entity", metaModelVersion, "FileResource.ttl" ),
+            MetaModelUrls.url( "entity", metaModelVersion, "Point3d.ttl" ),
             MetaModelUrls.url( "unit", metaModelVersion, "units.ttl" ),
             Optional.<URL> empty()
       ).filter( Optional::isPresent ).map( Optional::get ).collect( Collectors.toSet() );

core/sds-aspect-meta-model-resolver/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/services/SdsAspectMetaModelResourceResolver.java

@@ -220,7 +220,7 @@ public Set<VersionNumber> getUsedMetaModelVersions( final Model model ) {
             .map( RDFNode::asResource )
             .map( Resource::getURI )
             .filter( uri -> uri.startsWith( bammUrnStart ) )
-            .flatMap( uri -> getAspectModelUrn( uri ).toJavaStream() )
+            .flatMap( uri -> AspectModelUrn.from( uri ).toJavaStream() )
             .filter( urn -> (urn.getElementType().equals( ElementType.META_MODEL ) || urn.getElementType().equals( ElementType.CHARACTERISTIC )) )
             .map( AspectModelUrn::getVersion )
             .map( VersionNumber::parse )

core/sds-aspect-meta-model-resolver/src/test/java/io/openmanufacturing/sds/aspectmodel/resolver/services/ClassPathMetaModelUrnResolverTest.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
  *
  * See the AUTHORS file(s) distributed with this work for additional
- * information regarding authorship. 
+ * 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
@@ -18,16 +18,27 @@
 import java.net.URL;
 import java.util.Optional;
 
-import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
-
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
+import io.openmanufacturing.sds.test.MetaModelVersions;
 
-public class ClassPathMetaModelUrnResolverTest {
+public class ClassPathMetaModelUrnResolverTest extends MetaModelVersions {
    @Test
    public void testUrlConstruction() {
       for ( final KnownVersion version : KnownVersion.getVersions() ) {
          final Optional<URL> url = MetaModelUrls.url( "meta-model", version, "aspect-meta-model-definitions.ttl" );
          assertThat( url ).isNotEmpty();
       }
    }
+
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testContainsEntityDefinitions( final KnownVersion metaModelVersion ) {
+      assertThat( MetaModelUrls.url( "entity", metaModelVersion, "Point3d.ttl" ) ).isNotEmpty();
+      assertThat( MetaModelUrls.url( "entity", metaModelVersion, "FileResource.ttl" ) ).isNotEmpty();
+      assertThat( MetaModelUrls.url( "entity", metaModelVersion, "TimeSeriesEntity.ttl" ) ).isNotEmpty();
+   }
 }

core/sds-aspect-meta-model-resolver/src/test/java/io/openmanufacturing/sds/aspectmodel/resolver/services/SdsAspectMetaModelResourceResolverTest.java

@@ -27,8 +27,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
-import io.openmanufacturing.sds.aspectmodel.VersionNumber;
 import io.openmanufacturing.sds.aspectmodel.MissingMetaModelVersionException;
+import io.openmanufacturing.sds.aspectmodel.VersionNumber;
 import io.openmanufacturing.sds.aspectmodel.urn.AspectModelUrn;
 import io.openmanufacturing.sds.test.MetaModelVersions;
 import io.vavr.control.Try;
@@ -82,20 +82,18 @@ public void testGetBammVersionInvalidMetaModelUrnElementExpectFailure( final Kno
    @ParameterizedTest
    @MethodSource( "allVersions" )
    public void testGetAspectModelUrnExpectSuccess( final KnownVersion metaModelVersion ) {
-      final Try<AspectModelUrn> aspectModelUrn = aspectMetaModelResourceResolver.getAspectModelUrn(
+      final Try<AspectModelUrn> aspectModelUrn = AspectModelUrn.from(
             "urn:bamm:io.openmanufacturing:meta-model:" + metaModelVersion.toVersionString() + "#Aspect" );
       assertThat( aspectModelUrn ).isSuccess();
       org.assertj.core.api.Assertions.assertThat( aspectModelUrn.get().getUrn().toString() )
-                                     .isEqualTo( "urn:bamm:io.openmanufacturing:meta-model:" + metaModelVersion
-                                           .toVersionString() + "#Aspect" );
+            .isEqualTo( "urn:bamm:io.openmanufacturing:meta-model:" + metaModelVersion
+                  .toVersionString() + "#Aspect" );
    }
 
    @ParameterizedTest
    @MethodSource( "allVersions" )
    public void testGetAspectModelUrnInvalidUrnExpectFailure( final KnownVersion metaModelVersion ) {
-      final Try<AspectModelUrn> aspectModelUrn = aspectMetaModelResourceResolver
-            .getAspectModelUrn(
-                  "urn:foo:io.openmanufacturing:meta-model:" + metaModelVersion.toVersionString() );
+      final Try<AspectModelUrn> aspectModelUrn = AspectModelUrn.from( "urn:foo:io.openmanufacturing:meta-model:" + metaModelVersion.toVersionString() );
       assertThat( aspectModelUrn ).isFailure();
    }
 
@@ -120,7 +118,7 @@ public void testLoadMetaModelExpectSuccess( final KnownVersion metaModelVersion
       final Model model = aspectMetaModelResourceResolver.loadMetaModel( metaModelVersion ).get();
 
       org.assertj.core.api.Assertions.assertThat( model.contains( ResourceFactory.createResource(
-            "urn:bamm:io.openmanufacturing:meta-model:" + metaModelVersion.toVersionString() + "#value" ),
+                  "urn:bamm:io.openmanufacturing:meta-model:" + metaModelVersion.toVersionString() + "#value" ),
             RDF.type, (RDFNode) null ) ).isTrue();
    }
 }