Managing of unsafe DocTypeHandler for DocHandlerFactory #31

Author: fugerit79

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;

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>

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 );
+		}
+	}
+	
+}

pom.xml

@@ -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>