Merge pull request #653 from bci-oss/595-correctly-translate-idta-submodel-templates-to-samm

Update URN rules

Author: Yauhenikapl

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

@@ -19,6 +19,7 @@
 import java.net.URI;
 import java.util.ArrayDeque;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -172,28 +173,29 @@ public List<String> getSubmodelNames() {
             .collect( Collectors.toList() );
    }
 
-   protected String escapeUrnNamespacePart( final String namespacePart ) {
-      if ( namespacePart.matches( AspectModelUrn.NAMESPACE_REGEX_PART ) ) {
-         return namespacePart;
+   private String iriToReversedHostNameNotation( final IRI iri ) {
+      final URI uri;
+      try {
+         uri = URI.create( iri.toString().contains( "://" ) ? iri.toString() : "https://" + iri );
+      } catch ( IllegalArgumentException e ) {
+         throw new IllegalArgumentException( "Incorrect IRI: " + iri, e );
       }
-      throw new AspectModelGenerationException( "Encountered URI with invalid namespace part: " + namespacePart );
-   }
 
-   private <T> Collector<T, ArrayDeque<T>, ArrayDeque<T>> reverseOrder() {
-      return Collector.of( ArrayDeque::new, ArrayDeque::addFirst, ( deque1, deque2 ) -> {
-         deque2.addAll( deque1 );
-         return deque2;
-      } );
-   }
+      if ( uri.getHost() == null ) {
+         throw new IllegalArgumentException( "URI doesn't contain host: " + uri );
+      }
 
-   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( "/" ) ) )
+      final String[] hostParts = uri.getHost().split( "\\." );
+      final List<String> hostPartsList = Arrays.asList( hostParts );
+      Collections.reverse( hostPartsList );
+      final String reversedHost = String.join( ".", hostPartsList );
+
+      final String[] pathParts = uri.getPath().split( "/" );
+      final String path = Arrays.stream( pathParts )
             .filter( StringUtils::isNotBlank )
-            .map( this::escapeUrnNamespacePart )
             .collect( Collectors.joining( "." ) );
+
+      return reversedHost + ( path.isEmpty() ? "" : "." + path );
    }
 
    private Optional<IRI> iri( final String lexicalRepresentation ) {

core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java

@@ -36,11 +36,10 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-public class AasToAspectModelGeneratorTest {
+class AasToAspectModelGeneratorTest {
 
-   // IDTA-provided sample files can currently not be read with AAS4J
    @Test
-   @Disabled
+   @Disabled( "IDTA-provided sample files can currently not be read with AAS4J" )
    void testTranslateDigitalNameplate() {
       final InputStream aasx = AasToAspectModelGeneratorTest.class.getClassLoader()
             .getResourceAsStream( "Sample_ZVEI_Digital_Nameplate_V10.aasx" );