Merge branch 'develop'

Author: fugerit79

docgen/parameters.json

@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "1.3.1-rc.003",
-	"date" : "18/07/2023",
+	"version" : "1.3.1-rc.004",
+	"date" : "19/07/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

docgen/release-notes.txt

@@ -1,4 +1,9 @@
-1.3.1-rc.003 (2023-07-18)
+1.3.1-rc.004 (2023-07-19)
+------------------
++ Fix chain parent handling
++ Fix xsd for attribute mapping of complex
+
+1.3.1-rc.003 (2023-07-18)
 ------------------
 + Freemarker html type handler converted to new configuration model
 + Configuration stub for freemarker configuration model

fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/tool/LegacyConfigRead.java

@@ -5,6 +5,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.fugerit.java.core.lang.helpers.StringUtils;
 import org.fugerit.java.doc.freemarker.config.FreeMarkerProcessStep;
 import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade;
 import org.fugerit.java.doc.freemarker.tool.model.ChainModel;
@@ -31,8 +32,12 @@ public static ConfigModel readConfig( InputStream is ) throws Exception {
 		for ( int k=0; k<chainTagList.getLength(); k++ ) {
 			Element currentChainTag = (Element) chainTagList.item( k );
 			String chainId = currentChainTag.getAttribute( "id" );
+			String extendsAtt = currentChainTag.getAttribute( "extends" );
 			log.info( "current chain id {}", chainId );
 			ChainModel chainModel = new ChainModel(chainId);
+			if ( StringUtils.isNotEmpty( extendsAtt ) ) {
+				chainModel.setParent( extendsAtt );
+			}
 			configModel.getChainList().add(chainModel);
 			NodeList stepTagList = currentChainTag.getElementsByTagName( "step" );
 			for ( int i=0; i<stepTagList.getLength(); i++ ) {

fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/tool/model/ChainModel.java

@@ -15,6 +15,8 @@ public class ChainModel implements Serializable {
 
 	private String id;
 
+	private String parent;
+	
 	public ChainModel( String id ) {
 		this.setId( id );
 		this.stepList = new ArrayList<>();

fj-doc-freemarker/src/main/resources/config_fm_xsd/freemarker-doc-process-1-0.xsd

@@ -6,7 +6,7 @@
 	 *
 	 * @project    : org.fugerit.java.doc.base
 	 * @creation   : 2023-07-12
-	 * @version    : 1.0.0-rc.002 (2023-07-13)
+	 * @version    : 1.0.0-rc.003 (2023-07-19)
 	 *
 	 * XSD for Freemarker Doc Process Configuration
 	 */
@@ -135,6 +135,11 @@
 				<xsd:documentation>Can be a java type value implementing DocProcessorBasic or a fixed value for 'config', 'map', 'function', 'complex'</xsd:documentation>
 			</xsd:annotation>		
 		</xsd:attribute>
+		<xsd:attribute name="map-atts" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation>Comma separated list of attributes to map or 'map-all' to map all attributes</xsd:documentation>
+			</xsd:annotation>		
+		</xsd:attribute>
 		<xsd:attribute name="template-path" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation>Free marker template path</xsd:documentation>

fj-doc-freemarker/src/main/resources/fj_doc_freemarker_config/template/freemarker-doc-process-config-stub.ftl

@@ -5,7 +5,7 @@
     xsi:schemaLocation="https://freemarkerdocprocess.fugerit.org https://www.fugerit.org/data/java/doc/xsd/freemarker-doc-process-1-0.xsd" > 	
 
 	<!--
-		Configuration stub version : 002 (2023-07-18)
+		Configuration stub version : 003 (2023-07-19)
 	-->
 
 	<#assign stubHandler=stubParams['stub-handler']!'1'>
@@ -109,7 +109,7 @@
 
 	<#if (configModel)??>
 		<#list configModel.chainList as chainModel>
-	<docChain id="${chainModel.id}">
+	<docChain id="${chainModel.id}"<#if (chainModel.parent)??> parent="${chainModel.parent}"</#if>>
 			<#list chainModel.stepList as stepModel>
 		<chainStep stepType="${stepModel.type}"<#if stepModel.type == 'complex'><#list stepModel.attNames as currentAttName> ${currentAttName}="${stepModel.atts[currentAttName]}"</#list></#if>>
 			<#if stepModel.type == 'map'>
@@ -122,6 +122,10 @@
 				${currentAttName}="${stepModel.atts[currentAttName]}"
 				</#list>
 			/>
+			<#elseif stepModel.type == 'function'>
+			<#list stepModel.attNames as currentAttName>
+			<function name="${currentAttName}" value="${stepModel.atts[currentAttName]}"/>
+			</#list>			
 			<#elseif stepModel.type == 'complex'>
 			<#else>
 			<!-- custom step, additional configuration may be needed -->

fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateHelperTool.java

@@ -0,0 +1,12 @@
+package test.org.fugerit.java.doc.tool;
+
+import org.junit.Test;
+
+public class TestGenerateHelperTool extends TestDocTool {
+	
+	@Test
+	public void testGenerateHelper() {
+		this.docToolWorker( "src/test/resources/params-test/test-generate-helper.properties" );
+	}
+	
+}

fj-doc-tool/src/test/resources/params-test/test-generate-helper.properties

@@ -0,0 +1,8 @@
+# test params for generate stub
+tool=generate-stub
+input=src/test/resources/convert-config-test/doc-process-sample.xml
+output=target/sample-new-process-config.xml
+enable-opencsv=1
+enable-fop-base=1
+enable-fop-full=0
+enable-poi=1