Skip to content

Commit 4c3baf4

Browse files
mttfrancimttfranci
committed
8.0.11-rc.001 (2023-07-14)
+ Added MiniFilterMap + Updated bom to 1.2.3
1 parent 95ea786 commit 4c3baf4

File tree

10 files changed

+77
-31
lines changed

10 files changed

+77
-31
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" : "Jupiter (Fugerit Core A.P.I.)",
33
"name": "Jupiter",
4-
"version" : "8.0.9",
5-
"date" : "29/03/2023",
4+
"version" : "8.0.11-rc.001",
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-
8.0.9 (2023-03-29)
1+
8.0.11-rc.001 (2023-07-14)
2+
------------------
3+
+ Added MiniFilterMap
4+
+ Updated bom to 1.2.3
5+
6+
8.0.9 (2023-03-29)
27
------------------
38
+ Parameter set in DAOHelper set to TRACE
49

‎fj-core-jvfs/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-lib</artifactId>
10-
<version>8.0.10-rc.003</version>
10+
<version>8.0.11-rc.001</version>
1111
</parent>
1212

1313
<name>fj-core-jvfs</name>

‎fj-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-lib</artifactId>
10-
<version>8.0.10-rc.003</version>
10+
<version>8.0.11-rc.001</version>
1111
</parent>
1212

1313
<name>fj-core</name>

‎fj-core/src/main/java/org/fugerit/java/core/util/filterchain/MiniFilterConfig.java‎

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import java.io.InputStream;
44
import java.util.HashMap;
5+
import java.util.HashSet;
56
import java.util.Iterator;
67
import java.util.Map;
8+
import java.util.Set;
79

810
import org.fugerit.java.core.cfg.ConfigException;
911
import org.fugerit.java.core.cfg.xml.CustomListCatalogConfig;
@@ -16,7 +18,7 @@
1618
import org.w3c.dom.Element;
1719
import org.w3c.dom.NodeList;
1820

