Bug fixes and minor enhancements in full report template ftls (#284)

Author: socadk

org.contextmapper.dsl.ui/samples/freemarker/markdown-templates/bounded-contexts/bounded-context-list-detailed.ftl

@@ -1,47 +1,60 @@
+
 <#list filterStructuralBoundedContexts(boundedContexts) as bc>
     ## Bounded Context ${bc.name}<#lt>
 
     *${bc.name}* has this domain vision statement: ${bc.domainVisionStatement!"[domain vision of the context not defined]"}<#lt>
 
     <#list bc.aggregates as agg>
         ### Aggregate ${agg.name}<#lt>
-        This aggregate can be classified as ${agg.doc!"[no doc string]"}. Its responsibilities are:<#lt>
-
-        <#if agg?has_content>
+        This aggregate can be classified as ${agg.doc!"[n/a]"}. <#if agg.responsibilities?has_content>Its responsibilities are:<#lt>        
             <#list agg.responsibilities as r>
                 * ${r}<#lt>
             </#list>
         <#else>
-            * [no (more) responsibilities defined]<#lt>
+            <#-- * [no (more) responsibilities defined]<#lt> -->
         </#if>
 
         <#assign entities = agg.domainObjects?filter(do -> instanceOf(do, Entity))>
         <#if entities?has_content>
+
             #### Entities (in Aggregate)<#lt>
             <#list entities as dob>
                 ##### ${dob.name}<#lt>
-                ${dob.hint!"[hint missing]"}<#lt>
+                ${dob.hint!"[no hint]"}<#lt>
 
                 <@attrOpsMacro.renderDomainObjectOperationsAndAttributes dob />
+
             </#list>
         </#if>
 
         <#if agg.services?has_content>
             #### Services<#lt>
             <#list agg.services as s>
                 ##### ${s.name}<#lt>
-                ${s.hint!"[hint missing]"}<#lt>
-            </#list>
+                ${s.hint!"[no hint]"}<#lt>
+
+        <#-- move to macro? -->
+        <#if s.operations?has_content>
+        Operations:<#lt>
+        | Operation | Doc String | Parameters | Return Type | State Transition |<#lt>
+        |-|-|-|-|-|<#lt>
+        <#list s.operations as op>
+            | ${op.name} | ${op.doc!"*n/a*"} | <#if op.parameters?has_content><#list op.parameters as p> ${p.name} of type ${getType(p.parameterType)} </#list> <#else> none </#if> | <#if op.returnType?has_content>${getType(op.returnType)}<#else>none</#if> | <#if op.stateTransition?has_content>: [<@stateTransitionMacro.renderStateTransition op.stateTransition />]</#if> |<#lt>
+        </#list>
+        </#if>
+        </#list>
+
         </#if>
 
         <#assign valueObjects = agg.domainObjects?filter(do -> instanceOf(do, ValueObject))>
         <#if valueObjects?has_content>
             #### Value Objects<#lt>
             <#list valueObjects as dob>
                 ##### ${dob.name}<#lt>
-                ${dob.hint!"[hint missing]"}<#lt>
+                ${dob.hint!"[no hint]"}<#lt>
 
                 <@attrOpsMacro.renderDomainObjectOperationsAndAttributes dob />
+
             </#list>
         </#if>
 
@@ -50,7 +63,7 @@
             #### Enumerations (Enums)<#lt>
             <#list enums as dob>
                 ##### ${dob.name}<#lt>
-                ${dob.hint!"[hint missing]"}<#lt>
+                ${dob.hint!"[no hint]"}<#lt>
 
                 Values:<#lt>
                 <#list dob.values as value>
@@ -68,7 +81,7 @@
                 <#elseif instanceOf(dob, CommandEvent)>
                     ##### ${dob.name} (CommandEvent)<#lt>
                 </#if>
-                ${dob.hint!"[hint missing]"}<#lt>
+                ${dob.hint!"[no hint]"}<#lt>
 
                 <@attrOpsMacro.renderDomainObjectOperationsAndAttributes dob />
             </#list>
@@ -82,21 +95,21 @@
             Services:<#lt>
 
             <#list bc.application.services as s>
-                * ${s.name}<#lt>. ${s.hint!"[hint missing]"}<#lt>
+                * ${s.name}<#lt>. ${s.hint!"[no hint]"}<#lt>
             </#list>
         </#if>
 
         <#if bc.application.events?has_content>
             Events:<#lt>
             <#list bc.application.events as event>
-            	* ${event.name}. ${event.hint!"[hint missing]"}<#lt>
+            	* ${event.name}. ${event.hint!"[no hint]"}<#lt>
             </#list>
         </#if>
 
         <#if bc.application.commands?has_content>
             Commands:<#lt>
             <#list bc.application.commands as command>
-            	* ${command.name}. ${command.hint!"[hint missing]"}<#lt>
+            	* ${command.name}. ${command.hint!"[no hint]"}<#lt>
             </#list>
         </#if>
 

org.contextmapper.dsl.ui/samples/freemarker/markdown-templates/domain-objects/domain-object-attribute-and-operation-tables.ftl

@@ -4,7 +4,7 @@
 <#macro renderDomainObjectOperationsAndAttributes simpleDomainObject>
     <#if simpleDomainObject.operations?has_content>
         Operations:<#lt>
-        | Operation | Doc string | Parameters | Return Type | State Transition |<#lt>
+        | Operation | Doc String | Parameters | Return Type | State Transition |<#lt>
         |-|-|-|-|-|<#lt>
         <#list simpleDomainObject.operations as op>
             | ${op.name} | ${op.doc!"*no doc string*"} | <#if op.parameters?has_content> <#list op.parameters as p> ${p.name} of type ${getType(p.parameterType)} </#list> <#else> none </#if> | <#if op.returnType?has_content>${getType(op.returnType)}<#else>none</#if> | <#if op.stateTransition?has_content>: [<@stateTransitionMacro.renderStateTransition op.stateTransition />]</#if> |<#lt>
@@ -13,7 +13,7 @@
 
     <#if simpleDomainObject.attributes?has_content>
         Attributes:<#lt>
-        | Attribute | Doc/doc string | Visibility | Type |<#lt>
+        | Attribute | Doc String | Visibility | Type |<#lt>
         |-|-|-|-|<#lt>
         <#list simpleDomainObject.attributes as attr>
             | ${attr.name} | ${attr.doc!"*no doc string*"} | ${attr.visibility} | ${attr.type} |<#lt>