1.4.4-rc.001 (2023-08-10)

+ [fj-doc-lib-simpletable] Fix on simple table special characters + [fj-doc-lib-simpletable] Fix DocTypeHandlerXML rendering for simple table
fugerit-org · Aug 10, 2023 · e097180 · e097180
1 parent d70fa53
commit e097180
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 29 deletions.
diff --git a/docgen/parameters.json b/docgen/parameters.json
@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "1.4.3-rc.001",
-	"date" : "02/08/2023",
+	"version" : "1.4.4-rc.001",
+	"date" : "10/08/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,9 @@
-1.4.3-rc.001 (2023-08-02)
+1.4.4-rc.001 (2023-08-10)
+------------------
++ [fj-doc-lib-simpletable] Fix on simple table special characters
++ [fj-doc-lib-simpletable] Fix DocTypeHandlerXML rendering for simple table
+
+1.4.3-rc.001 (2023-08-02)
 ------------------
 + Updated freemarker version to 2.3.32
 

diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-base-json</name>

diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-base-yaml</name>

diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-base</name>

diff --git a/fj-doc-bom-core/pom.xml b/fj-doc-bom-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-bom-core</name>

diff --git a/fj-doc-bom-fop/pom.xml b/fj-doc-bom-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-bom-fop</name>

diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>

diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-lib-autodoc</name>

diff --git a/fj-doc-lib-simpletable-import/pom.xml b/fj-doc-lib-simpletable-import/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable-import</name>

diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable</name>

diff --git a/...-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java b/...-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java
@@ -48,8 +48,7 @@ public void processSimpleTable(  SimpleTable simpleTableModel, DocTypeHandler ha
 			DocProcessData data = new DocProcessData();
 			DocProcessContext context = DocProcessContext.newContext( SimpleTable.ATT_NAME, simpleTableModel );
 			process( CHAIN_ID_SIMPLE_TABLE , context, data );
-			DocBase docBase = DocFacade.parse( data.getCurrentXmlReader() );
-			DocInput docInput = DocInput.newInput( handler.getType() , docBase );
+			DocInput docInput = DocInput.newInput( handler.getType() , data.getCurrentXmlReader() );
 			DocOutput docOutput = DocOutput.newOutput( os );
 			handler.handle( docInput , docOutput );
 		} catch (Exception e) {

diff --git a/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl b/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl
@@ -23,7 +23,7 @@
 			<#list simpleTableModel.rows as simpleRow>
        		<row header="${simpleRow.head}">
        			<#list simpleRow.cells as simpleCell>
-    			<cell <#if (simpleCell.align)?? > align="${simpleCell.align}" </#if> border-width="${simpleCell.borderWidth}"><para <#if (simpleCell.style)?? > style="${simpleCell.style}" </#if>  ><#if (simpleCell.content)??>${simpleCell.content}</#if></para></cell>
+    			<cell <#if (simpleCell.align)?? > align="${simpleCell.align}" </#if> border-width="${simpleCell.borderWidth}"><para <#if (simpleCell.style)?? > style="${simpleCell.style}" </#if>  ><#if (simpleCell.content)??><![CDATA[${simpleCell.content}]]></#if></para></cell>
     			</#list>  
     		</row>
 			</#list>   		

diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>

diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-opencsv</name>

diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</name>

diff --git a/fj-doc-mod-poi5/pom.xml b/fj-doc-mod-poi5/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-poi5</name>

diff --git a/fj-doc-playground-quarkus/pom.xml b/fj-doc-playground-quarkus/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 	<artifactId>fj-doc-playground-quarkus</artifactId>
 	<properties>

diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-sample</name>

diff --git a/...oc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java b/...oc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java
@@ -8,6 +8,7 @@
 import org.fugerit.java.core.cfg.ConfigException;
 import org.fugerit.java.core.lang.helpers.BooleanUtils;
 import org.fugerit.java.doc.base.config.DocTypeHandler;
+import org.fugerit.java.doc.base.config.DocTypeHandlerXML;
 import org.fugerit.java.doc.lib.simpletable.SimpleTableDocConfig;
 import org.fugerit.java.doc.lib.simpletable.SimpleTableFacade;
 import org.fugerit.java.doc.lib.simpletable.model.SimpleCell;
@@ -25,7 +26,7 @@
 @Slf4j
 public class TestSimpleTable  {
 
-	private static final DocTypeHandler[] HANDLERS = { XlsxPoiTypeHandler.HANDLER, OpenCSVTypeHandler.HANDLER, new PdfFopTypeHandler() };
+	private static final DocTypeHandler[] HANDLERS = { DocTypeHandlerXML.HANDLER_UTF8, XlsxPoiTypeHandler.HANDLER, OpenCSVTypeHandler.HANDLER, new PdfFopTypeHandler() };
 
 	private SimpleTableDocConfig docConfig;
 
@@ -58,7 +59,11 @@ public void testSimpleTable01() {
 		thorinRow.addCell( "Thorin" );
 		thorinRow.addCell( "Oakshield" );
 		thorinRow.addCell( SimpleCell.newCell( "King" ).bold().center() );
-		simpleTableModel.addRow( thorinRow );
+		SimpleRow lastRow = new SimpleRow();
+		lastRow.addCell( "Bilbo" );
+		lastRow.addCell( "Baggins" );
+		lastRow.addCell( SimpleCell.newCell( "<Hero>" ).bold().center() );
+		simpleTableModel.addRow( lastRow );
 		for ( int k=0; k<HANDLERS.length; k++ ) {
 			DocTypeHandler handler = HANDLERS[k];
 			File file = new File( this.baseDir, "simple_table_01."+handler.getType() );

diff --git a/fj-doc-tool/pom.xml b/fj-doc-tool/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-tool</name>

diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val-core</name>

diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val-pdfbox</name>

diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val-poi</name>

diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.4.3-rc.001</version>
+		<version>1.4.4-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val</name>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>fj-doc</artifactId>
 
-	<version>1.4.3-rc.001</version>
+	<version>1.4.4-rc.001</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>