Skip to content

Commit 2489b30

Browse files
fugerit79fugerit79
committed
1.5.2 (2023-08-24)
+ [fix][fj-doc-base] fix retrocompatibility DocProcessConfig + [fix][fj-doc-base] fix DocResult
1 parent d2fa6f7 commit 2489b30

File tree

25 files changed

+52
-36
lines changed

25 files changed

+52
-36
lines changed

‎docgen/release-notes.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
1.5.1 (2023-08-24)
1+
1.5.2 (2023-08-24)
2+
------------------
3+
+ [fix][fj-doc-base] fix retrocompatibility DocProcessConfig
4+
+ [fix][fj-doc-base] fix DocResult
5+
6+
1.5.1 (2023-08-24)
27
------------------
38
+ [dependency] Updated fj-version to 8.2.0
49
+ [enhancement][fj-doc-base] DocProcessConfig made a wrapped for MiniFilterConfig (user accessibility standard)

‎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.5.1</version>
10+
<version>1.5.2</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.5.1</version>
10+
<version>1.5.2</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.5.1</version>
10+
<version>1.5.2</version>
1111
</parent>
1212

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

‎fj-doc-base/src/main/java/org/fugerit/java/doc/base/config/DocResult.java‎

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

55
public class DocResult extends Result {
66

7-
8-
7+
/**
8+
*
9+
*/
10+
private static final long serialVersionUID = -8959553583732082503L;
11+
912
}

‎fj-doc-base/src/main/java/org/fugerit/java/doc/base/process/DocProcessConfig.java‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,36 @@ public class DocProcessConfig implements MiniFilterMap, Serializable {
2121
private static final long serialVersionUID = 6756541624973903875L;
2222

2323
public static final String ATT_TAG_DATA_LIST = "chain";
24-
24+
2525
public static final String ATT_TAG_DATA = "step";
2626

2727
private MiniFilterConfig miniFilterConfig;
2828

2929
public DocProcessConfig() {
30-
this.miniFilterConfig = new MiniFilterConfig( ATT_TAG_DATA_LIST, ATT_TAG_DATA );
30+
this.miniFilterConfig = new MiniFilterConfig(ATT_TAG_DATA_LIST, ATT_TAG_DATA);
31+
}
32+
33+
public static DocProcessConfig loadConfig( InputStream is, DocProcessConfig config ) throws Exception {
34+
DocProcessConfig docProcessConfig = new DocProcessConfig();
35+
docProcessConfig.miniFilterConfig = new MiniFilterConfig();
36+
MiniFilterConfig.loadConfig(is, docProcessConfig.miniFilterConfig);
37+
return docProcessConfig;
3138
}
3239

33-
public static DocProcessConfig loadConfigSafe( String configPath ) {
40+
public static DocProcessConfig loadConfigSafe(String configPath) {
3441
DocProcessConfig config = null;
35-
try ( InputStream is = StreamHelper.resolveStream( configPath ) ) {
36-
config = loadConfig( is );
42+
try (InputStream is = StreamHelper.resolveStream(configPath)) {
43+
config = loadConfig(is);
3744
} catch (Exception e) {
38-
throw new ConfigRuntimeException( "Exception on loadConfigSafe : "+e, e );
45+
throw new ConfigRuntimeException("Exception on loadConfigSafe : " + e, e);
3946
}
4047
return config;
4148
}
42-
43-
public static DocProcessConfig loadConfig( InputStream is ) throws ConfigException {
49+
50+
public static DocProcessConfig loadConfig(InputStream is) throws ConfigException {
4451
DocProcessConfig config = new DocProcessConfig();
45-
config.miniFilterConfig.getGeneralProps().setProperty( GenericListCatalogConfig.ATT_TYPE , MiniFilterConfigEntry.class.getName() );
52+
config.miniFilterConfig.getGeneralProps().setProperty(GenericListCatalogConfig.ATT_TYPE,
53+
MiniFilterConfigEntry.class.getName());
4654
try {
4755
MiniFilterConfig.loadConfigMap(is, config.miniFilterConfig);
4856
} catch (Exception e) {
@@ -85,6 +93,6 @@ public Set<String> getIdSet() {
8593

8694
public Collection<MiniFilterConfigEntry> getDataList(String id) {
8795
return miniFilterConfig.getDataList(id);
88-
}
89-
96+
}
97+
9098
}

‎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.5.1</version>
10+
<version>1.5.2</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.5.1</version>
10+
<version>1.5.2</version>
1111
</parent>
1212

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

‎fj-doc-bom/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.5.1</version>
10+
<version>1.5.2</version>
1111
</parent>
1212

1313
<name>fj-doc-bom</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.5.1</version>
10+
<version>1.5.2</version>
1111
</parent>
1212

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

0 commit comments

Comments
 (0)