19-
public class MiniFilterConfig extends CustomListCatalogConfig<MiniFilterConfigEntry, ListMapConfig<MiniFilterConfigEntry>> {
21+
public class MiniFilterConfig extends CustomListCatalogConfig<MiniFilterConfigEntry, ListMapConfig<MiniFilterConfigEntry>> implements MiniFilterMap {
2022

2123
/**
2224
*
@@ -37,7 +39,7 @@ public MiniFilterConfig(String attTagDataList, String attTagData) {
3739
this.getGeneralProps().setProperty( ATT_TYPE , MiniFilterConfigEntry.class.getName() );
3840
}
3941

40-
public static MiniFilterConfig loadConfig( InputStream is, MiniFilterConfig config ) throws Exception {
42+
public static MiniFilterMap loadConfig( InputStream is, MiniFilterConfig config ) throws Exception {
4143
Document doc = DOMIO.loadDOMDoc( is );
4244
Element root = doc.getDocumentElement();
4345
config.configure( root );
@@ -60,32 +62,42 @@ protected void customFilterConfig( MiniFilter filter, MiniFilterConfigEntry entr
6062

6163
}
6264

65+
@Override
6366
public MiniFilterChain getChain( String id ) throws Exception {
67+
MiniFilterChain chain = null;
6468
ListMapConfig<MiniFilterConfigEntry> c = this.getListMap( id );
65-
MiniFilterChain chain = new MiniFilterChain();
66-
chain.setChainId( id );
67-
chain.getDefaultConfig().putAll( c.getConfig() );
68-
Iterator<MiniFilterConfigEntry> it = c.iterator();
69-
while ( it.hasNext() ) {
70-
MiniFilterConfigEntry entry = it.next();
71-
String type = entry.getType();
72-
MiniFilter filter = (MiniFilter) ClassHelper.newInstance( type );
73-
if ( filter instanceof MiniFilterBase ) {
74-
MiniFilterBase filterBase = (MiniFilterBase)filter;
75-
filterBase.setChainId( id );
76-
if ( StringUtils.isNotEmpty( entry.getParam01() ) ) {
77-
filterBase.setParam01( entry.getParam01() );
69+
if ( c != null ) {
70+
chain = new MiniFilterChain();
71+
chain.setChainId( id );
72+
chain.getDefaultConfig().putAll( c.getConfig() );
73+
Iterator<MiniFilterConfigEntry> it = c.iterator();
74+
while ( it.hasNext() ) {
75+
MiniFilterConfigEntry entry = it.next();
76+
String type = entry.getType();
77+
MiniFilter filter = (MiniFilter) ClassHelper.newInstance( type );
78+
if ( filter instanceof MiniFilterBase ) {
79+
MiniFilterBase filterBase = (MiniFilterBase)filter;
80+
filterBase.setChainId( id );
81+
if ( StringUtils.isNotEmpty( entry.getParam01() ) ) {
82+
filterBase.setParam01( entry.getParam01() );
83+
}
7884
}
85+
filter.config( entry.getKey() , entry.getDescription(), entry.getDefaultBehaviourInt() );
86+
filter.setCustomConfig( entry.getProps() );
87+
this.customFilterConfig(filter, entry);
88+
chain.getFilterChain().add( filter );
89+
logger.info( "adding filter to chain : "+filter );
90+
}
91+
} else {
92+
chain = this.getChainCache(id);
93+
if ( chain == null ) {
94+
throw new ConfigException( "Chain not found : "+id );
7995
}
80-
filter.config( entry.getKey() , entry.getDescription(), entry.getDefaultBehaviourInt() );
81-
filter.setCustomConfig( entry.getProps() );
82-
this.customFilterConfig(filter, entry);
83-
chain.getFilterChain().add( filter );
84-
logger.info( "adding filter to chain : "+filter );
85-
}
96+
}
8697
return chain;
8798
}
8899

100+
@Override
89101
public MiniFilterChain getChainCache( String id ) throws Exception {
90102
MiniFilterChain chain = this.mapChain.get( id );
91103
if ( chain == null ) {
@@ -95,6 +107,18 @@ public MiniFilterChain getChainCache( String id ) throws Exception {
95107
return chain;
96108
}
97109

110+
@Override
111+
public Set<String> getKeys() {
112+
Set<String> set = new HashSet<String>( this.getIdSet() );
113+
set.addAll( this.mapChain.keySet() );
114+
return set;
115+
}
116+
117+
@Override
118+
public void setChain(String id, MiniFilterChain chain) {
119+
this.mapChain.put( id, chain );
120+
}
121+
98122
public static MiniFilterConfig initFromClassLoaderWithRuntimeException( String path ) {
99123
MiniFilterConfig config = new MiniFilterConfig();
100124
try {

‎fj-core/src/main/java/org/fugerit/java/core/util/filterchain/MiniFilterMap.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package org.fugerit.java.core.util.filterchain;
2+
3+
import java.util.Set;
4+
5+
public interface MiniFilterMap {
6+
7+
Set<String> getKeys();
8+
9+
void setChain( String id, MiniFilterChain chain );
10+
11+
MiniFilterChain getChain(String id) throws Exception;
12+
13+
MiniFilterChain getChainCache(String id) throws Exception;
14+
15+
}

‎fj-core/src/test/java/test/org/fugerit/java/core/util/filterchain/TestDuplicateFailOnSet.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.junit.Assert.fail;
44

55
import org.fugerit.java.core.util.filterchain.MiniFilterConfig;
6+
import org.fugerit.java.core.util.filterchain.MiniFilterMap;
67
import org.junit.Test;
78
import org.slf4j.Logger;
89
import org.slf4j.LoggerFactory;
@@ -20,7 +21,7 @@ public void testDuplicate() {
2021
logger.info( "* TEST DUPLICATE *" );
2122
boolean ok = false;
2223
try {
23-
MiniFilterConfig config = MiniFilterConfig.initFromClassLoaderWithRuntimeException( CONF_PATH_DUPLICATE_FAIL_ON_SET );
24+
MiniFilterMap config = MiniFilterConfig.initFromClassLoaderWithRuntimeException( CONF_PATH_DUPLICATE_FAIL_ON_SET );
2425
logger.info( config.toString() );
2526
} catch (Exception e) {
2627
logger.info( e.getMessage() );

‎fj-core/src/test/java/test/org/fugerit/java/core/util/filterchain/TestMiniFilter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.fugerit.java.core.util.filterchain.MiniFilterConfig;
99
import org.fugerit.java.core.util.filterchain.MiniFilterContext;
1010
import org.fugerit.java.core.util.filterchain.MiniFilterData;
11+
import org.fugerit.java.core.util.filterchain.MiniFilterMap;
1112
import org.junit.Test;
1213
import org.slf4j.Logger;
1314
import org.slf4j.LoggerFactory;
@@ -108,7 +109,7 @@ public void testDuplicate() {
108109
logger.info( "* TEST DUPLICATE *" );
109110
boolean ok = false;
110111
try {
111-
MiniFilterConfig config = MiniFilterConfig.initFromClassLoaderWithRuntimeException( CONF_PATH_DUPLICATE );
112+
MiniFilterMap config = MiniFilterConfig.initFromClassLoaderWithRuntimeException( CONF_PATH_DUPLICATE );
112113
logger.info( config.toString() );
113114
} catch (Exception e) {
114115
logger.info( e.getMessage() );

‎fj-tool/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-lib</artifactId>
10-
<version>8.0.10-rc.003</version>
10+
<version>8.0.11-rc.001</version>
1111
</parent>
1212

1313
<name>fj-tool</name>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-bom</artifactId>
10-
<version>1.0.0</version>
10+
<version>1.2.3</version>
1111
<relativePath></relativePath>
1212
</parent>
1313

14-
<version>8.0.10-rc.003</version>
14+
<version>8.0.11-rc.001</version>
1515
<packaging>pom</packaging>
1616

1717
<name>fj-lib</name>

0 commit comments

Comments
 (0)