Update logic

Author: Yauhenikapl

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/HasDescription.java

@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.eclipse.esmf.metamodel.datatype.LangString;
 
@@ -79,11 +78,4 @@ default String getDescription( final Locale locale ) {
                return getDescription( Locale.ENGLISH );
             } );
    }
-
-   default Set<String> getDescriptions( final Locale locale ) {
-      return getDescriptions().stream()
-            .filter( description -> description.getLanguageTag().equals( locale ) )
-            .map( LangString::getValue )
-            .collect( Collectors.toSet() );
-   }
 }

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

@@ -45,42 +45,42 @@ private DescriptionsUtils() {
    /**
     * Extracts all {@code NOTE} blocks from the given set of Markdown description strings.
     *
-    * @param descriptions A set of multi-line Markdown descriptions.
+    * @param description A line Markdown description.
     * @return A list of extracted NOTE block contents.
     */
-   public static List<String> notes( final Set<String> descriptions ) {
-      return extractBlock( descriptions, "NOTE" );
+   public static List<String> notes( final String description ) {
+      return extractBlock( description, "NOTE" );
    }
 
    /**
     * Extracts all {@code EXAMPLE} blocks from the given set of Markdown description strings.
     *
-    * @param descriptions A set of multi-line Markdown descriptions.
+    * @param description A line Markdown description.
     * @return A list of extracted EXAMPLE block contents.
     */
-   public static List<String> examples( final Set<String> descriptions ) {
-      return extractBlock( descriptions, "EXAMPLE" );
+   public static List<String> examples( final String description ) {
+      return extractBlock( description, "EXAMPLE" );
    }
 
    /**
     * Extracts all {@code SOURCE} blocks from the given set of Markdown description strings.
     *
-    * @param descriptions A set of multi-line Markdown descriptions.
+    * @param description A line Markdown description.
     * @return A list of extracted SOURCE block contents.
     */
-   public static List<String> sources( final Set<String> descriptions ) {
-      return extractBlock( descriptions, "SOURCE" );
+   public static List<String> sources( final String description ) {
+      return extractBlock( description, "SOURCE" );
    }
 
    /**
     * Renders the given set of Markdown description strings into semantic HTML.
     * Uses {@link MarkdownHtmlRenderer} to process both special blocks and general Markdown syntax.
     *
-    * @param descriptions A set of Markdown description strings.
+    * @param description A line of Markdown description string.
     * @return The HTML representation of the combined input.
     */
-   public static String toHtml( final Set<String> descriptions ) {
-      return MarkdownHtmlRenderer.renderHtmlFromDescriptions( descriptions );
+   public static String toHtml( final String description ) {
+      return MarkdownHtmlRenderer.renderHtmlFromDescriptions( description );
    }
 
    /**
@@ -93,11 +93,9 @@ public static String toHtml( final Set<String> descriptions ) {
     * @param type The type of block to extract ("NOTE", "EXAMPLE", or "SOURCE").
     * @return A list of extracted block contents for the specified type.
     */
-   private static List<String> extractBlock( final Set<String> descriptions, final String type ) {
+   private static List<String> extractBlock( final String descriptions, final String type ) {
       List<String> result = new ArrayList<>();
-      for ( String desc : descriptions ) {
-         extractFromDescription( desc, type, result );
-      }
+      extractFromDescription( descriptions, type, result );
       return result;
    }
 

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

@@ -60,15 +60,11 @@ private MarkdownHtmlRenderer() {
     * Converts a set of multi-line Markdown descriptions into a single HTML string.
     * Each entry in the set is processed independently and merged in the resulting output.
     *
-    * @param descriptions A set of Markdown description blocks to render.
+    * @param description A line of Markdown description blocks to render.
     * @return Combined HTML output representing all given descriptions.
     */
-   public static String renderHtmlFromDescriptions( final Set<String> descriptions ) {
-      StringBuilder result = new StringBuilder();
-      for ( String desc : descriptions ) {
-         result.append( processSpecialBlocks( desc ) ).append( "\n" );
-      }
-      return result.toString();
+   public static String renderHtmlFromDescriptions( final String description ) {
+      return processSpecialBlocks( description ) + "\n";
    }
 
    /**

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/utils/DescriptionsUtilsTest.java

@@ -4,28 +4,24 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
-import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 
 class DescriptionsUtilsTest {
    @Test
    void testExtractNotes_singleNote() {
-      Set<String> descriptions = Set.of(
-            "> NOTE: This is a note.\n> Continued on the next line."
-      );
-      List<String> notes = DescriptionsUtils.notes( descriptions );
+      String description = "> NOTE: This is a note.\n> Continued on the next line.";
+      List<String> notes = DescriptionsUtils.notes( description );
       assertEquals( 1, notes.size() );
       assertEquals( "This is a note.\nContinued on the next line.", notes.get( 0 ) );
    }
 
    @Test
    void testExtractExamples_multipleExamples() {
-      Set<String> descriptions = Set.of(
-            "> EXAMPLE 1: First example.\n> More detail.",
-            "> EXAMPLE 2: Second example."
-      );
-      List<String> examples = DescriptionsUtils.examples( descriptions );
+      String description =
+            "> EXAMPLE 1: First example.\n> More detail.\n" +
+            "> EXAMPLE 2: Second example.";
+      List<String> examples = DescriptionsUtils.examples( description );
 
       assertEquals( 2, examples.size() );
       assertEquals( "First example.\nMore detail.", examples.get( 0 ) );
@@ -34,39 +30,34 @@ void testExtractExamples_multipleExamples() {
 
    @Test
    void testExtractSources_withLink() {
-      Set<String> descriptions = Set.of(
-            "> SOURCE: Source with [link](https://example.com)"
-      );
-      List<String> sources = DescriptionsUtils.sources( descriptions );
+      String description = "> SOURCE: Source with [link](https://example.com)";
+      List<String> sources = DescriptionsUtils.sources( description );
       assertEquals( 1, sources.size() );
       assertTrue( sources.get( 0 ).contains( "[link](https://example.com)" ) );
    }
 
    @Test
    void testMixedBlockTypes() {
-      Set<String> descriptions = Set.of(
-            "> NOTE: A note block.",
-            "> EXAMPLE: An example block.",
-            "> SOURCE: A source block."
-      );
-      assertEquals( 1, DescriptionsUtils.notes( descriptions ).size() );
-      assertEquals( 1, DescriptionsUtils.examples( descriptions ).size() );
-      assertEquals( 1, DescriptionsUtils.sources( descriptions ).size() );
+      String description =
+            "> NOTE: A note block.\n" +
+            "> EXAMPLE: An example block.\n" +
+            "> SOURCE: A source block.";
+      assertEquals( 1, DescriptionsUtils.notes( description ).size() );
+      assertEquals( 1, DescriptionsUtils.examples( description ).size() );
+      assertEquals( 1, DescriptionsUtils.sources( description ).size() );
    }
 
    @Test
    void testNoBlocks() {
-      Set<String> descriptions = Set.of(
-            "This is a plain description without any special blocks."
-      );
-      assertTrue( DescriptionsUtils.notes( descriptions ).isEmpty() );
-      assertTrue( DescriptionsUtils.examples( descriptions ).isEmpty() );
-      assertTrue( DescriptionsUtils.sources( descriptions ).isEmpty() );
+      String description = "This is a plain description without any special blocks.";
+      assertTrue( DescriptionsUtils.notes( description ).isEmpty() );
+      assertTrue( DescriptionsUtils.examples( description ).isEmpty() );
+      assertTrue( DescriptionsUtils.sources( description ).isEmpty() );
    }
 
    @Test
-   public void testToHtml_withAllBlockTypes() {
-      Set<String> descriptions = Set.of(
+   void testToHtml_withAllBlockTypes() {
+      final String description =
             """
                   > NOTE: This is a note.
                   > With multiple lines.
@@ -82,9 +73,9 @@ public void testToHtml_withAllBlockTypes() {
                   1. Ordered
                   2. List
                   """
-      );
+      ;
 
-      String html = DescriptionsUtils.toHtml( descriptions );
+      final String html = DescriptionsUtils.toHtml( description );
 
       assertTrue( html.contains( "<div class=\"note\">" ) );
       assertTrue( html.contains( "This is a note." ) );

core/esmf-aspect-model-document-generators/src/main/resources/docu/templates/html/property-documentation-lib.vm

@@ -17,7 +17,7 @@
     #paragraph( $property.getPreferredName( $i18n.getLocale() ) "${aspectModelHelper.buildAnchor( $property, $parentElement, 'property' )}" $weight )
 
     #if( $property.getDescription( $i18n.getLocale() ) )
-        #description( $descriptionsUtils.toHtml( $property.getDescriptions( $i18n.getLocale() ) ) )
+        #description( $descriptionsUtils.toHtml( $property.getDescription( $i18n.getLocale() ) ) )
     #end
 
     <div class="flex border-b pb-1 py-4">