Author: athimel Date: 2011-11-30 09:56:34 +0100 (Wed, 30 Nov 2011) New Revision: 2241 Url: http://nuiton.org/repositories/revision/nuiton-utils/2241 Log: Anomalie #1838 VAT identification number validator does not support spaces Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidatorTest.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java 2011-11-30 08:52:51 UTC (rev 2240) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java 2011-11-30 08:56:34 UTC (rev 2241) @@ -53,11 +53,17 @@ return; } if (value instanceof String) { - if (StringUtils.isEmpty((String) value)) { + + String vatNumber = (String) value; + if (StringUtils.isEmpty(vatNumber)) { // no value defined return; } - Matcher m = p.matcher((String) value); + + // Remove any space + vatNumber = vatNumber.replaceAll(" ", ""); + + Matcher m = p.matcher(vatNumber); if (!m.matches()) { addFieldError(fieldName, object); } Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidatorTest.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidatorTest.java 2011-11-30 08:52:51 UTC (rev 2240) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidatorTest.java 2011-11-30 08:56:34 UTC (rev 2241) @@ -61,7 +61,7 @@ // Not valid vat, spaces in it bean.setVat("FR 57 442116703"); assertFieldInError(Company.PROPERTY_VAT_NUMBER, "company.vat.format", - true); + false); // Use required string validator for that bean.setVat("");