Skip to content

Commit 203effe

Browse files
authored
Merge pull request #407 from fugerit-org/406-chore-fj-doc-lib-direct-add-usechainid-param-for-chain-alias
406 chore fj doc lib direct add usechainid param for chain alias
2 parents da8224a + 9cb6d65 commit 203effe

File tree

6 files changed

+17
-90
lines changed

6 files changed

+17
-90
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Added
11+
12+
- [fj-doc-lib-direct] add useChainId param for chain alias <https://github.com/fugerit-org/fj-doc/pull/406>
13+
1014
## [8.13.4] - 2025-04-25
1115

1216
### Added

fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/VenusDirectFacade.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public static void handleOutput(VenusDirectConfig config, String outputId) {
7676
log.info( "mkdir: result:{}, directory:{}", outputFile.getParentFile().mkdirs(), outputFile.getParentFile() );
7777
}
7878
try ( FileOutputStream fos = new FileOutputStream( outputFile ) ) {
79-
config.getDocProcessConfig().fullProcess(chain.getChainId(), context, output.getHandlerId(), fos );
79+
log.info( "generate outputId:{}, chainId:{}", outputId, chain.getChainId() );
80+
config.getDocProcessConfig().fullProcess( chain.resolveChainId(), context, output.getHandlerId(), fos );
8081
}
8182
} );
8283

fj-doc-lib-direct/src/main/java/org/fugerit/java/doc/lib/direct/config/VenusDirectConfigChain.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import lombok.Setter;
77
import org.fugerit.java.core.function.SafeFunction;
88
import org.fugerit.java.core.io.FileIO;
9+
import org.fugerit.java.core.lang.helpers.StringUtils;
910

1011
import java.util.LinkedHashMap;
1112

@@ -18,6 +19,9 @@ public class VenusDirectConfigChain {
1819
@Getter @Setter
1920
private String chainId;
2021

22+
@Getter @Setter
23+
private String useChainId;
24+
2125
@Getter @Setter
2226
private LinkedHashMap<String, Object> dataModel;
2327

@@ -36,4 +40,8 @@ public void setupDataModel() {
3640
}
3741
}
3842

43+
public String resolveChainId() {
44+
return StringUtils.valueWithDefault( this.getUseChainId(), this.getChainId() );
45+
}
46+
3947
}

fj-doc-lib-direct/src/test/resources/config/venus-direct-config-1.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ chainList: # a template named ${chainId}.ftl must exist in 'templatePath' folde
1212
docTitle: 'Venus Direct Extension - Test Doc'
1313
- chainId: 'test-doc-json-data-model'
1414
dataModelJson: 'src/test/resources/data-model/data-model-1.json' # JSON file data model
15+
useChainId: 'test-doc'
1516
- chainId: 'test-doc-yaml-data-model'
1617
dataModelYaml: 'src/test/resources/data-model/data-model-1.yaml' # YAML file data model
18+
useChainId: 'test-doc'
1719
outputList:
1820
- outputId: 'test-doc-html'
1921
chainId: 'test-doc'
@@ -30,4 +32,4 @@ outputList:
3032
- outputId: 'test-doc-yaml-data-model-md'
3133
chainId: 'test-doc-yaml-data-model'
3234
handlerId: 'md'
33-
file: 'target/test-doc-json-data-model.md'
35+
file: 'target/test-doc-yaml-data-model.md'

fj-doc-lib-direct/src/test/resources/template/test-doc-json-data-model.ftl

Lines changed: 0 additions & 44 deletions
This file was deleted.

fj-doc-lib-direct/src/test/resources/template/test-doc-yaml-data-model.ftl

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)