Merge pull request #155 from bci-oss/90-remove-name-attribute

Remove bamm:name attribute

Author: atextor

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

@@ -16,7 +16,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Optional;
 
 import io.openmanufacturing.sds.aspectmodel.urn.AspectModelUrn;

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

@@ -152,7 +152,8 @@ private Statement getDataType( final Resource resource ) {
 
    protected Optional<Unit> findOrCreateUnit( final Resource unitResource ) {
       if ( unit.getNamespace().equals( unitResource.getNameSpace() ) ) {
-         return Units.fromName( unitResource.getProperty( bamm.name() ).getString(), metaModelVersion );
+         final AspectModelUrn unitUrn = AspectModelUrn.fromUrn( unitResource.getURI() );
+         return Units.fromName( unitUrn.getName(), metaModelVersion );
       }
 
       return Optional.of( new DefaultUnit(

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

@@ -21,12 +21,11 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.vocabulary.RDF;
 
 import com.google.common.collect.ImmutableList;
@@ -159,32 +158,31 @@ public static MetaModelBaseAttributes fromMetaModelElement( final KnownVersion m
       final Set<LangString> preferredNames = getLanguages( metaModelElement, bamm.preferredName(), model );
       final Set<LangString> descriptions = getLanguages( metaModelElement, bamm.description(), model );
       final List<String> seeValues = getSeeValues( metaModelElement, model, bamm );
-      final Optional<String> nameGivenInModel = Optional
-            .ofNullable( model.getProperty( metaModelElement, bamm.name() ) )
-            .map( Statement::getString );
-      final Optional<String> nameFromUrn = urn.map( AspectModelUrn::getName );
-      final Optional<String> actualName = Stream.of( nameGivenInModel, nameFromUrn )
-            .filter( Optional::isPresent )
-            .map( Optional::get )
-            .findFirst();
-      final String name = actualName.orElseGet( () -> getSyntheticName( metaModelElement, model ) );
+      final Optional<String> actualName = urn.map( AspectModelUrn::getName );
+      final String name = actualName.orElseGet( () -> getSyntheticName( metaModelElement, model, bamm ) );
       final boolean isSyntheticName = actualName.isEmpty();
-      return new MetaModelBaseAttributes( metaModelVersion, urn.orElse( null ), name, preferredNames, descriptions,
-            seeValues, isSyntheticName );
+      return new MetaModelBaseAttributes( metaModelVersion, urn.orElse( null ), name, preferredNames, descriptions, seeValues, isSyntheticName );
    }
 
    /**
-    * Generates a synthetic name for a model element, when the model element is defined as an anonymous node and
-    * has no bamm:name set. The synthetic name is a random string that prefixed with the type of the model element
-    * if it can be determined easily. For example, for the following model element:
+    * Generates a synthetic name for a model element, when the model element is defined as an anonymous node.
+    * The synthetic name consists of the name of the first named parent element of the model element suffixed with the type of the model element if it can be
+    * determined easily. For example, for the LengthConstraint in the following model:
     * <code>
-    * [ a bamm-c:LengthConstraint; bamm-c:minValue 5 ]
+    *    :aProperty a bamm:Property ;
+    *       bamm:characteristic [
+    *          a bamm:Trait ;
+    *          bamm-c:baseCharacteristic ... ;
+    *          bamm-c:constraint [
+    *             a bamm-c:LengthConstraint; bamm-c:minValue 5
+    *          ]
+    *       ]
     * </code>
-    * a synthetic name of "LengthConstraint12345ABC" would be generated (with the last part being a random string).
+    * a synthetic name of "APropertyLengthConstraint" would be generated.
     *
     * @param modelElement a model element
     * @param model the containing model
-    * @return a synthetic name for the model element, possibly prefixed with the model element's type name
+    * @return a synthetic name for the model element, possibly suffixed with the model element's type name
     */
    private static String getSyntheticName( final Resource modelElement, final Model model ) {
       final String randomPart = UUID.nameUUIDFromBytes( modelElement.getId().toString().getBytes() ).toString()
@@ -199,6 +197,29 @@ private static String getSyntheticName( final Resource modelElement, final Model
             .orElse( "" ) + randomPart;
    }
 
+   private static String getSyntheticName( final Resource modelElement, final Model model, final BAMM bamm ) {
+      Resource parentModelElement = model.listStatements( null, null, modelElement ).next().getSubject();
+      while ( parentModelElement.isAnon() ) {
+         parentModelElement = model.listStatements( null, null, parentModelElement ).next().getSubject();
+      }
+
+      final String parentModelElementUri = parentModelElement.getURI();
+      final String parentModelElementName = metaModelResourceResolver.getAspectModelUrn( parentModelElementUri )
+            .toJavaOptional()
+            .map( AspectModelUrn::getName )
+            .map( StringUtils::capitalize )
+            .orElse( "" );
+
+      final Resource modelElementType = modelElement.getProperty( RDF.type ).getObject().asResource();
+      final String modelElementTypeUri = modelElementType.getURI();
+      final String modelElementTypeName = metaModelResourceResolver.getAspectModelUrn( modelElementTypeUri )
+            .toJavaOptional()
+            .map( AspectModelUrn::getName )
+            .orElse( "" );
+
+      return parentModelElementName + modelElementTypeName;
+   }
+
    /**
     * @param subject the RDF {@link Resource} representing the Aspect Model element to be processed
     * @param property the RDF {@link org.apache.jena.rdf.model.Property} for which the values will be retrieved

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

@@ -43,7 +43,9 @@
 
 public class AspectMetaModelInstantiatorTest extends MetaModelInstantiatorTest {
    @ParameterizedTest
-   @EnumSource( value = TestAspect.class )
+   @EnumSource( value = TestAspect.class, mode = EnumSource.Mode.EXCLUDE, names = {
+         "ASPECT_WITH_TIME_SERIES" // This feature branch does not support bamm:AbstractProperty. When support for this is added, remove this
+   } )
    public void testLoadAspectExpectSuccess( final TestAspect aspect ) {
       assertThatCode( () ->
             loadAspect( aspect, KnownVersion.getLatest() )

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

@@ -16,6 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.jena.vocabulary.XSD;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -139,6 +140,8 @@ public void testSortedSetCharacteristicInstantiationExpectSuccess( final KnownVe
 
    @ParameterizedTest
    @MethodSource( value = "versionsStartingWith2_0_0" )
+   /* This feature branch does not support bamm:AbstractProperty. When support for this is added, remove @Disabled */
+   @Disabled
    public void testTimeSeriesInstantiationExpectSuccess( final KnownVersion metaModelVersion ) {
       final AspectModelUrn expectedAspectModelUrn = AspectModelUrn.fromUrn( TestModel.TEST_NAMESPACE + "TestTimeSeries" );
       final Aspect aspect = loadAspect( TestAspect.ASPECT_WITH_TIME_SERIES, metaModelVersion );

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

@@ -58,10 +58,6 @@ public Property curie() {
       return property( "curie" );
    }
 
-   public Property name() {
-      return property( "name" );
-   }
-
    public Property description() {
       return property( "description" );
    }

core/sds-aspect-meta-model-resolver/src/test/resources/bamm_2_0_0/invalid_aspect_meta_model_urn_element.ttl

@@ -12,7 +12,6 @@
 @prefix bamm: <urn:io.openmanufacturing:foo:1.0.0#> .
 
 <urn:bamm:io.openmanufacturing:aspect-model:TestAspect:1.0.0> a bamm:Aspect ;
-   bamm:name "TestAspect" ;
    bamm:preferredName "Test Aspect"@en ;
    bamm:properties ( ) ;
    bamm:operations ( ) .

core/sds-aspect-meta-model-resolver/src/test/resources/bamm_2_0_0/invalid_aspect_urn.ttl

@@ -12,7 +12,6 @@
 @prefix bamm: <urn:bamm:foo:something:else#> .
 
 <urn:bamm:io.openmanufacturing:TestAspect:1.1.0> a bamm:Aspect;
-	bamm:name "TestAspect" ;
 	bamm:preferredName "Test Aspect"@en;
 	bamm:properties () ;
 	bamm:operations () .

core/sds-aspect-meta-model-resolver/src/test/resources/bamm_2_0_0/invalid_aspect_urn_prefix.ttl

@@ -12,7 +12,6 @@
 @prefix bamm: <urn:foo:io.openmanufacturing:meta-model:2.0.0#> .
 
 <urn:bamm:io.openmanufacturing:aspect-model:TestAspect:1.1.0> a bamm:Aspect ;
-   bamm:name "TestAspect" ;
    bamm:preferredName "Test Aspect"@en ;
    bamm:properties ( ) ;
    bamm:operations ( ) .

core/sds-aspect-meta-model-resolver/src/test/resources/bamm_2_0_0/invalid_multiple_aspects.ttl

@@ -12,13 +12,11 @@
 @prefix bamm: <urn:bamm:io.openmanufacturing:meta-model:2.0.0#> .
 
 <urn:bamm:io.openmanufacturing:aspect-model:TestAspect:1.1.0> a bamm:Aspect ;
-   bamm:name "TestAspect" ;
    bamm:preferredName "Test Aspect"@en ;
    bamm:properties ( ) ;
    bamm:operations ( ) .
 
 <urn:bamm:io.openmanufacturing:aspect-model:AnotherTestAspect:1.1.0> a bamm:Aspect ;
-   bamm:name "AnotherTestAspect" ;
    bamm:preferredName "Another Test Aspect"@en ;
    bamm:properties ( ) ;
    bamm:operations ( ) .