Added flag allowNull to allow null ...

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java b/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java
index 2114b9b00ecb2f453c94821ca423379ccd5c1418..1e27a4d79c2876b68be1112c8e7e32950fa3be4f 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java
+++ b/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java
@@ -62,10 +62,11 @@ public abstract class BaseObjectValidator implements Validator, Serializable {
         * @param component UIComponent instance
         * @param value Value to check
         * @param requiredFields Array of required field names (ending with)
+        * @param allowNull Wether null or empty values are allowed
         * <p>
         * @throws ValidatorException If something more horrible went wrong
         */
-       protected void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields) throws ValidatorException {
+       protected void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields, boolean allowNull) throws ValidatorException {
                // Trace message
                //this.getLogger().logTrace(MessageFormat.format("preValidate: context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N
 
@@ -89,7 +90,7 @@ public abstract class BaseObjectValidator implements Validator, Serializable {
                                isValidField = true;
 
                                // Is it null?
-                               if (null == value) {
+                               if ((!allowNull) && (null == value)) {
                                        // Value it null
                                        facesMessage = new FacesMessage(MessageFormat.format("Field {0} is null.", field)); //NOI18N
                                }

diff --git a/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java b/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java
index 122d0a026261e82a1f5c005ceb285e1effd4949c..57ccb3b60b79e5cf8f0f8c5100c38c833ccd1792 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java
+++ b/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java
@@ -40,12 +40,12 @@ public abstract class BaseBooleanValidator extends BaseObjectValidator implement
        private static final long serialVersionUID = 42_378_178_715_910_689L;
 
        @Override
-       public void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields) throws ValidatorException {
+       public void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields, boolean allowNull) throws ValidatorException {
                // Trace message
                //this.getLogger().logTrace(MessageFormat.format("preValidate: context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N
 
                // Pre-validate
-               super.preValidate(context, component, value, requiredFields);
+               super.preValidate(context, component, value, requiredFields, allowNull);
 
                // Get client id and init message + key
                String clientId = component.getClientId();

diff --git a/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java b/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java
index e9d6e20d0452d61878c8a73945c6656149ed93ca..af682532aacc77b25f5b2aa55e8416641acb8ab9 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java
+++ b/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java
@@ -43,7 +43,7 @@ public class PrivacyTermsCheckboxValidator extends BaseBooleanValidator implemen
                String[] requiredFileds = {"privacy", "terms"}; //NOI18N
 
                // Pre-validation (example: not null, not a string, empty string ...)
-               super.preValidate(context, component, value, requiredFileds);
+               super.preValidate(context, component, value, requiredFileds, false);
 
                // Trace message
                //this.getLogger().logTrace("validate: EXIT!"); //NOI18N

diff --git a/src/org/mxchange/jcoreee/validator/number/BaseLongValidator.java b/src/org/mxchange/jcoreee/validator/number/BaseLongValidator.java
index 9406d523c9416da43084fd5681ac243fcdac50b2..b5475d09e10fa59b53b6d2c710c3036fb4383bd1 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/number/BaseLongValidator.java
+++ b/src/org/mxchange/jcoreee/validator/number/BaseLongValidator.java
@@ -37,12 +37,12 @@ public abstract class BaseLongValidator extends BaseObjectValidator implements V
        private static final long serialVersionUID = 25_481_878_590_589_321L;
 
        @Override
-       public void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields) throws ValidatorException {
+       public void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields, boolean allowNull) throws ValidatorException {
                // Trace message
                //this.getLogger().logTrace(MessageFormat.format("preValidate: context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N
 
                // Pre-validate
-               super.preValidate(context, component, value, requiredFields);
+               super.preValidate(context, component, value, requiredFields, allowNull);
 
                // Get client id and init message + key
                String clientId = component.getClientId();

diff --git a/src/org/mxchange/jcoreee/validator/number/item_amount/ItemAmountValidator.java b/src/org/mxchange/jcoreee/validator/number/item_amount/ItemAmountValidator.java
index 96392d4d964bdad6e2d1e312092174af486c1cae..714b42a5c88abe496902d4d20194279742f6c73e 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/number/item_amount/ItemAmountValidator.java
+++ b/src/org/mxchange/jcoreee/validator/number/item_amount/ItemAmountValidator.java
@@ -43,7 +43,7 @@ public class ItemAmountValidator extends BaseLongValidator implements Validator
                String[] requiredFileds = {"amount"}; //NOI18N
 
                // Pre-validation (example: not null, not a string, empty string ...)
-               super.preValidate(context, component, value, requiredFileds);
+               super.preValidate(context, component, value, requiredFileds, false);
 
                // Trace message
                //this.getLogger().logTrace("validate: EXIT!"); //NOI18N

diff --git a/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java b/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java
index 0326176080cbbc3d099b4b3f53373eceac4cf0e4..159fc500618a3d5e1aac1af9b9e77064d5c605b1 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java
+++ b/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java
@@ -37,12 +37,12 @@ public abstract class BaseStringValidator extends BaseObjectValidator {
        private static final long serialVersionUID = 15_484_578_781_760_287L;
 
        @Override
-       protected void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields) throws ValidatorException {
+       protected void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields, boolean allowNull) throws ValidatorException {
                // Trace message
                //this.getLogger().logTrace(MessageFormat.format("preValidate: context={0},component={1},value={2},fields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N
 
                // Pre-validate (example: on null)
-               super.preValidate(context, component, value, requiredFields);
+               super.preValidate(context, component, value, requiredFields, allowNull);
 
                // Get client id and init message + key
                String clientId = component.getClientId();

diff --git a/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java b/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java
index 9d1f8335290a6f66f29398b1d5bb72bac305ed1b..a84a548d49a3e4d37e1b05479e1e571e25290b03 100644 (file)
--- a/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java
+++ b/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java
@@ -43,7 +43,7 @@ public class NameValidator extends BaseStringValidator implements Validator {
                String[] requiredFileds = {"firstName", "familyName", "city", "street"}; //NOI18N
 
                // Pre-validation (example: not null, not a string, empty string ...)
-               super.preValidate(context, component, value, requiredFileds);
+               super.preValidate(context, component, value, requiredFileds, true);
 
                // Trace message
                //this.getLogger().logTrace("validate: EXIT!"); //NOI18N