Added ParamProvider for ParamFinder

Author: fugerit79

fj-core/src/main/java/org/fugerit/java/core/cfg/xml/PropertyCatalog.java

@@ -4,9 +4,11 @@
 import java.util.Properties;
 
 import org.fugerit.java.core.cfg.ConfigException;
+import org.fugerit.java.core.lang.helpers.ClassHelper;
 import org.fugerit.java.core.lang.helpers.StringUtils;
 import org.fugerit.java.core.util.collection.ListMapStringKey;
 import org.fugerit.java.core.util.regex.ParamFinder;
+import org.fugerit.java.core.util.regex.ParamProvider;
 import org.w3c.dom.Element;
 
 public class PropertyCatalog extends ListMapCatalogConfig<PropertyHolder> {
@@ -20,6 +22,8 @@ public PropertyCatalog() {
 
 	public static final String PROP_MAP_SYSTEM_ENV = "map-system-properties";
 
+	public static final String PROP_PATH_PARAM_PROVIDER = "path-param-provider";
+	
 	/**
 	 * 
 	 */
@@ -29,7 +33,9 @@ public PropertyCatalog() {
 	protected PropertyHolder customEntryHandling(String dataListId, PropertyHolder current, Element element) throws ConfigException {
 		PropertyHolder holder = super.customEntryHandling(dataListId, current, element);
 		try {
-			if ( !this.getMapSysEnv().isEmpty() ) {
+			if ( this.getParamProvider() != null ) {
+				holder.setPath( PARAM_FINDER.substitute( holder.getPath() , this.getParamProvider().getProperties() ) );
+			} else  if ( !this.getMapSysEnv().isEmpty() ) {
 				holder.setPath( PARAM_FINDER.substitute( holder.getPath() , this.getMapSysEnv() ) );	
 			}
 			holder.init( this, dataListId );
@@ -52,6 +58,23 @@ public void configure(Element tag) throws ConfigException {
 
 	private static ParamFinder PARAM_FINDER = ParamFinder.newFinder();
 
+	private ParamProvider pathParamProvider;
+	
+	private ParamProvider getParamProvider() throws ConfigException {
+		if ( this.pathParamProvider == null ) {
+			String pathParamProviderType = this.getGeneralProps().getProperty( PROP_PATH_PARAM_PROVIDER );
+			if ( pathParamProviderType != null ) {
+				logger.info( PROP_PATH_PARAM_PROVIDER+" -> "+pathParamProviderType );
+				try {
+					this.pathParamProvider = (ParamProvider) ClassHelper.newInstance( pathParamProviderType );
+				} catch (Exception e) {
+					throw new ConfigException( e );
+				}
+			}
+		}
+		return this.pathParamProvider; 
+	}
+	
 	private Properties mapSysEnv;
 
 	private Properties getMapSysEnv() {

fj-core/src/main/java/org/fugerit/java/core/util/regex/ParamProvider.java

@@ -0,0 +1,9 @@
+package org.fugerit.java.core.util.regex;
+
+import java.util.Properties;
+
+public interface ParamProvider {
+
+	Properties getProperties();
+
+}

fj-core/src/main/java/org/fugerit/java/core/util/regex/SimpleParamProvider.java

@@ -0,0 +1,21 @@
+package org.fugerit.java.core.util.regex;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+public class SimpleParamProvider implements ParamProvider, Serializable {
+
+	private static final long serialVersionUID = -6113410989966425831L;
+
+	private Properties props;
+	
+	public SimpleParamProvider()  {
+		this.props = new Properties();
+	}
+	
+	@Override
+	public Properties getProperties() {
+		return this.props;
+	}
+
+}

fj-core/src/test/java/test/org/fugerit/java/core/cfg/xml/TestParamProvider.java

@@ -0,0 +1,17 @@
+package test.org.fugerit.java.core.cfg.xml;
+
+import org.fugerit.java.core.util.regex.SimpleParamProvider;
+
+public class TestParamProvider extends SimpleParamProvider {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1549784901025171679L;
+
+	public TestParamProvider() {
+		super();
+		this.getProperties().setProperty( "base-conf-path" , "core/cfg/xml/props" );
+	}
+	
+}

fj-core/src/test/resources/core/cfg/xml/property-catalog-test.xml

@@ -1,13 +1,14 @@
 <data-catalog-config 
 	check-duplicate-id="fail" 
 	type="org.fugerit.java.core.cfg.xml.PropertyHolder" 
-	default-catalog="TEST">
+	default-catalog="TEST"
+	path-param-provider="test.org.fugerit.java.core.cfg.xml.TestParamProvider">
 
 	<data-list id="TEST">
 		<data id="props-01" description="First JUNIT config properties"
-			mode="classloader" path="core/cfg/xml/props/props-01.properties"/>
+			mode="classloader" path="${base-conf-path}/props-01.properties"/>
 		<data id="props-02" description="Second JUNIT config properties"
-			mode="classloader" path="core/cfg/xml/props/props-02.xml" xml="true"/>
+			mode="classloader" path="${base-conf-path}/props-02.xml" xml="true"/>
 		<!--
 			 * When this mode is used, you must define in PATH reference to other holders in the same catalog, semicolon separated.
 			 * For instace if props-01 and props-02 are two holder in the same catalog :