Skip to content

Commit d26151d

Browse files
fugerit79fugerit79
committed
1.3.1-rc.002 (2023-07-13)
+ Updated fj-core version to 8.0.11-rc.001 + Simplified FreemarkerDocProcessConfig
1 parent 456a26b commit d26151d

File tree

27 files changed

+121
-49
lines changed

27 files changed

+121
-49
lines changed

‎docgen/parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "1.3.1-rc.001",
5-
"date" : "13/07/2023",
4+
"version" : "1.3.1-rc.002",
5+
"date" : "14/07/2023",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

‎docgen/release-notes.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
1.3.1-rc.001 (2023-07-13)
1+
1.3.1-rc.002 (2023-07-13)
2+
------------------
3+
+ Updated fj-core version to 8.0.11-rc.002
4+
+ Simplified FreemarkerDocProcessConfig
5+
6+
1.3.1-rc.001 (2023-07-13)
27
------------------
38
+ [[fj-doc-mod-fop] add pdf/a support](https://github.com/fugerit-org/fj-doc/issues/43)
49

‎fj-doc-base-json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-base-json</name>

‎fj-doc-base-yaml/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-base-yaml</name>

‎fj-doc-base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-base</name>

‎fj-doc-bom-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-bom-core</name>

‎fj-doc-bom-fop/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-bom-fop</name>

‎fj-doc-freemarker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-freemarker</name>

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

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.fugerit.java.doc.freemarker.process;
22

33
import java.io.Serializable;
4-
import java.util.HashMap;
5-
import java.util.Map;
4+
import java.util.Set;
65

76
import org.fugerit.java.core.cfg.xml.ListMapConfig;
87
import org.fugerit.java.core.util.filterchain.MiniFilterChain;
8+
import org.fugerit.java.core.util.filterchain.MiniFilterMap;
99
import org.fugerit.java.doc.base.facade.DocHandlerFacade;
1010
import org.fugerit.java.doc.base.process.DocProcessConfig;
1111
import org.fugerit.java.doc.base.process.DocProcessContext;
@@ -15,23 +15,23 @@
1515
import lombok.extern.slf4j.Slf4j;
1616

1717
@Slf4j
18-
public class FreemarkerDocProcessConfig extends DocProcessConfig implements Serializable {
18+
public class FreemarkerDocProcessConfig implements Serializable, MiniFilterMap {
1919

2020
private static final long serialVersionUID = -6761081877582850120L;
2121

2222
@Getter
2323
private ListMapConfig<DocChainModel> docChainList;
2424

25-
private Map<String, MiniFilterChain> additionalChans;
26-
2725
@Getter
2826
private DocHandlerFacade facade;
2927

28+
private DocProcessConfig docProcessConfig;
29+
3030
protected FreemarkerDocProcessConfig() {
3131
super();
3232
this.docChainList = new ListMapConfig<>();
33-
this.additionalChans = new HashMap<>();
3433
this.facade = new DocHandlerFacade();
34+
this.docProcessConfig = new DocProcessConfig();
3535
}
3636

3737
private DefaultChainProvider defaultChain;
@@ -46,26 +46,35 @@ protected DefaultChainProvider getDefaultChain() {
4646

4747
public void process( String chainId, DocProcessContext context, DocProcessData data ) throws Exception {
4848
MiniFilterChain chain = this.getChainCache( chainId );
49-
log.info( "chain list {}", this.getIdSet() );
49+
log.info( "chain list {}", this.docProcessConfig.getIdSet() );
5050
chain.apply( context , data );
5151
}
5252

5353
@Override
5454
public MiniFilterChain getChain(String id) throws Exception {
55+
return this.docProcessConfig.getChain( id );
56+
}
57+
58+
@Override
59+
public MiniFilterChain getChainCache(String id) throws Exception {
5560
MiniFilterChain chain = null;
56-
if ( this.getDataList( id ) != null ) {
57-
chain = this.getChain( id );
58-
} else if ( this.additionalChans.containsKey( id ) ) {
59-
chain = this.additionalChans.get( id );
60-
} else if ( this.getDefaultChain() != null ) {
61-
chain = this.getDefaultChain().newDefaultChain(id);
62-
this.addAdditionalChain(chain);
61+
if ( this.docProcessConfig.getKeys().contains( id ) ) {
62+
chain = this.docProcessConfig.getChain(id);
63+
} else if ( this.defaultChain != null ) {
64+
chain = this.defaultChain.newDefaultChain(id);
65+
this.setChain(id, chain);
6366
}
6467
return chain;
6568
}
66-
67-
protected void addAdditionalChain( MiniFilterChain chain ) {
68-
this.additionalChans.put(chain.getChainId(), chain);
69+
70+
@Override
71+
public Set<String> getKeys() {
72+
return this.docProcessConfig.getKeys();
73+
}
74+
75+
@Override
76+
public void setChain(String id, MiniFilterChain chain) {
77+
this.docProcessConfig.setChain(id, chain);
6978
}
7079

7180
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static DocTypeHandler createHelper( Element docHandlerConfig ) throws Co
8787
((ConfigurableObject)res).configure( (Element)docHandlerConfig );
8888
}
8989
} catch (Exception | NoClassDefFoundError e) {
90-
UnsafeHelper.handleUnsafe( new ConfigException( "Type cannot be loaded : "+e, e ), docHandlerConfig.getAttribute( "unsafe"), docHandlerConfig.getAttribute( "unsafeMode") );
90+
UnsafeHelper.handleUnsafe( new ConfigException( "Type cannot be loaded : "+e, e ), docHandlerConfig.getAttribute( "unsafe"), docHandlerConfig.getAttribute( "unsafeMode") );
9191
}
9292
return res;
9393
}
@@ -109,7 +109,9 @@ public static FreemarkerDocProcessConfig loadConfig( Reader xmlReader ) throws C
109109
for ( int k=0; k<docHandlerList.getLength(); k++ ) {
110110
Element currentHandlerTag = (Element)docHandlerList.item( k );
111111
DocTypeHandler handler = createHelper( currentHandlerTag );
112-
config.getFacade().registerHandler( handler );
112+
if ( handler != null ) {
113+
config.getFacade().registerHandler( handler );
114+
}
113115
}
114116

115117
}
@@ -176,7 +178,7 @@ public static FreemarkerDocProcessConfig loadConfig( Reader xmlReader ) throws C
176178
step.setChainId( chain.getChainId() );
177179
chain.getFilterChain().add( step );
178180
}
179-
config.addAdditionalChain(chain);
181+
config.setChain(chain.getChainId(), chain);
180182
}
181183
} catch (Exception e) {
182184
throw new ConfigException( "Error configuring FreemarkerDocProcessConfig : "+e , e );

‎fj-doc-lib-autodoc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-autodoc</name>

‎fj-doc-lib-simpletable-import/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-simpletable-import</name>

‎fj-doc-lib-simpletable/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-simpletable</name>

‎fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
import org.fugerit.java.core.cfg.ConfigException;
66
import org.fugerit.java.core.util.filterchain.MiniFilterChain;
7+
import org.fugerit.java.core.util.filterchain.MiniFilterMap;
78
import org.fugerit.java.doc.base.config.DocException;
89
import org.fugerit.java.doc.base.config.DocInput;
910
import org.fugerit.java.doc.base.config.DocOutput;
1011
import org.fugerit.java.doc.base.config.DocTypeHandler;
1112
import org.fugerit.java.doc.base.facade.DocFacade;
1213
import org.fugerit.java.doc.base.model.DocBase;
13-
import org.fugerit.java.doc.base.process.DocProcessConfig;
1414
import org.fugerit.java.doc.base.process.DocProcessContext;
1515
import org.fugerit.java.doc.base.process.DocProcessData;
1616
import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig;
@@ -34,7 +34,7 @@ public static SimpleTableDocConfig newConfig() throws ConfigException {
3434

3535
public static final String CHAIN_ID_SIMPLE_TABLE = "simple_table";
3636

37-
public DocProcessConfig getConfig() {
37+
public MiniFilterMap getConfig() {
3838
return this.config;
3939
}
4040

‎fj-doc-mod-fop/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-fop</name>

‎fj-doc-mod-opencsv/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-opencsv</name>

‎fj-doc-mod-poi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-poi</name>

‎fj-doc-playground-quarkus/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.fugerit.java</groupId>
66
<artifactId>fj-doc</artifactId>
7-
<version>1.3.1-rc.001</version>
7+
<version>1.3.1-rc.002</version>
88
</parent>
99
<artifactId>fj-doc-playground-quarkus</artifactId>
1010
<properties>

‎fj-doc-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-sample</name>

‎fj-doc-sample/src/main/resources/config/freemarker-doc-process.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<docHandlerConfig>
88
<docHandler id="PDF/A-1a" info="pdf" type="org.fugerit.java.doc.mod.fop.PdfFopTypeHandler">
9-
<docHandlerCustomConfig charset="UTF-8" fop-config-mode="classloader" fop-config-classloader-path="fop-config.xml" pdf-a-mode="PDF/A-1a"/>
9+
<docHandlerCustomConfig charset="UTF-8" fop-config-mode="classloader" fop-config-classloader-path="fop-config-pdfa.xml" pdf-a-mode="PDF/A-1a"/>
1010
</docHandler>
1111
<docHandler id="md-ext" info="md" type="org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandler" />
1212
<docHandler id="xml-doc" info="xml" type="org.fugerit.java.doc.base.config.DocTypeHandlerXMLUTF8" />
@@ -36,6 +36,7 @@
3636
<docHandler id="html-fm" info="html" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandlerUTF8" />
3737
<docHandler id="html-fragment-fm" info="fhtml" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandlerUTF8" />
3838
<docHandler id="csv-opencsv" info="csv" type="org.fugerit.java.doc.mod.opencsv.OpenCSVTypeHandler"/>
39+
<docHandler id="pdf-unsafe" info="pdf" type="org.fugerit.java.doc.pdf.UnsafeDocHandler" unsafe="true" unsafeMode="log-trace"/>
3940
</docHandlerConfig>
4041

4142
<docChain id="shared">

‎fj-doc-sample/src/main/resources/fop-config-pdfa.xml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<fop version="1.0">
2+
3+
<!-- Strict user configuration -->
4+
<strict-configuration>true</strict-configuration>
5+
6+
<!-- Strict FO validation -->
7+
<strict-validation>true</strict-validation>
8+
9+
<!-- Base URL for resolving relative URLs -->
10+
<base>.</base>
11+
12+
<!-- Font Base URL for resolving relative font URLs -->
13+
<font-base>.</font-base>
14+
15+
<!--
16+
NOTE: for PDF/A format all fonts, even the basic ones, myst be fully embdedded.
17+
https://xmlgraphics.apache.org/fop/2.8/pdfa.htm
18+
-->
19+
<renderers>
20+
<renderer mime="application/pdf">
21+
<!-- In this configuration the pdf-a-mode has been set via the freemarker-doc-process.xml
22+
<pdf-a-mode>PDF/A-1a</pdf-a-mode>
23+
<version>1.4</version>
24+
-->
25+
<fonts>
26+
<font embed-url="classpath://font/TitilliumWeb-Regular.ttf" embedding-mode="full">
27+
<font-triplet name="TitilliumWeb" style="normal" weight="normal"/>
28+
</font>
29+
<font embed-url="classpath://font/TitilliumWeb-Bold.ttf" embedding-mode="full">
30+
<font-triplet name="TitilliumWeb" style="normal" weight="bold"/>
31+
</font>
32+
<font embed-url="classpath://font/TitilliumWeb-Italic.ttf" embedding-mode="full">
33+
<font-triplet name="TitilliumWeb" style="italic" weight="normal"/>
34+
</font>
35+
<font embed-url="classpath://font/TitilliumWeb-BoldItalic.ttf" embedding-mode="full">
36+
<font-triplet name="TitilliumWeb" style="italic" weight="bold"/>
37+
</font>
38+
<!--
39+
<auto-detect/>
40+
-->
41+
</fonts>
42+
</renderer>
43+
</renderers>
44+
45+
46+
<!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
47+
<source-resolution>72</source-resolution>
48+
<!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
49+
<target-resolution>72</target-resolution>
50+
51+
<!-- default page-height and page-width, in case
52+
value is specified as auto -->
53+
<default-page-settings height="11in" width="8.26in"/>
54+
55+
</fop>

‎fj-doc-sample/src/main/resources/fop-config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<renderers>
1616
<renderer mime="application/pdf">
1717
<fonts>
18-
<font embed-url="classpath://font/TitilliumWeb-Regular.ttf" embedding-mode="full">
18+
<font embed-url="classpath://font/TitilliumWeb-Regular.ttf" embedding-mode="subset">
1919
<font-triplet name="TitilliumWeb" style="normal" weight="normal"/>
2020
</font>
21-
<font embed-url="classpath://font/TitilliumWeb-Bold.ttf" embedding-mode="full">
21+
<font embed-url="classpath://font/TitilliumWeb-Bold.ttf" embedding-mode="subset">
2222
<font-triplet name="TitilliumWeb" style="normal" weight="bold"/>
2323
</font>
2424
<font embed-url="classpath://font/TitilliumWeb-Italic.ttf" embedding-mode="subset">

‎fj-doc-val-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-val-core</name>

‎fj-doc-val-pdfbox/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.001</version>
10+
<version>1.3.1-rc.002</version>
1111
</parent>
1212

1313
<name>fj-doc-val-pdfbox</name>

0 commit comments

Comments
 (0)