Fix support for Namespace URN syntax

Author: atextor

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/RdfUtil.java

@@ -118,6 +118,7 @@ public static void cleanPrefixes( final Model model ) {
             .map( Statement::getSubject )
             .filter( Resource::isURIResource )
             .map( Resource::getURI )
+            .map( uri -> uri.endsWith( "#" ) ? uri.replace( "#", "" ) : uri )
             .map( AspectModelUrn::fromUrn )
             .findAny()
             .ifPresent( urn -> model.setNsPrefix( "", urn.getUrnPrefix() ) );

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/ModelElementFactory.java

@@ -257,7 +257,9 @@ private static Optional<AspectModelUrn> getUrn( final Resource modelElement ) {
          }
          return Optional.empty();
       }
-      return Optional.of( AspectModelUrn.fromUrn( modelElement.getURI() ) );
+      return modelElement.getURI().endsWith( "#" )
+            ? Optional.of( AspectModelUrn.fromUrn( modelElement.getURI().replace( "#", "" ) ) )
+            : Optional.of( AspectModelUrn.fromUrn( modelElement.getURI() ) );
    }
 
    /**

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/serializer/PrettyPrinter.java

@@ -481,7 +481,9 @@ public Object visitLiteral( final Node_Literal it, final String lex, final Strin
       public Object visitURI( final Node_URI it, final String uri ) {
          final String suri = model.shortForm( uri );
          if ( uri.equals( suri ) ) {
-            return "<" + uri + ">";
+            return uri.startsWith( "urn:samm:" ) && !uri.contains( "#" )
+                  ? "<" + uri + "#>"
+                  : "<" + uri + ">";
          } else {
             return suri;
          }

core/esmf-test-aspect-models/src/main/resources/valid/org.eclipse.esmf.test/1.0.0/AspectWithNamespaceDescription.ttl

@@ -15,7 +15,7 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.0#> .
 
-<urn:samm:org.eclipse.esmf.test:1.0.0> a samm:Namespace ;
+: a samm:Namespace ;
    samm:preferredName "Test namespace"@en ;
    samm:description "Test of the namespace pseudo element"@en ;
    samm:see <http://example.com/> .