[freemarker] new fullProcess() by handler id method

[base] new findHandlerRequired() method

Author: fugerit79

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- [base] new findHandlerRequired() method
+- [freemarker] new fullProcess() by handler id method
 - [freemarker] added load-bundled-functions property
 - [freemarker] Changed latest freemarker constant to 2.3.33
 - [playground-quarkus] quarkus-version set to 3.13.2

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

@@ -9,6 +9,7 @@
 
 import org.fugerit.java.core.cfg.ConfigException;
 import org.fugerit.java.core.cfg.ConfigRuntimeException;
+import org.fugerit.java.core.lang.helpers.StringUtils;
 import org.fugerit.java.core.util.ObjectUtils;
 import org.fugerit.java.core.util.collection.ListMapStringKey;
 import org.fugerit.java.doc.base.config.DocInput;
@@ -117,7 +118,23 @@ public void registerHandlerAndId( String id, DocTypeHandler handler, boolean all
 	public void registerHandler( DocTypeHandler handler ) throws Exception {
 		this.registerHandler( handler, DEFAULT_REGISTER_FOR_TYPE, DEFAULT_ERROR_ON_DUPLICATE );
 	}
-	
+
+	/**
+	 * Handler lookup by id, throws a ConfigRuntimeException if not found.
+	 *
+	 * @param handlerId		the id of the handler
+	 * @return				the handler
+	 * throws ConfigRuntimeException if the handler is not found
+	 */
+	public DocTypeHandler findHandlerRequired( String handlerId ) {
+		DocTypeHandler handler = this.findHandler( handlerId );
+		if ( handler == null ) {
+			throw new ConfigRuntimeException( String.format( "No handler found for id %s, available handler ids are : %s", handlerId, StringUtils.concat( ", ", this.mapHandlers.keySet() ) ) );
+		} else {
+			return handler;
+		}
+	}
+
 	public void handle( DocInput docInput, DocOutput docOutput ) throws Exception {
 		String type = docInput.getType();
 		DocTypeHandler handler = this.mapHandlers.get( type );

fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFacade.java

@@ -62,6 +62,8 @@ public void testDocFacade() throws Exception {
 		DocHandlerFactory.register( new FactoryCatalog() );
 		Assert.assertFalse( facade.listHandlersForType( SimpleMarkdownBasicTypeHandler.HANDLER.getType() ).isEmpty() );
 		facade.logHandlersInfo();
+		// handler not found
+		Assert.assertThrows( ConfigRuntimeException.class, () -> facade.findHandlerRequired( "not-found" ) );
 	}
 
 	@Test

fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java

@@ -6,6 +6,7 @@
 import java.util.Set;
 
 import org.fugerit.java.core.cfg.xml.ListMapConfig;
+import org.fugerit.java.core.function.SafeFunction;
 import org.fugerit.java.core.util.filterchain.MiniFilterChain;
 import org.fugerit.java.core.util.filterchain.MiniFilterMap;
 import org.fugerit.java.core.xml.sax.SAXParseResult;
@@ -52,7 +53,11 @@ protected void setDefaultChain( DefaultChainProvider defaultChain ) {
 	protected DefaultChainProvider getDefaultChain() {
 		return this.defaultChain;
 	}
-	
+
+	public DocProcessData fullProcess( String chainId, DocProcessContext context, String handlerId, DocOutput docOutput ) {
+		return SafeFunction.get( () -> this.fullProcess( chainId, context, this.facade.findHandlerRequired( handlerId ), docOutput ) );
+	}
+
 	public DocProcessData fullProcess( String chainId, DocProcessContext context, DocTypeHandler handler, DocOutput docOutput ) throws Exception {
 		DocProcessData data = new DocProcessData();
 		this.process(chainId, context, data);

fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java

@@ -135,10 +135,11 @@ public void testNewSimpleConfigVersion() {
 	public void testProcess() {
 		SafeFunction.apply( () -> {
 			FreemarkerDocProcessConfig config = FreemarkerDocProcessConfigFacade.newSimpleConfig( "simple-config-003",  "/fj_doc_test/template/" );
+			config.getFacade().registerHandler( FreeMarkerHtmlTypeHandlerUTF8.HANDLER );
 			// test full process
 			try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() ) {
 				DocProcessData data = config.fullProcess( "test_02" ,
-						DocProcessContext.newContext(), FreeMarkerHtmlTypeHandlerUTF8.HANDLER, DocOutput.newOutput(baos) );
+						DocProcessContext.newContext(), DocConfig.TYPE_HTML, DocOutput.newOutput(baos) );
 				Assert.assertNotEquals( 0 , data.getCurrentXmlData().length() );
 			}
 			// test process 1