Merge pull request #719 from bci-oss/701-fix-header-comment-parsing

Fix header comment parsing

Author: atextor

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

@@ -13,8 +13,6 @@
 
 package org.eclipse.esmf.aspectmodel.resolver;
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -92,12 +90,10 @@ private static String content( final InputStream inputStream ) {
    private static List<String> headerComment( final String content ) {
       final List<String> list = content.lines()
             .dropWhile( String::isBlank )
-            .takeWhile( line -> line.startsWith( "#" ) || isBlank( line ) )
-            .map( line -> line.startsWith( "#" ) ? line.substring( 1 ).trim() : line )
+            .takeWhile( line -> line.startsWith( "#" ) )
+            .map( line -> line.substring( 1 ).trim() )
             .toList();
-      return !list.isEmpty() && list.get( list.size() - 1 ).isEmpty()
-            ? list.subList( 0, list.size() - 1 )
-            : list;
+      return list;
    }
 
    public static RawAspectModelFile load( final InputStream inputStream ) {

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/resolver/AspectModelResolverTest.java

@@ -62,6 +62,44 @@ void testLoadDataModelExpectSuccess() throws URISyntaxException {
       } ).doesNotThrowAnyException();
    }
 
+   @Test
+   void testLoadModelWithNoEmptyLineAfterHeaderCommentBlock() {
+      assertThat( AspectModelFileLoader.load( """
+            #
+            # Test copyright
+            #
+            @prefix : <urn:samm:com.xyz:0.0.1#> .
+            """ ) )
+            .headerComment().hasSize( 3 ).matches( list -> list.get( 1 ).contains( "Test copyright" ) );
+      assertThat( AspectModelFileLoader.load( """
+            #
+            # Test copyright
+            #
+            
+            @prefix : <urn:samm:com.xyz:0.0.1#> .
+            """ ) )
+            .headerComment().hasSize( 3 ).matches( list -> list.get( 1 ).contains( "Test copyright" ) );
+      assertThat( AspectModelFileLoader.load( """
+            #
+            # Test copyright
+            #
+            
+            # Another comment
+            @prefix : <urn:samm:com.xyz:0.0.1#> .
+            """ ) )
+            .headerComment().hasSize( 3 ).matches( list -> list.get( 1 ).contains( "Test copyright" ) );
+      assertThat( AspectModelFileLoader.load( """
+            #
+            # Test copyright
+            #
+            
+            # Another comment
+            
+            @prefix : <urn:samm:com.xyz:0.0.1#> .
+            """ ) )
+            .headerComment().hasSize( 3 ).matches( list -> list.get( 1 ).contains( "Test copyright" ) );
+   }
+
    @Test
    void testLoadLegacyBammModelWithoutPrefixesExpectSuccess() throws URISyntaxException {
       final File aspectModelsRootDirectory = new File(