Merge pull request #30 from fugerit-org/feature/issue_29

mttfranci · web-flow · commit 1af982ee8ef1 · 2023-02-20T21:40:26.000+01:00
Feature/issue 29
diff --git a/docgen/parameters.json b/docgen/parameters.json
@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.8.8",
-	"date" : "11/02/2023",
+	"version" : "0.8.9",
+	"date" : "20/02/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,11 @@
-﻿0.8.8 (2023-02-11)
+﻿0.8.9 (2023-02-20)
+------------------
++ [Upgraded quarkus version to 3.0.0.Alpha4](https://github.com/fugerit-org/fj-doc/issues/29)
++ Fix chatset handling for csv type handler
++ Fix to alternate text for json and yaml sample
+
+
+0.8.8 (2023-02-11)
 ------------------
 + [Fix javadoc build for java 17](https://github.com/fugerit-org/fj-doc/issues/26)
 + [Jackson core need to be upgraded 2.14.1](https://github.com/fugerit-org/fj-doc/issues/9)
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>0.8.8</version>
+		<version>0.8.9</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>0.8.8</version>
+		<version>0.8.9</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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-base</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>0.8.8</version>
+		<version>0.8.9</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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-lib-autodoc</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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable</name>
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>0.8.8</version>
+		<version>0.8.9</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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-mod-opencsv</name>
diff --git a/fj-doc-mod-opencsv/src/main/java/org/fugerit/java/doc/mod/opencsv/OpenCSVTypeHandler.java b/fj-doc-mod-opencsv/src/main/java/org/fugerit/java/doc/mod/opencsv/OpenCSVTypeHandler.java
@@ -1,9 +1,12 @@
 package org.fugerit.java.doc.mod.opencsv;
 
 import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.fugerit.java.doc.base.config.DocInput;
 import org.fugerit.java.doc.base.config.DocOutput;
+import org.fugerit.java.doc.base.config.DocTypeHandler;
 import org.fugerit.java.doc.base.config.DocTypeHandlerDefault;
 import org.fugerit.java.doc.base.model.DocBase;
 import org.fugerit.java.doc.base.model.DocCell;
@@ -33,14 +36,20 @@ public class OpenCSVTypeHandler extends DocTypeHandlerDefault {
 
 	public static final OpenCSVTypeHandler HANDLER = new OpenCSVTypeHandler();
 	
+	public static final DocTypeHandler HANDLER_UTF8 = new OpenCSVTypeHandler( StandardCharsets.UTF_8 );
+	
+	public OpenCSVTypeHandler( Charset charset ) {
+		super(TYPE_CSV, MODULE, MIME, charset);
+	}
+	
 	public OpenCSVTypeHandler() {
-		super(TYPE_CSV, MODULE, MIME);
+		this(null);
 	}
 	
 	@Override
 	public void handle(DocInput docInput, DocOutput docOutput) throws Exception {
  		DocBase docBase = docInput.getDoc();
-		CSVWriter writer = new CSVWriter( new OutputStreamWriter( docOutput.getOs() ) );
+		CSVWriter writer = new CSVWriter( new OutputStreamWriter( docOutput.getOs(), this.getCharset()  ) );
 		String csvTableId = docBase.getInfo().getProperty( CsvHelperConsts.PROP_CSV_TABLE_ID );
 		DocTable table = (DocTable)docBase.getElementById( csvTableId );
 		if ( table == null ) {
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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 	<artifactId>fj-doc-playground-quarkus</artifactId>
 	<properties>
@@ -15,7 +15,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
 		<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-		<quarkus.platform.version>3.0.0.Alpha2</quarkus.platform.version>
+		<quarkus.platform.version>3.0.0.Alpha4</quarkus.platform.version>
 		<skipITs>true</skipITs>
 		<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
 		<!-- front end runtime -->
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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-sample</name>
diff --git a/fj-doc-sample/src/main/resources/sample_docs/junit_base/intro_01.json b/fj-doc-sample/src/main/resources/sample_docs/junit_base/intro_01.json
@@ -8,6 +8,7 @@
 				{ "_t":"info", "name": "margins", "_v": "10;10;10;30" },
 				{ "_t":"info", "name": "excel-table-id", "_v": "excel-table=print" },
 				{ "_t":"info", "name": "excel-width-multiplier", "_v": "450" },
+				{ "_t":"info", "name": "doc-language", "_v": "en" },
 				{
 					"_t": "footer-ext",
 					"_e": [
@@ -30,10 +31,10 @@
 				{ "_t": "para", "align": "center", "_v": "Test phrase 02" },
 				{ "_t": "para", "align": "center", "_v": "Test phrase 03" },
 				{ "_t": "para", "align": "center", "_v": "Test phrase 04" },
-				{ "_t": "image", "url": "cl://test/img_test_red.png", "scaling": "100" },
-				{ "_t": "image", "url": "cl://test/img_test_green.png", "scaling": "50" },
-				{ "_t": "image", "url": "cl://test/img_test_blue.png", "scaling": "25" },
-				{ "_t": "image", "scaling": "25", "base64": "iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABmJLR0QAAADwAK8K7nbWAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4wscFhE4Umte9gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAACrklEQVRYw+2YzUtUURjGf+fOnTt+jI5WmJo5AwpBWoaJWQlCEAlhuJBIoYUaEgRtgvoTIlq1CVTIWkphBkZEVkZln2CFLWrTjKBCg+GMH9PMuXdOC1NRRyOtwcV94G7e8z6X3z0vzzlwBZN3FZtYGptcNqANaAPagDagDWgDbjLAw1o2ylPPVVfJipry1NOeUpbwRdsxiGXUoTz1PE+rTtjjUoKzTh/9aYf47q4lmlHHmPsY79JruJayhwNa1gqP/jdfMx2XNDoLuBAZZlpYS9ZaDC9xIBa3Enq9IpW+9CpKdc+Seh6p5JFKhZ7NeVcRvvBDAiqyvhF3y1HScdBkFCxdUIpWw0uPOUaMeMKd60ubg/tkhjg185b80AOck73khO5THn7CudkPvJITKKXWv4Pf4jM8soK0GT46ZGChflTPocjhpjUyRJ2eu8LXbHgp1T0MygmOzLwgKn5DCAgiCSrJkAxzXfo3HpKOqJ/9ejbl2uKo2gwfX8wpnlkTCT0NznwALv4cXoT7Xym+Z44zbkVoM3wA5GBwQs+lM+Zf1VOqZRKJmwxaP5bUy0TmQvjmn0tG8cYALQFdcoRG5w7SlUazUYgCbsqRVT2ZQiekJEqI5JyDnTE/bnSajJ2cMXz0mGNMIFftDysTj3AilgXgowojQr2IUC+10y//HaBfRei3glxO2U2xw03HGuMFGI6HSdV0Djq2JO8maY/62aq5+GpOMbBKOOZ1R44BcCWlBEOJ5AD2WOOIUC+7Zh7/sbcrFuCzGaLauY037hpO6vnk4cKhIBudSi2L00bh3JG6kZtkvYoKxfHZ1/SlVbFPz6Jbr0zY91QGuRELJB8QIKAiVEwP0GJ4aXDms1fz4BE6P5TkvTXJLTnCbTkKy5Iu7F8fNqANaAPagDagDWgDrqVfdVDxvDFGgDYAAAAASUVORK5CYII=" },
+				{ "_t": "image", "url": "cl://test/img_test_red.png", "scaling": "100", "alt":"Test image 1" },
+				{ "_t": "image", "url": "cl://test/img_test_green.png", "scaling": "50", "alt":"Test image 2" },
+				{ "_t": "image", "url": "cl://test/img_test_blue.png", "scaling": "25", "alt":"Test image 3" },
+				{ "_t": "image", "scaling": "25", "alt":"Test image 4", "base64": "iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABmJLR0QAAADwAK8K7nbWAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4wscFhE4Umte9gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAACrklEQVRYw+2YzUtUURjGf+fOnTt+jI5WmJo5AwpBWoaJWQlCEAlhuJBIoYUaEgRtgvoTIlq1CVTIWkphBkZEVkZln2CFLWrTjKBCg+GMH9PMuXdOC1NRRyOtwcV94G7e8z6X3z0vzzlwBZN3FZtYGptcNqANaAPagDagDWgDbjLAw1o2ylPPVVfJipry1NOeUpbwRdsxiGXUoTz1PE+rTtjjUoKzTh/9aYf47q4lmlHHmPsY79JruJayhwNa1gqP/jdfMx2XNDoLuBAZZlpYS9ZaDC9xIBa3Enq9IpW+9CpKdc+Seh6p5JFKhZ7NeVcRvvBDAiqyvhF3y1HScdBkFCxdUIpWw0uPOUaMeMKd60ubg/tkhjg185b80AOck73khO5THn7CudkPvJITKKXWv4Pf4jM8soK0GT46ZGChflTPocjhpjUyRJ2eu8LXbHgp1T0MygmOzLwgKn5DCAgiCSrJkAxzXfo3HpKOqJ/9ejbl2uKo2gwfX8wpnlkTCT0NznwALv4cXoT7Xym+Z44zbkVoM3wA5GBwQs+lM+Zf1VOqZRKJmwxaP5bUy0TmQvjmn0tG8cYALQFdcoRG5w7SlUazUYgCbsqRVT2ZQiekJEqI5JyDnTE/bnSajJ2cMXz0mGNMIFftDysTj3AilgXgowojQr2IUC+10y//HaBfRei3glxO2U2xw03HGuMFGI6HSdV0Djq2JO8maY/62aq5+GpOMbBKOOZ1R44BcCWlBEOJ5AD2WOOIUC+7Zh7/sbcrFuCzGaLauY037hpO6vnk4cKhIBudSi2L00bh3JG6kZtkvYoKxfHZ1/SlVbFPz6Jbr0zY91QGuRELJB8QIKAiVEwP0GJ4aXDms1fz4BE6P5TkvTXJLTnCbTkKy5Iu7F8fNqANaAPagDagDWgDrqVfdVDxvDFGgDYAAAAASUVORK5CYII=" },
 				{
 					"_t":"table",
 					"columns":"3",
diff --git a/fj-doc-sample/src/main/resources/sample_docs/junit_base/intro_01.yaml b/fj-doc-sample/src/main/resources/sample_docs/junit_base/intro_01.yaml
@@ -12,6 +12,9 @@ _e:
   - _t: info
     name: excel-width-multiplier
     _v: '450'
+  - _t: info
+    name: doc-language
+    _v: 'en'
   - _t: footer-ext
     _e:
     - _t: para
@@ -30,12 +33,15 @@ _e:
   - _t: image
     url: cl://test/img_test_red.png
     scaling: '100'
+    alt: 'Test image 1'
   - _t: image
     url: cl://test/img_test_green.png
     scaling: '50'
+    alt: 'Test image 2'
   - _t: image
     url: cl://test/img_test_blue.png
     scaling: '25'
+    alt: 'Test image 3'
   - _t: table
     columns: '3'
     colwidths: 30;30;40
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>0.8.8</version>
+		<version>0.8.9</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>0.8.8</version>
+		<version>0.8.9</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>0.8.8</version>
+		<version>0.8.9</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>0.8.8</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-val</name>
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>fj-doc</artifactId>
 
-	<version>0.8.8</version>
+	<version>0.8.9</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>
