Merge branch 'main' into 606-handle-multiple-aspects-in-maven-plugin

Author: atextor

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

@@ -73,7 +73,11 @@ private static String content( final InputStream inputStream ) {
    }
 
    private static List<String> headerComment( final String content ) {
-      return content.lines().takeWhile( line -> line.startsWith( "#" ) || isBlank( line ) ).toList();
+      return content.lines()
+            .dropWhile( String::isBlank )
+            .takeWhile( line -> line.startsWith( "#" ) || isBlank( line ) )
+            .map( line -> line.startsWith( "#" ) ? line.substring( 1 ).trim() : line )
+            .toList();
    }
 
    public static RawAspectModelFile load( final InputStream inputStream ) {

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

@@ -49,6 +49,9 @@ public void testLoadDataModelExpectSuccess() throws URISyntaxException {
          final AspectModel result = new AspectModelLoader( urnStrategy ).load( testUrn );
          final Resource aspect = createResource( TestModel.TEST_NAMESPACE + "Test" );
          assertThat( result.mergedModel().listStatements( aspect, RDF.type, SammNs.SAMM.Aspect() ).nextOptional() ).isNotEmpty();
+         assertThat( result.files().get( 0 ).headerComment() ).isNotNull();
+         assertThat( result.files().get( 0 ).headerComment().get( 0 ) ).contains(
+               "Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH" );
       } ).doesNotThrowAnyException();
    }
 
@@ -82,6 +85,9 @@ public void testLoadLegacyBammModelExpectSuccess() throws URISyntaxException {
          final AspectModel result = new AspectModelLoader( urnStrategy ).load( testUrn );
          final Resource aspect = createResource( "urn:samm:org.eclipse.esmf.test:2.0.0#BammTest" );
          assertThat( result.mergedModel().listStatements( aspect, RDF.type, SammNs.SAMM.Aspect() ).nextOptional() ).isNotEmpty();
+         assertThat( result.files().get( 0 ).headerComment() ).isNotNull();
+         assertThat( result.files().get( 0 ).headerComment().get( 0 ) ).contains(
+               "Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH" );
       } ).doesNotThrowAnyException();
    }
 
@@ -128,6 +134,9 @@ public void testResolveReferencedModelFromMemoryExpectSuccess() throws URISyntax
          final AspectModel result = new AspectModelLoader( inMemoryResolutionStrategy ).load( testUrn );
          final Resource aspect = createResource( testUrn.toString() );
          assertThat( result.mergedModel().listStatements( aspect, RDF.type, SammNs.SAMM.Aspect() ).nextOptional() ).isNotEmpty();
+         assertThat( result.files().get( 0 ).headerComment() ).isNotNull();
+         assertThat( result.files().get( 0 ).headerComment().get( 0 ) ).contains(
+               "Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH" );
       } ).doesNotThrowAnyException();
    }
 
@@ -144,6 +153,9 @@ public void testResolveReferencedModelExpectSuccess() throws URISyntaxException
          final AspectModel result = new AspectModelLoader( urnStrategy ).load( testUrn );
          final Resource aspect = createResource( testUrn.toString() );
          assertThat( result.mergedModel().listStatements( aspect, RDF.type, SammNs.SAMM.Aspect() ).nextOptional() ).isNotEmpty();
+         assertThat( result.files().get( 0 ).headerComment() ).isNotNull();
+         assertThat( result.files().get( 0 ).headerComment().get( 0 ) ).contains(
+               "Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH" );
 
          final Resource propertyFromReferencedAspect = createResource( TestModel.TEST_NAMESPACE + "foo" );
          assertThat( result.mergedModel().listStatements( propertyFromReferencedAspect, RDF.type, SammNs.SAMM.Property() )