Merge branch 'main' into 187-fix-link-in-maven-plugin-docs

Author: atextor

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

@@ -20,7 +20,7 @@ default boolean isAbstractEntity() {
     */
    default List<Property> getAllProperties() {
       if ( getExtends().isPresent() ) {
-         return Stream.of( getProperties(), getExtends().get().getProperties() ).flatMap( Collection::stream ).collect( Collectors.toList() );
+         return Stream.of( getProperties(), getExtends().get().getAllProperties() ).flatMap( Collection::stream ).collect( Collectors.toList() );
       }
       return List.copyOf( getProperties() );
    }

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

@@ -15,7 +15,7 @@
 
 import java.util.Map;
 
-public interface EntityInstance extends Base, IsDescribed, Value, Comparable<EntityInstance> {
+public interface EntityInstance extends Base, IsDescribed, Value {
    Map<Property, Value> getAssertions();
 
    default Entity getEntityType() {

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

@@ -12,6 +12,7 @@
  */
 package io.openmanufacturing.sds.metamodel.impl;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -27,7 +28,7 @@
 /**
  * The base implemenation of all model elements.
  */
-public abstract class BaseImpl implements Base, IsDescribed {
+public abstract class BaseImpl implements Base, IsDescribed, Comparable<BaseImpl> {
    private final KnownVersion metaModelVersion;
    private final Optional<AspectModelUrn> urn;
    private final String name;
@@ -121,4 +122,15 @@ public boolean equals( final Object o ) {
    public int hashCode() {
       return Objects.hash( urn, name );
    }
+
+   @Override
+   public int compareTo( BaseImpl o ) {
+      if ( this.urn.isPresent() && o.urn.isPresent() )
+         return this.urn.get().compareTo( o.urn.get() );
+      return Comparator
+            .comparing( BaseImpl::getMetaModelVersion )
+            .thenComparing( BaseImpl::getName )
+            .thenComparing( BaseImpl::hasSyntheticName )
+            .compare( this, o );
+   }
 }

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

@@ -14,6 +14,7 @@
 package io.openmanufacturing.sds.metamodel.impl;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -52,7 +53,7 @@ private DefaultAbstractEntity( final MetaModelBaseAttributes metaModelBaseAttrib
     */
    @Override
    public List<ComplexType> getExtendingElements() {
-      return extendingElements.stream().map( instances::get ).collect( Collectors.toList() );
+      return extendingElements.stream().map( instances::get ).filter( Objects::nonNull ).collect( Collectors.toList() );
    }
 
    /**

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

@@ -44,11 +44,6 @@ public Map<Property, Value> getAssertions() {
       return assertions;
    }
 
-   @Override
-   public int compareTo( final EntityInstance other ) {
-      return getName().compareTo( other.getName() );
-   }
-
    @Override
    public <T, C> T accept( final AspectVisitor<T, C> visitor, final C context ) {
       return visitor.visitEntityInstance( this, context );

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 );
    }
 }