Merge branch 'main' into 2.0.x

Author: atextor

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

@@ -77,7 +77,7 @@ private static Try<Aspect> load( final VersionedModel versionedModel ) {
          final Aspect aspect = modelElementFactory.create( Aspect.class, iterator.nextStatement().getSubject() );
          return Try.success( aspect );
       } catch ( final RuntimeException exception ) {
-         return Try.failure( new InvalidModelException( "Could not load Aspect model, please make sure the model is valid.", exception ) );
+         return Try.failure( new InvalidModelException( "Could not load Aspect model, please make sure the model is valid", exception ) );
       }
    }
 

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

@@ -33,7 +33,7 @@ public EventInstantiator( final ModelElementFactory modelElementFactory ) {
    @Override
    public Event apply( final Resource event ) {
       final MetaModelBaseAttributes metaModelBaseAttributes = buildBaseAttributes( event );
-      final List<Property> events = getPropertiesModels( event, bamm.properties() );
+      final List<Property> events = getPropertiesModels( event, bamm.parameters() );
       return new DefaultEvent( metaModelBaseAttributes, events );
    }
 }

core/sds-aspect-meta-model-java/src/test/java/io/openmanufacturing/sds/metamodel/loader/ConstraintInstantiatorTest.java

@@ -49,7 +49,7 @@ public void testLanguageConstraintInstantiationExpectSuccess( final KnownVersion
             "This is a test language constraint.",
             "http://example.com/omp" );
 
-      assertThat( languageConstraint.getLanguageCode() ).isEqualTo( Locale.GERMANY );
+      assertThat( languageConstraint.getLanguageCode() ).isEqualTo( Locale.forLanguageTag( "de" ) );
    }
 
    @ParameterizedTest

core/sds-aspect-meta-model-resolver/src/main/java/io/openmanufacturing/sds/aspectmodel/vocabulary/BAMM.java

@@ -139,6 +139,10 @@ public Property properties() {
       return property( "properties" );
    }
 
+   public Property parameters() {
+      return property( "parameters" );
+   }
+
    public Property operations() {
       return property( "operations" );
    }

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/AbstractConstraint2BoxModelTest.java

@@ -29,14 +29,14 @@ public abstract class AbstractConstraint2BoxModelTest extends MetaModelVersions
 
    protected String boxSelectorStatement( final KnownVersion metaModelVersion, final String constraintIdentifier ) {
       if ( metaModelVersion.isNewerThan( KnownVersion.BAMM_1_0_0 ) ) {
-         return String.format( ":%s a :Box", constraintIdentifier );
+         return String.format( "%s a :Box", constraintIdentifier.equals( "*" ) ? "*" : ":" + constraintIdentifier );
       }
       return ":TestConstraintConstraint a :Box";
    }
 
    protected String entriesSelectorStatement( final KnownVersion metaModelVersion, final String constraintIdentifier ) {
       if ( metaModelVersion.isNewerThan( KnownVersion.BAMM_1_0_0 ) ) {
-         return String.format( ":%s :entries *", constraintIdentifier );
+         return String.format( "%s :entries *", constraintIdentifier.equals( "*" ) ? "*" : ":" + constraintIdentifier );
       }
       return ":TestConstraintConstraint :entries *";
    }

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/Aspect2BoxModelTest.java

@@ -129,10 +129,10 @@ public void testAspectWithOptionalPropertyWithPayloadName( final KnownVersion me
          qexec.execConstruct( queryResult );
       }
 
-      assertThat( queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyAspect_To_testPropertyProperty a :Edge" ) )
+      assertThat( queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyWithPayloadNameAspect_To_testPropertyProperty a :Edge" ) )
             .toList() ).hasSize( 1 );
       assertThat(
-            queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyAspect_To_testPropertyProperty :title property (optional) (test)" ) )
+            queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyWithPayloadNameAspect_To_testPropertyProperty :title property (optional) (test)" ) )
                   .toList() ).hasSize( 1 );
    }
 }

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/Constraint2BoxModelTest.java

@@ -50,7 +50,7 @@ public void testOnlyUsedConstraintsAreProcessedExpectSuccess( final KnownVersion
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testSeeAttributeIsPresentExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "LengthConstraint294de3c";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_CONSTRAINT_WITH_SEE_ATTRIBUTE, metaModelVersion );
       context.executeAttributeIsPresentTest( sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ),
             entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -60,7 +60,7 @@ public void testSeeAttributeIsPresentExpectSuccess( final KnownVersion metaModel
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testSeeAttributesArePresentExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "LengthConstraintc82ebce";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_CONSTRAINT_WITH_MULTIPLE_SEE_ATTRIBUTES, metaModelVersion );
       context.executeAttributeIsPresentTest(
             sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ), entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -73,7 +73,7 @@ sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifie
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testSeeAttributeIsNotPresentExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "LengthConstraint125edc1";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_CONSTRAINT_WITHOUT_SEE_ATTRIBUTE, metaModelVersion );
       context.executeAttributeIsNotPresentTest( sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ),
             entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -83,7 +83,7 @@ public void testSeeAttributeIsNotPresentExpectSuccess( final KnownVersion metaMo
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testRegularExpressionConstraintExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "RegularExpressionConstraint44300e9";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_NUMERIC_REGULAR_EXPRESSION_CONSTRAINT, metaModelVersion );
       context.executeAttributeIsPresentTest(
             sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ), entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -95,7 +95,7 @@ sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifie
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testFixedPointConstraintExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "FixedPointConstraintd050140";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_FIXED_POINT_CONSTRAINT, metaModelVersion );
       context.executeAttributeIsPresentTest(
             sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ), entriesSelectorStatement( metaModelVersion, constraintIdentifier ),

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/TestContext.java

@@ -116,7 +116,7 @@ public void executeAttributeIsPresentTest( final String sparqlQueryFileName,
          qexec.execConstruct( queryResult );
       }
 
-      assertThat( queryResult.listStatements( selector( boxSelectorStatement ) ).toList() ).hasSize( 1 );
+      assertThat( queryResult.listStatements( selector( boxSelectorStatement ) ).toList() ).hasSizeGreaterThanOrEqualTo( 1 );
 
       final List<RDFNode> entries = queryResult
             .listStatements( selector( entriesSelectorStatement ) )

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/docu/AspectModelDocumentationGeneratorTest.java

@@ -121,7 +121,7 @@ public void testEncodedTextIsNotDecoded( final KnownVersion metaModelVersion ) t
    @MethodSource( "allVersions" )
    public void testAspectModelUrnIsDisplayed( final KnownVersion metaModelVersion ) throws IOException {
       assertThat( generateHtmlDocumentation( TestAspect.ASPECT_WITH_HTML_TAGS, metaModelVersion ) )
-            .contains( "urn:bamm:io.openmanufacturing.test:1.0.0#AspectWithHTMLTags" );
+            .contains( "urn:bamm:io.openmanufacturing.test:1.0.0#AspectWithHtmlTags" );
    }
 
    @ParameterizedTest