Added options to create a ParamI18N loading keys from a different bundle

than the main property key

Author: fugerit79

fj-core/src/main/java/org/fugerit/java/core/util/i18n/HelperI18N.java

@@ -4,6 +4,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.fugerit.java.core.util.ObjectUtils;
+
 public abstract class HelperI18N {
 
 	protected HelperI18N( String baseName, String defaultLanguge,  String... altLocale ) {
@@ -35,7 +37,9 @@ public String getString( String lang, String key, Object... params ) {
 			for ( int k=0; k<params.length; k++ ) {
 				Object current = params[k];
 				if ( current instanceof ParamI18N )  {
-					current = this.resolveString( lang, ((ParamI18N)current).getKey() );			
+					ParamI18N param = (ParamI18N)current;
+					HelperI18N helper = ObjectUtils.objectWithDefault( param.getHelper() , this );
+					current = helper.resolveString( lang, param.getKey() );			
 				}
 				realParams[k] = current;
 			}

fj-core/src/main/java/org/fugerit/java/core/util/i18n/ParamI18N.java

@@ -2,20 +2,31 @@
 
 public class ParamI18N {
 
-	private ParamI18N( String key ) {
+	private ParamI18N( String key, HelperI18N helper ) {
 		this.key = key;
+		this.helper = helper;
 	}
 
 	private String key;
 
+	private HelperI18N helper;
+	
 	public String getKey() {
 		return key;
 	}
 
+	public HelperI18N getHelper() {
+		return helper;
+	}
+
 	public static ParamI18N newParamI18N( String key ) {
-		return new ParamI18N( key );
+		return newParamI18N( key, null );
 	}
 
+	public static ParamI18N newParamI18N( String key, HelperI18N helper ) {
+		return new ParamI18N( key, helper );
+	}
+	
 	@Override
 	public String toString() {
 		return this.getClass().getSimpleName()+"[key:"+this.getKey()+"]";

fj-core/src/test/java/test/org/fugerit/java/core/util/i18n/TestHelperI18N.java

@@ -23,19 +23,25 @@ public class TestHelperI18N {
 
 	private static final String CONF_PATH = "core.util.i18n.test";
 
+	private static final String CONF_PATH_PARAM = "core.util.i18n.param";
+	
 	private HelperI18N helper;
 
-	private void testHelper( String expectedValue, String lang, String key, Object... params ) {
-		String value = this.helper.getString( lang , key, params );
-		logger.info( "key:{} , lang:{} -> {}", lang, key, value );
-		Assert.assertEquals( "Value different for key : "+key+", lang : "+lang , expectedValue, value );
-	}
+	private HelperI18N helperParam;
 
+
 	@Before
 	public void init() {
 		this.helper = BundleMapI18N.newHelperI18N( CONF_PATH, LANG_DEF, LANG_ALT );
+		this.helperParam = BundleMapI18N.newHelperI18N( CONF_PATH_PARAM, LANG_DEF, LANG_ALT );
 	}
 
+	private void testHelper( String expectedValue, String lang, String key, Object... params ) {
+		String value = this.helper.getString( lang , key, params );
+		logger.info( "key:{} , lang:{} -> {}", lang, key, value );
+		Assert.assertEquals( "Value different for key : "+key+", lang : "+lang , expectedValue, value );
+	}
+
 	@Test
 	public void testSimpleProperty1() {
 		String key = "test.prop.1"; // test.prop.1 is available for both languages
@@ -67,6 +73,14 @@ public void testComplexProperty1() {
 				LANG_ALT[0],  key, new Integer( 3 ), ParamI18N.newParamI18N( keyParam ) );
 	}
 
-	
+	@Test
+	public void testComplexProperty1Alt() {
+		String key = "test.complex.prop.1";	// contains a integer param and a i18n param
+		String keyParam = "test.param.1.alt";	// the key for the i18n param
+		this.testHelper( "Complex property 1 -> simple parameter : 3 and i18n parameter : (ParamI18N value alternative bundle)", 
+				LANG_DEF,  key, new Integer( 3 ), ParamI18N.newParamI18N( keyParam, this.helperParam ) );
+		this.testHelper( "Proprietà complessa test 1 -> parametro semplice : 3 e parametro i18n : (valore ParamI18N bundle alternativo)", 
+				LANG_ALT[0],  key, new Integer( 3 ), ParamI18N.newParamI18N( keyParam, this.helperParam ) );
+	}
 
 }

fj-core/src/test/resources/core/util/i18n/param.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+  <entry key="test.param.1.alt">(ParamI18N value alternative bundle)</entry>
+</properties>
+  

fj-core/src/test/resources/core/util/i18n/param_en.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+	<!-- this bundle must remain empty as it's for the default language -->
+</properties>
+  

fj-core/src/test/resources/core/util/i18n/param_it.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+  <entry key="test.param.1.alt">(valore ParamI18N bundle alternativo)</entry>
+</properties>