Skip to content

Commit 07d15e1

Browse files
fugerit79fugerit79
authored
Merge pull request #32 from fugerit-org/feature/issue_31_unsface
Feature/issue 31 unsface
2 parents 1af982e + 279a7f6 commit 07d15e1

File tree

21 files changed

+70
-28
lines changed

21 files changed

+70
-28
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.9",
5-
"date" : "20/02/2023",
4+
"version" : "0.8.10",
5+
"date" : "26/02/2023",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

‎docgen/release-notes.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
0.8.9 (2023-02-20)
1+
0.8.10 (2023-02-26)
2+
------------------
3+
+ [Managing of unsafe DocTypeHandler for DocHandlerFactory](https://github.com/fugerit-org/fj-doc/issues/31)
4+
+ update fj-core version to 0.8.13 (DocHandlerFactory would not work with previous versions)
5+
6+
0.8.9 (2023-02-20)
27
------------------
38
+ [Upgraded quarkus version to 3.0.0.Alpha4](https://github.com/fugerit-org/fj-doc/issues/29)
49
+ Fix chatset handling for csv type handler
510
+ Fix to alternate text for json and yaml sample
611

7-
812
0.8.8 (2023-02-11)
913
------------------
1014
+ [Fix javadoc build for java 17](https://github.com/fugerit-org/fj-doc/issues/26)
1115
+ [Jackson core need to be upgraded 2.14.1](https://github.com/fugerit-org/fj-doc/issues/9)
1216
+ update fj-core version to 0.8.12
1317

14-
1518
0.8.7 (2023-02-08)
1619
------------------
1720
+ [Fix Javadoc generations with older versions of jdk 11 fails](https://github.com/fugerit-org/fj-doc/issues/24)

‎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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</version>
1111
</parent>
1212

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

‎fj-doc-base/src/main/java/org/fugerit/java/doc/base/facade/DocHandlerFactory.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
import java.util.Collection;
55
import java.util.HashMap;
66

7-
import org.fugerit.java.core.cfg.ConfigurableObject;
87
import org.fugerit.java.core.cfg.xml.FactoryCatalog;
98
import org.fugerit.java.core.cfg.xml.FactoryType;
9+
import org.fugerit.java.core.cfg.xml.FactoryTypeHelper;
1010
import org.fugerit.java.core.io.helper.StreamHelper;
11-
import org.fugerit.java.core.lang.helpers.ClassHelper;
1211
import org.fugerit.java.doc.base.config.DocTypeHandler;
12+
import org.slf4j.Logger;
13+
import org.slf4j.LoggerFactory;
1314

1415
public class DocHandlerFactory extends HashMap<String, DocHandlerFacade> {
1516

@@ -22,6 +23,10 @@ public class DocHandlerFactory extends HashMap<String, DocHandlerFacade> {
2223

2324
private String useCatalog;
2425

26+
private final static Logger logger = LoggerFactory.getLogger( DocHandlerFactory.class );
27+
28+
private static final FactoryTypeHelper<DocTypeHandler> HELPER = FactoryTypeHelper.newInstance( DocTypeHandler.class );
29+
2530
public static DocHandlerFacade register( String factoryCatalogPath ) throws Exception {
2631
return register( factoryCatalogPath, null );
2732
}
@@ -42,11 +47,12 @@ public static DocHandlerFacade register( Collection<FactoryType> col ) throws Ex
4247
if ( col != null ) {
4348
facade = new DocHandlerFacade();
4449
for ( FactoryType ft : col ) {
45-
DocTypeHandler handler = (DocTypeHandler) ClassHelper.newInstance( ft.getType() );
46-
if ( handler instanceof ConfigurableObject ) {
47-
((ConfigurableObject)handler).configure( ft.getElement());
50+
DocTypeHandler handler = HELPER.createHelper( ft );
51+
if ( handler != null ) {
52+
facade.registerHandler( handler );
53+
} else {
54+
logger.info( "skipped null handler for -> {}", ft );
4855
}
49-
facade.registerHandler( handler );
5056
}
5157
}
5258
return facade;

‎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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</version>
1111
</parent>
1212

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

‎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.9</version>
10+
<version>0.8.10</version>
1111
</parent>
1212

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

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

Lines changed: 1 addition & 1 deletion
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.9</version>
7+
<version>0.8.10</version>
88
</parent>
99
<artifactId>fj-doc-playground-quarkus</artifactId>
1010
<properties>

‎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.9</version>
10+
<version>0.8.10</version>
1111
</parent>
1212

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

‎fj-doc-sample/src/main/resources/config/doc-handler-sample.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,11 @@
3131
<data id="html-fragment-fm" info="fhtml" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandlerUTF8" />
3232
<data id="csv-opencsv" info="csv" type="org.fugerit.java.doc.mod.opencsv.OpenCSVTypeHandler"/>
3333
</factory>
34+
35+
<factory id="unsafe-test">
36+
<data id="html-fm" info="html" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandlerUTF8" />
37+
<data id="html-fragment-fm" info="fhtml" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandlerUTF8" />
38+
<data id="pdf-unsafe" info="pdf" type="org.fugerit.java.doc.pdf.UnsafeDocHandler" unsafe="true" unsafeMode="log-trace"/>
39+
</factory>
3440

3541
</doc-handler-config>

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package test.org.fugerit.java.doc.sample.config;
2+
3+
import static org.junit.Assert.fail;
4+
5+
import org.fugerit.java.doc.base.facade.DocHandlerFactory;
6+
import org.junit.Test;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
10+
public class TestDocHandlerFactory {
11+
12+
private final static Logger logger = LoggerFactory.getLogger( TestDocHandlerFactory.class );
13+
14+
@Test
15+
public void initDocFactoryTest() {
16+
try {
17+
String path = "cl://config/doc-handler-sample.xml";
18+
DocHandlerFactory factory = DocHandlerFactory.newInstance( path );
19+
logger.info( "factory {}", factory );
20+
} catch (Throwable t) {
21+
String message = "Error : "+t;
22+
logger.error( message, t );
23+
fail( message );
24+
}
25+
}
26+
27+
}

‎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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</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.9</version>
10+
<version>0.8.10</version>
1111
</parent>
1212

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

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

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

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

1717
<name>fj-doc</name>
@@ -24,7 +24,7 @@
2424
<maven.compiler.source>${java-version-compliance}</maven.compiler.source>
2525
<maven.compiler.target>${java-version-compliance}</maven.compiler.target>
2626
<!-- fj java versions -->
27-
<fj-version>0.8.12</fj-version>
27+
<fj-version>0.8.13</fj-version>
2828
<fj-doc-version>${project.version}</fj-doc-version>
2929
<jackson-version>2.14.2</jackson-version>
3030
</properties>

0 commit comments

Comments
 (0)