0.7.4.6 (2020-12-29)

--------------------
+ Changes in param configuration for ValidatorCatalog A.P.I.

Author: fugerit79

docgen/parameters.json

@@ -1,7 +1,7 @@
 {
 	"title" : "Jupiter (Fugerit Core A.P.I.)",
 	"name": "Jupiter",
-	"version" : "0.7.4.5",
+	"version" : "0.7.4.6",
 	"date" : "29/12/2020",
 	"organization" : {
 		"name" : "Fugerit Org",

docgen/release-notes.txt

@@ -1,4 +1,8 @@
-0.7.4.5 (2020-12-29)
+0.7.4.6 (2020-12-29)
+-------------------- 
++ Changes in param configuration for ValidatorCatalog A.P.I.
+
+0.7.4.5 (2020-12-29)
 -------------------- 
 + Added error map based on ID for validator catalog A.P.I.
 

fj-core/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-lib</artifactId>
-		<version>0.7.4.5</version>
+		<version>0.7.4.6</version>
 	</parent>
 
 	<name>fj-core</name>

fj-core/src/main/java/org/fugerit/java/core/validator/BasicValidator.java

@@ -26,10 +26,6 @@ public class BasicValidator extends BasicIdConfigType {
 
 	public static final String KEY_INFO = "info";
 
-	public static final String KEY_OPTION1 = "option1";
-	public static final String KEY_OPTION2 = "option2";
-	public static final String KEY_OPTION3 = "option3";
-	
 	public static final String ERROR_KEY_REQUIRED = "error.required";
 	public static final String ERROR_KEY_LENGTH_MIN = "error.length.min";
 	public static final String ERROR_KEY_LENGTH_MAX = "error.length.max";
@@ -42,15 +38,15 @@ public class BasicValidator extends BasicIdConfigType {
 
 	private String info;
 
-	private String option1;
-	
-	private String option2;
-	
-	private String option3;
-	
 	private Element config;
 
+	private Properties params;
+	
 	private BasicValidator parent;
+	
+	public BasicValidator() {
+		this.params = new Properties();
+	}
 
 	/**
 	 * 
@@ -100,18 +96,7 @@ public void configure( Properties atts ) throws ConfigException {
 		if ( StringUtils.isNotEmpty( info ) ) {
 			this.info = info;
 		}		
-		String opt1 = atts.getProperty( KEY_OPTION1 );
-		if ( StringUtils.isNotEmpty( opt1 ) ) {
-			this.option1 = opt1;
-		}
-		String opt2 = atts.getProperty( KEY_OPTION2 );
-		if ( StringUtils.isNotEmpty( opt2 ) ) {
-			this.option2 = opt2;
-		}
-		String opt3 = atts.getProperty( KEY_OPTION3 );
-		if ( StringUtils.isNotEmpty( opt3 ) ) {
-			this.option3 = opt3;
-		}
+		this.getParams().putAll( atts );
 	}
 
 	protected String checkOverride( ValidatorContext context, String def, String key ) {
@@ -164,18 +149,6 @@ public String getInfo() {
 		return info;
 	}
 
-	public String getOption1() {
-		return option1;
-	}
-
-	public String getOption2() {
-		return option2;
-	}
-
-	public String getOption3() {
-		return option3;
-	}
-	
 	protected Element getConfig() {
 		return config;
 	}
@@ -184,6 +157,10 @@ protected BasicValidator getParent() {
 		return parent;
 	}
 
+	public Properties getParams() {
+		return params;
+	}
+
 	@Override
 	public String toString() {
 		return "Validator[id:"+this.getId()+",type:"+this.getClass().getName()+"]";

fj-core/src/main/java/org/fugerit/java/core/validator/ValidatorCatalog.java

@@ -102,7 +102,7 @@ public void configure( Element element ) throws ConfigException {
 					}
 					validator.configure( current, parentValidator );
 					validator.checkConfig();
-					logger.info( "validator : {}", validator );
+					logger.info( "validator : {} -> {}", validator, validator.getParams() );
 					this.getValidators().add( validator );
 				}
 			}

fj-ext/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-lib</artifactId>
-		<version>0.7.4.5</version>
+		<version>0.7.4.6</version>
 	</parent>
 
 	<name>fj-ext</name>

fj-tool/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-lib</artifactId>
-		<version>0.7.4.5</version>
+		<version>0.7.4.6</version>
 	</parent>
 
 	<name>fj-tool</name>

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.fugerit.java</groupId>
 	<artifactId>fj-lib</artifactId>
 
-	<version>0.7.4.5</version>
+	<version>0.7.4.6</version>
 	<packaging>pom</packaging>
 
 	<name>fj-lib</name>