From 4fa577cbaa76cb5776afe6ec0cc0a2b8cfda677f Mon Sep 17 00:00:00 2001 From: "Matteo Franci a.k.a. Fugerit" Date: Fri, 25 Apr 2025 12:51:32 +0200 Subject: [PATCH 1/2] [fj-doc-lib-direct] add useChainId param for chain alias #406 --- CHANGELOG.md | 4 ++ .../doc/lib/direct/VenusDirectFacade.java | 3 +- .../direct/config/VenusDirectConfigChain.java | 8 ++++ .../config/venus-direct-config-1.yaml | 2 + .../template/test-doc-json-data-model.ftl | 44 ------------------- .../template/test-doc-yaml-data-model.ftl | 44 ------------------- 6 files changed, 16 insertions(+), 89 deletions(-) delete mode 100644 fj-doc-lib-direct/src/test/resources/template/test-doc-json-data-model.ftl delete mode 100644 fj-doc-lib-direct/src/test/resources/template/test-doc-yaml-data-model.ftl diff --git a/CHANGELOG.md b/CHANGELOG.md index d639bc4d..d45c1024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- [fj-doc-lib-direct] add useChainId param for chain alias + ## [8.13.4] - 2025-04-25 ### Added diff --git a/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/VenusDirectFacade.java b/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/VenusDirectFacade.java index f52daf30..6ff10491 100644 --- a/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/VenusDirectFacade.java +++ b/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/VenusDirectFacade.java @@ -76,7 +76,8 @@ public static void handleOutput(VenusDirectConfig config, String outputId) { log.info( "mkdir: result:{}, directory:{}", outputFile.getParentFile().mkdirs(), outputFile.getParentFile() ); } try ( FileOutputStream fos = new FileOutputStream( outputFile ) ) { - config.getDocProcessConfig().fullProcess(chain.getChainId(), context, output.getHandlerId(), fos ); + log.info( "generate outputId:{}, chainId:{}", outputId, chain.getChainId() ); + config.getDocProcessConfig().fullProcess( chain.resolveChainId(), context, output.getHandlerId(), fos ); } } ); diff --git a/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/config/VenusDirectConfigChain.java b/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/config/VenusDirectConfigChain.java index ad27e06f..0a3accab 100644 --- a/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/config/VenusDirectConfigChain.java +++ b/fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/config/VenusDirectConfigChain.java @@ -6,6 +6,7 @@ import lombok.Setter; import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.io.FileIO; +import org.fugerit.java.core.lang.helpers.StringUtils; import java.util.LinkedHashMap; @@ -18,6 +19,9 @@ public class VenusDirectConfigChain { @Getter @Setter private String chainId; + @Getter @Setter + private String useChainId; + @Getter @Setter private LinkedHashMap dataModel; @@ -36,4 +40,8 @@ public void setupDataModel() { } } + public String resolveChainId() { + return StringUtils.valueWithDefault( this.getUseChainId(), this.getChainId() ); + } + } diff --git a/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml b/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml index fd606fc6..422d2cbd 100644 --- a/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml +++ b/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml @@ -12,8 +12,10 @@ chainList: # a template named ${chainId}.ftl must exist in 'templatePath' folde docTitle: 'Venus Direct Extension - Test Doc' - chainId: 'test-doc-json-data-model' dataModelJson: 'src/test/resources/data-model/data-model-1.json' # JSON file data model + useChainId: 'test-doc' - chainId: 'test-doc-yaml-data-model' dataModelYaml: 'src/test/resources/data-model/data-model-1.yaml' # YAML file data model + useChainId: 'test-doc' outputList: - outputId: 'test-doc-html' chainId: 'test-doc' diff --git a/fj-doc-lib-direct/src/test/resources/template/test-doc-json-data-model.ftl b/fj-doc-lib-direct/src/test/resources/template/test-doc-json-data-model.ftl deleted file mode 100644 index cfef8286..00000000 --- a/fj-doc-lib-direct/src/test/resources/template/test-doc-json-data-model.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#ftl output_format="XML"> - - - - - - - - - 10;10;10;30 - - - excel-table=print - 450 - - excel-table - - - - ${r"${currentPage}"} / ${r"${pageCount}"} - - - - - - ${dataModel.docTitle} - ${.output_format} - ${testKey!'not present'} - - - Name - Surname - Title - -
- - - \ No newline at end of file diff --git a/fj-doc-lib-direct/src/test/resources/template/test-doc-yaml-data-model.ftl b/fj-doc-lib-direct/src/test/resources/template/test-doc-yaml-data-model.ftl deleted file mode 100644 index cfef8286..00000000 --- a/fj-doc-lib-direct/src/test/resources/template/test-doc-yaml-data-model.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#ftl output_format="XML"> - - - - - - - - - 10;10;10;30 - - - excel-table=print - 450 - - excel-table - - - - ${r"${currentPage}"} / ${r"${pageCount}"} - - - - - - ${dataModel.docTitle} - ${.output_format} - ${testKey!'not present'} - - - Name - Surname - Title - -
- - - \ No newline at end of file From 9cb6d65cbb56ac924e9ef29c1eec2b2c35f59f27 Mon Sep 17 00:00:00 2001 From: "Matteo Franci a.k.a. Fugerit" Date: Fri, 25 Apr 2025 12:52:38 +0200 Subject: [PATCH 2/2] fix test scenario #406 --- .../src/test/resources/config/venus-direct-config-1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml b/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml index 422d2cbd..2309b21c 100644 --- a/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml +++ b/fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml @@ -32,4 +32,4 @@ outputList: - outputId: 'test-doc-yaml-data-model-md' chainId: 'test-doc-yaml-data-model' handlerId: 'md' - file: 'target/test-doc-json-data-model.md' \ No newline at end of file + file: 'target/test-doc-yaml-data-model.md' \ No newline at end of file