Merge pull request #32 from fugerit-org/feature/issue_31_unsface

fugerit79 · web-flow · commit 07d15e1db415 · 2023-02-26T14:12:21.000+01:00
Feature/issue 31 unsface
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.9",
-	"date" : "20/02/2023",
+	"version" : "0.8.10",
+	"date" : "26/02/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,17 +1,20 @@
-﻿0.8.9 (2023-02-20)
+﻿0.8.10 (2023-02-26)
+------------------
++ [Managing of unsafe DocTypeHandler for DocHandlerFactory](https://github.com/fugerit-org/fj-doc/issues/31)
++ update fj-core version to 0.8.13 (DocHandlerFactory would not work with previous versions)
+
+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)
 + update fj-core version to 0.8.12
 
-
 0.8.7 (2023-02-08)
 ------------------
 + [Fix Javadoc generations with older versions of jdk 11 fails](https://github.com/fugerit-org/fj-doc/issues/24)
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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</version>
 	</parent>
 
 	<name>fj-doc-base</name>
diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/facade/DocHandlerFactory.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/facade/DocHandlerFactory.java
@@ -4,12 +4,13 @@
 import java.util.Collection;
 import java.util.HashMap;
 
-import org.fugerit.java.core.cfg.ConfigurableObject;
 import org.fugerit.java.core.cfg.xml.FactoryCatalog;
 import org.fugerit.java.core.cfg.xml.FactoryType;
+import org.fugerit.java.core.cfg.xml.FactoryTypeHelper;
 import org.fugerit.java.core.io.helper.StreamHelper;
-import org.fugerit.java.core.lang.helpers.ClassHelper;
 import org.fugerit.java.doc.base.config.DocTypeHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DocHandlerFactory extends HashMap<String, DocHandlerFacade> {
 	
@@ -22,6 +23,10 @@ public class DocHandlerFactory extends HashMap<String, DocHandlerFacade> {
 	
 	private String useCatalog;
 	
+	private final static Logger logger = LoggerFactory.getLogger( DocHandlerFactory.class );
+	
+	private static final FactoryTypeHelper<DocTypeHandler> HELPER = FactoryTypeHelper.newInstance( DocTypeHandler.class );
+	
 	public static DocHandlerFacade register( String factoryCatalogPath ) throws Exception {
 		return register( factoryCatalogPath, null );
 	}
@@ -42,11 +47,12 @@ public static DocHandlerFacade register( Collection<FactoryType> col ) throws Ex
 		if ( col != null ) {
 			facade = new DocHandlerFacade();
 			for ( FactoryType ft : col ) {
-				DocTypeHandler handler = (DocTypeHandler) ClassHelper.newInstance( ft.getType() );
-				if ( handler instanceof ConfigurableObject ) {
-					((ConfigurableObject)handler).configure( ft.getElement());
+				DocTypeHandler handler = HELPER.createHelper( ft );
+				if ( handler != null ) {
+					facade.registerHandler( handler );
+				} else {
+					logger.info( "skipped null handler for -> {}", ft );
 				}
-				facade.registerHandler( handler );
 			}
 		}
 		return facade;
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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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>0.8.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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>0.8.9</version>
+		<version>0.8.10</version>
 	</parent>
 
 	<name>fj-doc-sample</name>
diff --git a/fj-doc-sample/src/main/resources/config/doc-handler-sample.xml b/fj-doc-sample/src/main/resources/config/doc-handler-sample.xml
@@ -31,5 +31,11 @@
 		<data id="html-fragment-fm" info="fhtml" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandlerUTF8" />
 		<data id="csv-opencsv" info="csv" type="org.fugerit.java.doc.mod.opencsv.OpenCSVTypeHandler"/>		
 	</factory>
+	
+	<factory id="unsafe-test">
+		<data id="html-fm" info="html" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandlerUTF8" />	
+		<data id="html-fragment-fm" info="fhtml" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandlerUTF8" />
+		<data id="pdf-unsafe" info="pdf" type="org.fugerit.java.doc.pdf.UnsafeDocHandler" unsafe="true" unsafeMode="log-trace"/>
+	</factory>
 
 </doc-handler-config>
diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java
@@ -0,0 +1,27 @@
+package test.org.fugerit.java.doc.sample.config;
+
+import static org.junit.Assert.fail;
+
+import org.fugerit.java.doc.base.facade.DocHandlerFactory;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestDocHandlerFactory {
+
+	private final static Logger logger = LoggerFactory.getLogger( TestDocHandlerFactory.class );
+	
+	@Test
+	public void initDocFactoryTest() {
+		try {
+			String path = "cl://config/doc-handler-sample.xml";
+			DocHandlerFactory factory = DocHandlerFactory.newInstance( path );
+			logger.info( "factory {}", factory );
+		} catch (Throwable t) {
+			String message = "Error : "+t;
+			logger.error( message, t );
+			fail( message );
+		}
+	}
+	
+}
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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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.9</version>
+		<version>0.8.10</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.9</version>
+	<version>0.8.10</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>
@@ -24,7 +24,7 @@
 	    <maven.compiler.source>${java-version-compliance}</maven.compiler.source>
 	    <maven.compiler.target>${java-version-compliance}</maven.compiler.target>
 	    <!-- fj java versions -->
-	    <fj-version>0.8.12</fj-version>
+	    <fj-version>0.8.13</fj-version>
 	    <fj-doc-version>${project.version}</fj-doc-version>
 	    <jackson-version>2.14.2</jackson-version>
 	</properties>
