Skip to content

Commit 1af982e

Browse files
mttfrancimttfranci
authored
Merge pull request #30 from fugerit-org/feature/issue_29
Feature/issue 29
2 parents fdcfaf5 + a064478 commit 1af982e

File tree

21 files changed

+49
-26
lines changed

21 files changed

+49
-26
lines changed

‎docgen/parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "0.8.8",
5-
"date" : "11/02/2023",
4+
"version" : "0.8.9",
5+
"date" : "20/02/2023",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

‎docgen/release-notes.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
0.8.8 (2023-02-11)
1+
0.8.9 (2023-02-20)
2+
------------------
3+
+ [Upgraded quarkus version to 3.0.0.Alpha4](https://github.com/fugerit-org/fj-doc/issues/29)
4+
+ Fix chatset handling for csv type handler
5+
+ Fix to alternate text for json and yaml sample
6+
7+
8+
0.8.8 (2023-02-11)
29
------------------
310
+ [Fix javadoc build for java 17](https://github.com/fugerit-org/fj-doc/issues/26)
411
+ [Jackson core need to be upgraded 2.14.1](https://github.com/fugerit-org/fj-doc/issues/9)

‎fj-doc-base-json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-base-json</name>

‎fj-doc-base-yaml/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-base-yaml</name>

‎fj-doc-base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-base</name>

‎fj-doc-freemarker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-freemarker</name>

‎fj-doc-lib-autodoc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-autodoc</name>

‎fj-doc-lib-simpletable/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-simpletable</name>

‎fj-doc-mod-fop/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-fop</name>

‎fj-doc-mod-opencsv/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-opencsv</name>

‎fj-doc-mod-opencsv/src/main/java/org/fugerit/java/doc/mod/opencsv/OpenCSVTypeHandler.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package org.fugerit.java.doc.mod.opencsv;
22

33
import java.io.OutputStreamWriter;
4+
import java.nio.charset.Charset;
5+
import java.nio.charset.StandardCharsets;
46

57
import org.fugerit.java.doc.base.config.DocInput;
68
import org.fugerit.java.doc.base.config.DocOutput;
9+
import org.fugerit.java.doc.base.config.DocTypeHandler;
710
import org.fugerit.java.doc.base.config.DocTypeHandlerDefault;
811
import org.fugerit.java.doc.base.model.DocBase;
912
import org.fugerit.java.doc.base.model.DocCell;
@@ -33,14 +36,20 @@ public class OpenCSVTypeHandler extends DocTypeHandlerDefault {
3336

3437
public static final OpenCSVTypeHandler HANDLER = new OpenCSVTypeHandler();
3538

39+
public static final DocTypeHandler HANDLER_UTF8 = new OpenCSVTypeHandler( StandardCharsets.UTF_8 );
40+
41+
public OpenCSVTypeHandler( Charset charset ) {
42+
super(TYPE_CSV, MODULE, MIME, charset);
43+
}
44+
3645
public OpenCSVTypeHandler() {
37-
super(TYPE_CSV, MODULE, MIME);
46+
this(null);
3847
}
3948

4049
@Override
4150
public void handle(DocInput docInput, DocOutput docOutput) throws Exception {
4251
DocBase docBase = docInput.getDoc();
43-
CSVWriter writer = new CSVWriter( new OutputStreamWriter( docOutput.getOs() ) );
52+
CSVWriter writer = new CSVWriter( new OutputStreamWriter( docOutput.getOs(), this.getCharset() ) );
4453
String csvTableId = docBase.getInfo().getProperty( CsvHelperConsts.PROP_CSV_TABLE_ID );
4554
DocTable table = (DocTable)docBase.getElementById( csvTableId );
4655
if ( table == null ) {

‎fj-doc-mod-poi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-poi</name>

‎fj-doc-playground-quarkus/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.fugerit.java</groupId>
66
<artifactId>fj-doc</artifactId>
7-
<version>0.8.8</version>
7+
<version>0.8.9</version>
88
</parent>
99
<artifactId>fj-doc-playground-quarkus</artifactId>
1010
<properties>
@@ -15,7 +15,7 @@
1515
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1616
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1717
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
18-
<quarkus.platform.version>3.0.0.Alpha2</quarkus.platform.version>
18+
<quarkus.platform.version>3.0.0.Alpha4</quarkus.platform.version>
1919
<skipITs>true</skipITs>
2020
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
2121
<!-- front end runtime -->

‎fj-doc-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-sample</name>

‎fj-doc-sample/src/main/resources/sample_docs/junit_base/intro_01.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
{ "_t":"info", "name": "margins", "_v": "10;10;10;30" },
99
{ "_t":"info", "name": "excel-table-id", "_v": "excel-table=print" },
1010
{ "_t":"info", "name": "excel-width-multiplier", "_v": "450" },
11+
{ "_t":"info", "name": "doc-language", "_v": "en" },
1112
{
1213
"_t": "footer-ext",
1314
"_e": [
@@ -30,10 +31,10 @@
3031
{ "_t": "para", "align": "center", "_v": "Test phrase 02" },
3132
{ "_t": "para", "align": "center", "_v": "Test phrase 03" },
3233
{ "_t": "para", "align": "center", "_v": "Test phrase 04" },
33-
{ "_t": "image", "url": "cl://test/img_test_red.png", "scaling": "100" },
34-
{ "_t": "image", "url": "cl://test/img_test_green.png", "scaling": "50" },
35-
{ "_t": "image", "url": "cl://test/img_test_blue.png", "scaling": "25" },
36-
{ "_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=" },
34+
{ "_t": "image", "url": "cl://test/img_test_red.png", "scaling": "100", "alt":"Test image 1" },
35+
{ "_t": "image", "url": "cl://test/img_test_green.png", "scaling": "50", "alt":"Test image 2" },
36+
{ "_t": "image", "url": "cl://test/img_test_blue.png", "scaling": "25", "alt":"Test image 3" },
37+
{ "_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=" },
3738
{
3839
"_t":"table",
3940
"columns":"3",

‎fj-doc-sample/src/main/resources/sample_docs/junit_base/intro_01.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ _e:
1212
- _t: info
1313
name: excel-width-multiplier
1414
_v: '450'
15+
- _t: info
16+
name: doc-language
17+
_v: 'en'
1518
- _t: footer-ext
1619
_e:
1720
- _t: para
@@ -30,12 +33,15 @@ _e:
3033
- _t: image
3134
url: cl://test/img_test_red.png
3235
scaling: '100'
36+
alt: 'Test image 1'
3337
- _t: image
3438
url: cl://test/img_test_green.png
3539
scaling: '50'
40+
alt: 'Test image 2'
3641
- _t: image
3742
url: cl://test/img_test_blue.png
3843
scaling: '25'
44+
alt: 'Test image 3'
3945
- _t: table
4046
columns: '3'
4147
colwidths: 30;30;40

‎fj-doc-val-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-val-core</name>

‎fj-doc-val-pdfbox/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-val-pdfbox</name>

‎fj-doc-val-poi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-val-poi</name>

‎fj-doc-val/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.8.8</version>
10+
<version>0.8.9</version>
1111
</parent>
1212

1313
<name>fj-doc-val</name>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<artifactId>fj-doc</artifactId>
1313

14-
<version>0.8.8</version>
14+
<version>0.8.9</version>
1515
<packaging>pom</packaging>
1616

1717
<name>fj-doc</name>

0 commit comments

Comments
 (0)