fixed issue with names collision during diagram generation

#310

Author: ysrbo

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/diagram/AspectModelDiagramGenerator.java

@@ -78,6 +78,7 @@ public String getArtifactFilename( final String aspectName, final Locale languag
    private static final String FONT_FILE = "diagram/RobotoCondensed-Regular.ttf";
 
    static final String GET_ELEMENT_NAME_FUNC = "urn:samm:org.eclipse.esmf.samm:function:2.0.0#getElementName";
+   static final String GET_NAMESPACE_FUNC = "urn:samm:org.eclipse.esmf.samm:function:2.0.0#getNamespace";
 
    private final Query boxmodelToDotQuery;
    private final BoxModel boxModelNamespace;
@@ -143,7 +144,10 @@ ImmutableList.<String> builder().addAll( queryFilesForAllMetaModelVersions )
       boxmodelToDotQuery = QueryFactory.create( getInputStreamAsString( "boxmodel2dot.sparql" ) );
       boxModelNamespace = new BoxModel( metaModelVersion );
 
-      sparqlExecutor = new SparqlExecutor().useCustomFunction( GET_ELEMENT_NAME_FUNC, new GetElementNameFunctionFactory( model ) );
+      sparqlExecutor = new SparqlExecutor()
+            .useCustomFunction( GET_ELEMENT_NAME_FUNC, new GetElementNameFunctionFactory( model ) )
+            .useCustomFunction( GET_NAMESPACE_FUNC, new GetNamespaceFunctionFactory( model ) )
+      ;
    }
 
    InputStream getInputStream( final String resource ) {

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/diagram/GetNamespaceFunctionFactory.java

@@ -0,0 +1,51 @@
+package io.openmanufacturing.sds.aspectmodel.generator.diagram;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.function.Function;
+import org.apache.jena.sparql.function.FunctionBase1;
+import org.apache.jena.sparql.function.FunctionFactory;
+
+import io.openmanufacturing.sds.aspectmodel.urn.AspectModelUrn;
+
+/**
+ * {@link FunctionFactory} for the {@link getNamespace} SPARQL function.
+ */
+public class GetNamespaceFunctionFactory implements FunctionFactory {
+
+   private final getNamespace getNamespace;
+
+   /**
+    */
+   public GetNamespaceFunctionFactory( final Model context ) {
+      this.getNamespace = new getNamespace( context.getNsPrefixURI( "" ) );
+   }
+
+   @Override
+   public Function create( String s ) {
+      return getNamespace;
+   }
+
+   /**
+    * A custom SPARQL function which provides the namespace of a model element.
+    */
+   public static class getNamespace extends FunctionBase1 {
+
+      private final String defaultNs;
+
+      public getNamespace( String defaultNs ) {
+         this.defaultNs = defaultNs;
+      }
+
+      @Override
+      public NodeValue exec( NodeValue nodeValue ) {
+         final Node node = nodeValue.asNode();
+         if ( node.isBlank() || !node.isURI() ) {
+            return NodeValue.makeNodeString( defaultNs );
+         }
+         final AspectModelUrn nodeUrn = AspectModelUrn.fromUrn( node.getURI() );
+         return NodeValue.makeString( nodeUrn.getUrnPrefix() );
+      }
+   }
+}

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_1_0_0/aspect2boxmodel.sparql

@@ -12,6 +12,7 @@
 prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0#>
 prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates boxes for Aspects
 construct {
@@ -40,7 +41,7 @@ construct {
   ?aspect samm:name ?aspectName .
 
   bind( concat( ?aspectName, "Aspect" ) as ?boxName )
-  bind( iri( concat( str( : ), ?boxName ) ) as ?aspectBox )
+  bind( iri( concat( func:getNamespace( ?aspect ), ?boxName ) ) as ?aspectBox )
 
   optional {
     ?aspect samm:preferredName ?preferredNameValue .

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_1_0_0/characteristic-metamodelnode-edges2boxmodel.sparql

@@ -13,6 +13,7 @@ prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0#>
 prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates edges between Characteristic and Meta Model Properties (dataType)
 construct {
@@ -27,10 +28,10 @@ construct {
   ?metaModelElement rdfs:label ?metaModelElementName .
 
   bind( concat( ?characteristicName, "Characteristic" ) as ?characteristicBoxName )
-  bind( iri( concat( str( : ), ?characteristicBoxName ) ) as ?from )
+  bind( iri( concat( func:getNamespace( ?characteristic ), ?characteristicBoxName ) ) as ?from )
   bind( concat( ?metaModelElementName, "MetaModelElement" ) as ?metaModelElementBoxName )
-  bind( iri( concat( str( : ), ?metaModelElementBoxName ) ) as ?to )
+  bind( iri( concat( func:getNamespace( ?metaModelElement ), ?metaModelElementBoxName ) ) as ?to )
 
-  bind( iri( concat( str( : ), ?characteristicBoxName, "_To_", ?metaModelElementBoxName ) ) as ?edge )
+  bind( iri( concat( func:getNamespace( ?characteristic ), ?characteristicBoxName, "_To_", ?metaModelElementBoxName ) ) as ?edge )
 }
 

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_1_0_0/collection2boxmodel.sparql

@@ -16,6 +16,7 @@ prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates boxes for Collection Characteristics
 construct {
@@ -67,7 +68,7 @@ construct {
 
   ?characteristic samm:name ?characteristicName .
   bind( concat( ?characteristicName, "Characteristic" ) as ?boxName )
-  bind( iri( concat( str( : ), ?boxName ) ) as ?characteristicBox )
+  bind( iri( concat( func:getNamespace( ?characteristic ), ?boxName ) ) as ?characteristicBox )
 
   optional {
     ?characteristic samm:preferredName ?preferredNameValue .

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_1_0_0/entityinstance-entity-edges2boxmodel.sparql

@@ -16,6 +16,7 @@ prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates edges between Entity Instances and Entities
 construct {
@@ -41,8 +42,8 @@ construct {
   bind( strafter( str( ?instance ), "#" ) as ?instanceName )
   bind( concat( ?instanceName, "EntityInstance" ) as ?instanceBoxName )
 
-  bind( iri( concat( str( : ), ?instanceBoxName ) ) as ?from )
-  bind( iri( concat( str( : ), ?entityBoxName ) ) as ?to )
-  bind( iri( concat( str( : ), ?instanceBoxName, "_To_", ?entityBoxName ) ) as ?edge )
+  bind( iri( concat( func:getNamespace( ?instance ), ?instanceBoxName ) ) as ?from )
+  bind( iri( concat( func:getNamespace( ?entity ), ?entityBoxName ) ) as ?to )
+  bind( iri( concat( func:getNamespace( ?instance ), ?instanceBoxName, "_To_", ?entityBoxName ) ) as ?edge )
   bind( "is a" as ?title )
 }

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_1_0_0/entityinstance-nestedentityinstance-edges2boxmodel.sparql

@@ -16,6 +16,7 @@ prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates edges between Entity Instances and nested Entity Instances
 construct {
@@ -56,9 +57,9 @@ construct {
     bind( strafter( str( ?listValue ), "#" ) as ?nestedInstanceName )
   }
 
-  bind( iri( concat( str( : ), ?instanceBoxName ) ) as ?from )
+  bind( iri( concat( func:getNamespace( ?instance ), ?instanceBoxName ) ) as ?from )
   bind( concat( ?nestedInstanceName, "EntityInstance" ) as ?nestedInstanceBoxName )
-  bind( iri( concat( str( : ), ?nestedInstanceBoxName ) ) as ?to )
-  bind( iri( concat( str( : ), ?instanceBoxName, "_To_", ?nestedInstanceBoxName ) ) as ?edge )
+  bind( iri( concat( func:getNamespace( if(!isBlank( ?propertyValue ), ?propertyValue, ?listValue )), ?nestedInstanceBoxName ) ) as ?to )
+  bind( iri( concat( func:getNamespace( ?instance ), ?instanceBoxName, "_To_", ?nestedInstanceBoxName ) ) as ?edge )
   bind( concat( ?propertyName, " value" ) as ?title )
 }

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_1_0_0/metamodelnode2boxmodel.sparql

@@ -14,6 +14,7 @@ prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates boxes for Meta Model Properties
 construct {
@@ -26,6 +27,6 @@ construct {
   filter( ?metaModelElement in ( samm:Property ) )
   ?metaModelElement rdfs:label ?metaModelElementName .
   bind( concat( ?metaModelElementName, "MetaModelElement" ) as ?boxName )
-  bind( iri( concat( str( : ), ?boxName ) ) as ?metaModelNodeBox )
+  bind( iri( concat( func:getNamespace( ?metaModelElement ), ?boxName ) ) as ?metaModelNodeBox )
 }
 

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_1_0_0/unit-quantitykind-edges2boxmodel.sparql

@@ -14,6 +14,7 @@ prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:1.0.0#>
 prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:1.0.0#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates edges between Units and QuantityKinds (quantityKind)
 construct {
@@ -31,10 +32,10 @@ construct {
   bind( concat( ucase( substr( ?quantityKindName, 1, 1 ) ), substr( ?quantityKindName, 2 ) ) as ?upperQuantityKindName )
 
   bind( concat( ?upperUnitName, "Unit" ) as ?unitBoxName )
-  bind( iri( concat( str( : ), ?unitBoxName ) ) as ?from )
+  bind( iri( concat( func:getNamespace( ?unit ), ?unitBoxName ) ) as ?from )
   bind( replace( ?upperQuantityKindName, "-", "" ) as ?quantityKindBoxName )
-  bind( iri( concat( str( : ), ?quantityKindBoxName ) ) as ?to )
+  bind( iri( concat( func:getNamespace( ?quantityKind ), ?quantityKindBoxName ) ) as ?to )
 
-  bind( iri( concat( str( : ), ?unitBoxName, "_To_", ?quantityKindBoxName ) ) as ?edge )
+  bind( iri( concat( func:getNamespace( ?unit ), ?unitBoxName, "_To_", ?quantityKindBoxName ) ) as ?edge )
 }
 

core/esmf-aspect-model-document-generators/src/main/resources/diagram/samm_2_0_0/abstractentity2boxmodel.sparql

@@ -13,6 +13,7 @@ prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#>
 prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 prefix : <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0/boxmodel#>
+prefix func: <urn:samm:org.eclipse.esmf.samm:function:2.0.0#>
 
 # Generates boxes for Abstract Entities
 construct {
@@ -42,7 +43,7 @@ construct {
   bind( strafter( str( ?abstractEntity ), "#" ) as ?abstractEntityName )
 
   bind( concat( ?abstractEntityName, "AbstractEntity" ) as ?boxName )
-  bind( iri( concat( str( : ), ?boxName ) ) as ?abstractEntityBox )
+  bind( iri( concat( func:getNamespace( ?abstractEntity ), ?boxName ) ) as ?abstractEntityBox )
 
   optional {
     ?abstractEntity samm:preferredName ?preferredNameValue .