Update URN rules

Author: Yauhenikapl

core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java

@@ -172,7 +172,11 @@ public List<String> getSubmodelNames() {
             .collect( Collectors.toList() );
    }
 
-   protected String escapeUrnNamespacePart( final String namespacePart ) {
+   protected String escapeUrnNamespacePart( String namespacePart ) {
+      if ( namespacePart.contains( "-" ) ) {
+         namespacePart = namespacePart.replaceAll( "-", "." );
+         return namespacePart;
+      }
       if ( namespacePart.matches( AspectModelUrn.NAMESPACE_REGEX_PART ) ) {
          return namespacePart;
       }
@@ -186,14 +190,34 @@ private <T> Collector<T, ArrayDeque<T>, ArrayDeque<T>> reverseOrder() {
       } );
    }
 
+//      private String iriToReversedHostNameNotation( final IRI iri ) {
+//         final URI uri = URI.create( iri.toString().contains( "://" ) ? iri.toString() : "https://" + iri );
+//         return Stream.concat(
+//                     Arrays.stream( uri.getHost().split( "\\." ) ).collect( reverseOrder() ).stream(),
+//                     Arrays.stream( uri.getPath().split( "/" ) ) )
+//               .filter( StringUtils::isNotBlank )
+//               .map( this::escapeUrnNamespacePart )
+//               .collect( Collectors.joining( "." ) );
+//      }
+
    private String iriToReversedHostNameNotation( final IRI iri ) {
       final URI uri = URI.create( iri.toString().contains( "://" ) ? iri.toString() : "https://" + iri );
-      return Stream.concat(
-                  Arrays.stream( uri.getHost().split( "\\." ) ).collect( reverseOrder() ).stream(),
-                  Arrays.stream( uri.getPath().split( "/" ) ) )
+
+      String[] hostParts = uri.getHost().split( "\\." );
+      String[] pathParts = uri.getPath().split( "/" );
+
+      String reversedHost = Arrays.stream( hostParts )
+            .collect( reverseOrder() )
+            .stream()
+            .map( part -> part.replaceAll( "-", "." ) )
+            .collect( Collectors.joining( "." ) );
+
+      String path = Arrays.stream( pathParts )
             .filter( StringUtils::isNotBlank )
-            .map( this::escapeUrnNamespacePart )
+            .limit( pathParts.length - 2 )
             .collect( Collectors.joining( "." ) );
+
+      return reversedHost + "." + path;
    }
 
    private Optional<IRI> iri( final String lexicalRepresentation ) {

core/esmf-aspect-model-urn/src/test/java/org/eclipse/esmf/aspectmodel/urn/AspectModelUrnTest.java

@@ -342,4 +342,17 @@ void validNamespaceTest() throws URISyntaxException {
       assertThat( elementUrnWithDash.getNamespaceMainPart() ).isNotEmpty();
       assertThat( elementUrnWithDash.getNamespaceMainPart() ).isEqualTo( "org.eclipse.esmf-test" );
    }
+
+   @Test
+   void invalidNamespaceTest() throws URISyntaxException {
+      final URI validNamespaceUrnUnderscore = new URI( "urn:samm:com.bosch.nexeed.digitaltwin:aspect-model:Er?ors:1.1.0#TestAspect" );
+      final AspectModelUrn elementUrnWithUnderscore = AspectModelUrn.fromUrn( validNamespaceUrnUnderscore );
+      assertThat( elementUrnWithUnderscore.getNamespaceMainPart() ).isNotEmpty();
+      assertThat( elementUrnWithUnderscore.getNamespaceMainPart() ).isEqualTo( "org.eclipse.esmf_test" );
+
+      final URI invalidNamespaceUrnDash = new URI( "urn:samm:org.eclipse.esmf-test:0.0.1#TestAspect" );
+      final AspectModelUrn elementUrnWithDash = AspectModelUrn.fromUrn( invalidNamespaceUrnDash );
+      assertThat( elementUrnWithDash.getNamespaceMainPart() ).isNotEmpty();
+      assertThat( elementUrnWithDash.getNamespaceMainPart() ).isEqualTo( "org.eclipse.esmf-test" );
+   }
 }