This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git

commit d8775a12b3f88bb7ee1e1cfb1e5449a3311c29c9
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat May 4 11:29:29 2024 -0400

    Use Checkstyle WhitespaceAfter
---
 .checkstyle                                         |  7 +++++++
 src/conf/checkstyle.xml                             |  1 +
 .../java/org/apache/commons/validator/Form.java     | 10 +++++-----
 .../org/apache/commons/validator/package-info.java  |  2 +-
 .../routines/AbstractCalendarValidator.java         | 21 ++++++++++-----------
 .../validator/routines/AbstractFormatValidator.java | 16 ++++++----------
 .../validator/routines/BigDecimalValidator.java     | 12 ++++++------
 .../validator/routines/BigIntegerValidator.java     | 10 +++++-----
 .../commons/validator/routines/ByteValidator.java   | 12 ++++++------
 .../validator/routines/CalendarValidator.java       | 18 +++++++++---------
 .../validator/routines/CreditCardValidator.java     | 14 +++++++-------
 .../validator/routines/CurrencyValidator.java       |  2 +-
 .../commons/validator/routines/DateValidator.java   | 16 ++++++++--------
 .../commons/validator/routines/DomainValidator.java |  2 +-
 .../commons/validator/routines/DoubleValidator.java | 10 +++++-----
 .../commons/validator/routines/FloatValidator.java  |  8 ++++----
 .../commons/validator/routines/ISINValidator.java   |  4 ++--
 .../validator/routines/IntegerValidator.java        | 12 ++++++------
 .../commons/validator/routines/LongValidator.java   |  8 ++++----
 .../validator/routines/PercentValidator.java        |  6 +++---
 .../commons/validator/routines/ShortValidator.java  | 12 ++++++------
 .../commons/validator/routines/TimeValidator.java   | 18 +++++++++---------
 .../commons/validator/routines/UrlValidator.java    |  5 ++---
 .../routines/checkdigit/VerhoeffCheckDigit.java     |  2 +-
 .../org/apache/commons/validator/EmailTest.java     |  8 ++++----
 .../validator/routines/EmailValidatorTest.java      |  8 ++++----
 26 files changed, 123 insertions(+), 121 deletions(-)

diff --git a/.checkstyle b/.checkstyle
new file mode 100644
index 00000000..5783bc0d
--- /dev/null
+++ b/.checkstyle
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" 
sync-formatter="false">
+  <fileset name="all" enabled="true" check-config-name="Google Checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index fc2c599a..fbc3749c 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -129,6 +129,7 @@
       <property name="separated" value="true"/>
     </module>
     <module name="WhitespaceAround"/>
+    <module name="WhitespaceAfter"/>
     <module name="TypecastParenPad"/>
     <module name="SingleSpaceSeparator"/>
   </module>
diff --git a/src/main/java/org/apache/commons/validator/Form.java 
b/src/main/java/org/apache/commons/validator/Form.java
index fa4c12f3..06814af0 100644
--- a/src/main/java/org/apache/commons/validator/Form.java
+++ b/src/main/java/org/apache/commons/validator/Form.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.FastHashMap;// DEPRECATED
+import org.apache.commons.collections.FastHashMap; // DEPRECATED
 
 /**
  * <p>
@@ -213,16 +213,16 @@ public class Form implements Serializable {
             return;
         }
 
-        int n = 0;//we want the fields from its parent first
+        int n = 0; //we want the fields from its parent first
         if (isExtending()) {
             final Form parent = forms.get(inherit);
             if (parent != null) {
                 if (!parent.isProcessed()) {
-                    //we want to go all the way up the tree
+                    // we want to go all the way up the tree
                     parent.process(constants, globalConstants, forms);
                 }
                 for (final Field f : parent.getFields()) {
-                    //we want to be able to override any fields we like
+                    // we want to be able to override any fields we like
                     if (getFieldMap().get(f.getKey()) == null) {
                         lFields.add(n, f);
                         getFieldMap().put(f.getKey(), f);
@@ -232,7 +232,7 @@ public class Form implements Serializable {
             }
         }
         hFields.setFast(true);
-        //no need to reprocess parent's fields, we iterate from 'n'
+        // no need to reprocess parent's fields, we iterate from 'n'
         for (final Iterator<Field> i = lFields.listIterator(n); i.hasNext(); ) 
{
             final Field f = i.next();
             f.process(globalConstants, constants);
diff --git a/src/main/java/org/apache/commons/validator/package-info.java 
b/src/main/java/org/apache/commons/validator/package-info.java
index 10373b1e..e0e1fd48 100644
--- a/src/main/java/org/apache/commons/validator/package-info.java
+++ b/src/main/java/org/apache/commons/validator/package-info.java
@@ -204,7 +204,7 @@
  * // no error
  * } else {
  * // number of errors for first name
- * int errors = ((Integer)results.get("firstName")).intValue();
+ * int errors = ((Integer) results.get("firstName")).intValue();
  * }
  * </pre>
  * <a id="doc.Usage.pluggableValidator"></a>
diff --git 
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
 
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
index 324a5707..7a46484d 100644
--- 
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
+++ 
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
@@ -240,7 +240,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
             return null;
         }
         if (value instanceof Calendar) {
-            value = ((Calendar)value).getTime();
+            value = ((Calendar) value).getTime();
         }
         return formatter.format(value);
     }
@@ -256,7 +256,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
      * @return The value formatted as a <code>String</code>.
      */
     public String format(final Object value, final Locale locale, final 
TimeZone timeZone) {
-        return format(value, (String)null, locale, timeZone);
+        return format(value, (String) null, locale, timeZone);
     }
 
     /**
@@ -270,7 +270,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
      */
     @Override
     public String format(final Object value, final String pattern, final 
Locale locale) {
-        return format(value, pattern, locale, (TimeZone)null);
+        return format(value, pattern, locale, (TimeZone) null);
     }
 
     /**
@@ -285,11 +285,11 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
      * @return The value formatted as a <code>String</code>.
      */
     public String format(final Object value, final String pattern, final 
Locale locale, final TimeZone timeZone) {
-        final DateFormat formatter = (DateFormat)getFormat(pattern, locale);
+        final DateFormat formatter = (DateFormat) getFormat(pattern, locale);
         if (timeZone != null) {
             formatter.setTimeZone(timeZone);
         } else if (value instanceof Calendar) {
-            formatter.setTimeZone(((Calendar)value).getTimeZone());
+            formatter.setTimeZone(((Calendar) value).getTimeZone());
         }
         return format(value, formatter);
     }
@@ -305,7 +305,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
      * @return The value formatted as a <code>String</code>.
      */
     public String format(final Object value, final String pattern, final 
TimeZone timeZone) {
-        return format(value, pattern, (Locale)null, timeZone);
+        return format(value, pattern, (Locale) null, timeZone);
     }
 
     /**
@@ -318,7 +318,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
      * @return The value formatted as a <code>String</code>.
      */
     public String format(final Object value, final TimeZone timeZone) {
-        return format(value, (String)null, (Locale)null, timeZone);
+        return format(value, (String) null, (Locale) null, timeZone);
     }
 
     /**
@@ -329,7 +329,6 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
      * @return The <code>DateFormat</code> to created.
      */
     protected Format getFormat(final Locale locale) {
-
         DateFormat formatter;
         if (dateStyle >= 0 && timeStyle >= 0) {
             if (locale == null) {
@@ -370,7 +369,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
         DateFormat formatter;
         final boolean usePattern = pattern != null && !pattern.isEmpty();
         if (!usePattern) {
-            formatter = (DateFormat)getFormat(locale);
+            formatter = (DateFormat) getFormat(locale);
         } else if (locale == null) {
             formatter = new SimpleDateFormat(pattern);
         } else {
@@ -391,7 +390,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
      */
     @Override
     public boolean isValid(final String value, final String pattern, final 
Locale locale) {
-        final Object parsedValue = parse(value, pattern, locale, 
(TimeZone)null);
+        final Object parsedValue = parse(value, pattern, locale, (TimeZone) 
null);
         return parsedValue == null ? false : true;
     }
 
@@ -411,7 +410,7 @@ public abstract class AbstractCalendarValidator extends 
AbstractFormatValidator
         if (value == null || value.isEmpty()) {
             return null;
         }
-        final DateFormat formatter = (DateFormat)getFormat(pattern, locale);
+        final DateFormat formatter = (DateFormat) getFormat(pattern, locale);
         if (timeZone != null) {
             formatter.setTimeZone(timeZone);
         }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/AbstractFormatValidator.java
 
b/src/main/java/org/apache/commons/validator/routines/AbstractFormatValidator.java
index 6797a345..661c90f2 100644
--- 
a/src/main/java/org/apache/commons/validator/routines/AbstractFormatValidator.java
+++ 
b/src/main/java/org/apache/commons/validator/routines/AbstractFormatValidator.java
@@ -56,7 +56,7 @@ public abstract class AbstractFormatValidator implements 
Serializable {
      * @return The value formatted as a <code>String</code>.
      */
     public String format(final Object value) {
-        return format(value, (String)null, (Locale)null);
+        return format(value, (String) null, (Locale) null);
     }
 
     /**
@@ -79,7 +79,7 @@ public abstract class AbstractFormatValidator implements 
Serializable {
      * @return The value formatted as a <code>String</code>.
      */
     public String format(final Object value, final Locale locale) {
-        return format(value, (String)null, locale);
+        return format(value, (String) null, locale);
     }
 
     /**
@@ -91,7 +91,7 @@ public abstract class AbstractFormatValidator implements 
Serializable {
      * @return The value formatted as a <code>String</code>.
      */
     public String format(final Object value, final String pattern) {
-        return format(value, pattern, (Locale)null);
+        return format(value, pattern, (Locale) null);
     }
 
     /**
@@ -147,7 +147,7 @@ public abstract class AbstractFormatValidator implements 
Serializable {
      * @return {@code true} if the value is valid.
      */
     public boolean isValid(final String value) {
-        return isValid(value, (String)null, (Locale)null);
+        return isValid(value, (String) null, (Locale) null);
     }
 
     /**
@@ -158,7 +158,7 @@ public abstract class AbstractFormatValidator implements 
Serializable {
      * @return {@code true} if the value is valid.
      */
     public boolean isValid(final String value, final Locale locale) {
-        return isValid(value, (String)null, locale);
+        return isValid(value, (String) null, locale);
     }
 
     /**
@@ -169,7 +169,7 @@ public abstract class AbstractFormatValidator implements 
Serializable {
      * @return {@code true} if the value is valid.
      */
     public boolean isValid(final String value, final String pattern) {
-        return isValid(value, pattern, (Locale)null);
+        return isValid(value, pattern, (Locale) null);
     }
 
     /**
@@ -190,21 +190,17 @@ public abstract class AbstractFormatValidator implements 
Serializable {
      * @return The parsed value if valid or {@code null} if invalid.
      */
     protected Object parse(final String value, final Format formatter) {
-
         final ParsePosition pos = new ParsePosition(0);
         Object parsedValue = formatter.parseObject(value, pos);
         if (pos.getErrorIndex() > -1) {
             return null;
         }
-
         if (isStrict() && pos.getIndex() < value.length()) {
             return null;
         }
-
         if (parsedValue != null) {
             parsedValue = processParsedValue(parsedValue, formatter);
         }
-
         return parsedValue;
 
     }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java 
b/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java
index 9a1db632..c766b791 100644
--- 
a/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java
+++ 
b/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java
@@ -173,12 +173,12 @@ public class BigDecimalValidator extends 
AbstractNumberValidator {
     protected Object processParsedValue(final Object value, final Format 
formatter) {
         BigDecimal decimal;
         if (value instanceof Long) {
-            decimal = BigDecimal.valueOf(((Long)value).longValue());
+            decimal = BigDecimal.valueOf(((Long) value).longValue());
         } else {
             decimal = new BigDecimal(value.toString());
         }
 
-        final int scale = determineScale((NumberFormat)formatter);
+        final int scale = determineScale((NumberFormat) formatter);
         if (scale >= 0) {
             decimal = decimal.setScale(scale, BigDecimal.ROUND_DOWN);
         }
@@ -195,7 +195,7 @@ public class BigDecimalValidator extends 
AbstractNumberValidator {
      *  if invalid.
      */
     public BigDecimal validate(final String value) {
-        return (BigDecimal)parse(value, (String)null, (Locale)null);
+        return (BigDecimal) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -207,7 +207,7 @@ public class BigDecimalValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>BigDecimal</code> if valid or {@code null} if 
invalid.
      */
     public BigDecimal validate(final String value, final Locale locale) {
-        return (BigDecimal)parse(value, (String)null, locale);
+        return (BigDecimal) parse(value, (String) null, locale);
     }
 
     /**
@@ -220,7 +220,7 @@ public class BigDecimalValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>BigDecimal</code> if valid or {@code null} if 
invalid.
      */
     public BigDecimal validate(final String value, final String pattern) {
-        return (BigDecimal)parse(value, pattern, (Locale)null);
+        return (BigDecimal) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -234,6 +234,6 @@ public class BigDecimalValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>BigDecimal</code> if valid or {@code null} if 
invalid.
      */
     public BigDecimal validate(final String value, final String pattern, final 
Locale locale) {
-        return (BigDecimal)parse(value, pattern, locale);
+        return (BigDecimal) parse(value, pattern, locale);
     }
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/BigIntegerValidator.java 
b/src/main/java/org/apache/commons/validator/routines/BigIntegerValidator.java
index 7a2d3085..7ec0fcca 100644
--- 
a/src/main/java/org/apache/commons/validator/routines/BigIntegerValidator.java
+++ 
b/src/main/java/org/apache/commons/validator/routines/BigIntegerValidator.java
@@ -155,7 +155,7 @@ public class BigIntegerValidator extends 
AbstractNumberValidator {
      */
     @Override
     protected Object processParsedValue(final Object value, final Format 
formatter) {
-        return BigInteger.valueOf(((Number)value).longValue());
+        return BigInteger.valueOf(((Number) value).longValue());
     }
 
     /**
@@ -167,7 +167,7 @@ public class BigIntegerValidator extends 
AbstractNumberValidator {
      *  if invalid.
      */
     public BigInteger validate(final String value) {
-        return (BigInteger)parse(value, (String)null, (Locale)null);
+        return (BigInteger) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -179,7 +179,7 @@ public class BigIntegerValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>BigInteger</code> if valid or {@code null} if 
invalid.
      */
     public BigInteger validate(final String value, final Locale locale) {
-        return (BigInteger)parse(value, (String)null, locale);
+        return (BigInteger) parse(value, (String) null, locale);
     }
 
     /**
@@ -191,7 +191,7 @@ public class BigIntegerValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>BigInteger</code> if valid or {@code null} if 
invalid.
      */
     public BigInteger validate(final String value, final String pattern) {
-        return (BigInteger)parse(value, pattern, (Locale)null);
+        return (BigInteger) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -205,6 +205,6 @@ public class BigIntegerValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>BigInteger</code> if valid or {@code null} if 
invalid.
      */
     public BigInteger validate(final String value, final String pattern, final 
Locale locale) {
-        return (BigInteger)parse(value, pattern, locale);
+        return (BigInteger) parse(value, pattern, locale);
     }
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/ByteValidator.java 
b/src/main/java/org/apache/commons/validator/routines/ByteValidator.java
index ad26fc49..a21cbfbc 100644
--- a/src/main/java/org/apache/commons/validator/routines/ByteValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/ByteValidator.java
@@ -195,10 +195,10 @@ public class ByteValidator extends 
AbstractNumberValidator {
 
         // Parsed value will be Long if it fits in a long and is not fractional
         if (value instanceof Long) {
-            final long longValue = ((Long)value).longValue();
+            final long longValue = ((Long) value).longValue();
             if (longValue >= Byte.MIN_VALUE &&
                 longValue <= Byte.MAX_VALUE) {
-                return Byte.valueOf((byte)longValue);
+                return Byte.valueOf((byte) longValue);
             }
         }
         return null;
@@ -213,7 +213,7 @@ public class ByteValidator extends AbstractNumberValidator {
      *  if invalid.
      */
     public Byte validate(final String value) {
-        return (Byte)parse(value, (String)null, (Locale)null);
+        return (Byte) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -225,7 +225,7 @@ public class ByteValidator extends AbstractNumberValidator {
      * @return The parsed <code>Byte</code> if valid or {@code null} if 
invalid.
      */
     public Byte validate(final String value, final Locale locale) {
-        return (Byte)parse(value, (String)null, locale);
+        return (Byte) parse(value, (String) null, locale);
     }
 
     /**
@@ -237,7 +237,7 @@ public class ByteValidator extends AbstractNumberValidator {
      * @return The parsed <code>Byte</code> if valid or {@code null} if 
invalid.
      */
     public Byte validate(final String value, final String pattern) {
-        return (Byte)parse(value, pattern, (Locale)null);
+        return (Byte) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -251,7 +251,7 @@ public class ByteValidator extends AbstractNumberValidator {
      * @return The parsed <code>Byte</code> if valid or {@code null} if 
invalid.
      */
     public Byte validate(final String value, final String pattern, final 
Locale locale) {
-        return (Byte)parse(value, pattern, locale);
+        return (Byte) parse(value, pattern, locale);
     }
 
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/CalendarValidator.java 
b/src/main/java/org/apache/commons/validator/routines/CalendarValidator.java
index 4428b7c5..47a77b5d 100644
--- a/src/main/java/org/apache/commons/validator/routines/CalendarValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/CalendarValidator.java
@@ -227,7 +227,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      */
     @Override
     protected Object processParsedValue(final Object value, final Format 
formatter) {
-        return ((DateFormat)formatter).getCalendar();
+        return ((DateFormat) formatter).getCalendar();
     }
 
     /**
@@ -239,7 +239,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      *  if invalid.
      */
     public Calendar validate(final String value) {
-        return (Calendar)parse(value, (String)null, (Locale)null, 
(TimeZone)null);
+        return (Calendar) parse(value, (String) null, (Locale) null, 
(TimeZone) null);
     }
 
     /**
@@ -251,7 +251,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final Locale locale) {
-        return (Calendar)parse(value, (String)null, locale, (TimeZone)null);
+        return (Calendar) parse(value, (String) null, locale, (TimeZone) null);
     }
 
     /**
@@ -264,7 +264,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final Locale locale, final 
TimeZone timeZone) {
-        return (Calendar)parse(value, (String)null, locale, timeZone);
+        return (Calendar) parse(value, (String) null, locale, timeZone);
     }
 
     /**
@@ -276,7 +276,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern) {
-        return (Calendar)parse(value, pattern, (Locale)null, (TimeZone)null);
+        return (Calendar) parse(value, pattern, (Locale) null, (TimeZone) 
null);
     }
 
     /**
@@ -290,7 +290,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern, final 
Locale locale) {
-        return (Calendar)parse(value, pattern, locale, (TimeZone)null);
+        return (Calendar) parse(value, pattern, locale, (TimeZone) null);
     }
 
     /**
@@ -305,7 +305,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern, final 
Locale locale, final TimeZone timeZone) {
-        return (Calendar)parse(value, pattern, locale, timeZone);
+        return (Calendar) parse(value, pattern, locale, timeZone);
     }
 
     /**
@@ -318,7 +318,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern, final 
TimeZone timeZone) {
-        return (Calendar)parse(value, pattern, (Locale)null, timeZone);
+        return (Calendar) parse(value, pattern, (Locale) null, timeZone);
     }
 
     /**
@@ -331,7 +331,7 @@ public class CalendarValidator extends 
AbstractCalendarValidator {
      *  if invalid.
      */
     public Calendar validate(final String value, final TimeZone timeZone) {
-        return (Calendar)parse(value, (String)null, (Locale)null, timeZone);
+        return (Calendar) parse(value, (String) null, (Locale) null, timeZone);
     }
 
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java 
b/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
index 98868e5a..49474d99 100644
--- 
a/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
+++ 
b/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
@@ -248,14 +248,14 @@ public class CreditCardValidator implements Serializable {
      * </ul>
      */
     private static final RegexValidator MASTERCARD_REGEX = new RegexValidator(
-            "^(5[1-5]\\d{14})$",  // 51 - 55 (pre Oct 2016)
+            "^(5[1-5]\\d{14})$",   // 51 - 55 (pre Oct 2016)
             // valid from October 2016
-            "^(2221\\d{12})$",    // 222100 - 222199
-            "^(222[2-9]\\d{12})$",// 222200 - 222999
-            "^(22[3-9]\\d{13})$", // 223000 - 229999
-            "^(2[3-6]\\d{14})$",  // 230000 - 269999
-            "^(27[01]\\d{13})$",  // 270000 - 271999
-            "^(2720\\d{12})$"     // 272000 - 272099
+            "^(2221\\d{12})$",     // 222100 - 222199
+            "^(222[2-9]\\d{12})$", // 222200 - 222999
+            "^(22[3-9]\\d{13})$",  // 223000 - 229999
+            "^(2[3-6]\\d{14})$",   // 230000 - 269999
+            "^(27[01]\\d{13})$",   // 270000 - 271999
+            "^(2720\\d{12})$"      // 272000 - 272099
         );
 
     /** Mastercard Card Validator */
diff --git 
a/src/main/java/org/apache/commons/validator/routines/CurrencyValidator.java 
b/src/main/java/org/apache/commons/validator/routines/CurrencyValidator.java
index 5afba19f..4a57520c 100644
--- a/src/main/java/org/apache/commons/validator/routines/CurrencyValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/CurrencyValidator.java
@@ -100,7 +100,7 @@ public class CurrencyValidator extends BigDecimalValidator {
         }
 
         // Re-parse using a pattern without the currency symbol
-        final DecimalFormat decimalFormat = (DecimalFormat)formatter;
+        final DecimalFormat decimalFormat = (DecimalFormat) formatter;
         final String pattern = decimalFormat.toPattern();
         if (pattern.indexOf(CURRENCY_SYMBOL) >= 0) {
             final StringBuilder buffer = new StringBuilder(pattern.length());
diff --git 
a/src/main/java/org/apache/commons/validator/routines/DateValidator.java 
b/src/main/java/org/apache/commons/validator/routines/DateValidator.java
index ceeef158..d00ad34e 100644
--- a/src/main/java/org/apache/commons/validator/routines/DateValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DateValidator.java
@@ -250,7 +250,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      *  if invalid.
      */
     public Date validate(final String value) {
-        return (Date)parse(value, (String)null, (Locale)null, (TimeZone)null);
+        return (Date) parse(value, (String) null, (Locale) null, (TimeZone) 
null);
     }
 
     /**
@@ -262,7 +262,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Date</code> if valid or {@code null} if 
invalid.
      */
     public Date validate(final String value, final Locale locale) {
-        return (Date)parse(value, (String)null, locale, (TimeZone)null);
+        return (Date) parse(value, (String) null, locale, (TimeZone) null);
     }
 
     /**
@@ -275,7 +275,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Date</code> if valid or {@code null} if 
invalid.
      */
     public Date validate(final String value, final Locale locale, final 
TimeZone timeZone) {
-        return (Date)parse(value, (String)null, locale, timeZone);
+        return (Date) parse(value, (String) null, locale, timeZone);
     }
 
     /**
@@ -288,7 +288,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Date</code> if valid or {@code null} if 
invalid.
      */
     public Date validate(final String value, final String pattern) {
-        return (Date)parse(value, pattern, (Locale)null, (TimeZone)null);
+        return (Date) parse(value, pattern, (Locale) null, (TimeZone) null);
     }
 
     /**
@@ -302,7 +302,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Date</code> if valid or {@code null} if 
invalid.
      */
     public Date validate(final String value, final String pattern, final 
Locale locale) {
-        return (Date)parse(value, pattern, locale, (TimeZone)null);
+        return (Date) parse(value, pattern, locale, (TimeZone) null);
     }
 
     /**
@@ -317,7 +317,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Date</code> if valid or {@code null} if 
invalid.
      */
     public Date validate(final String value, final String pattern, final 
Locale locale, final TimeZone timeZone) {
-        return (Date)parse(value, pattern, locale, timeZone);
+        return (Date) parse(value, pattern, locale, timeZone);
     }
 
     /**
@@ -331,7 +331,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Date</code> if valid or {@code null} if 
invalid.
      */
     public Date validate(final String value, final String pattern, final 
TimeZone timeZone) {
-        return (Date)parse(value, pattern, (Locale)null, timeZone);
+        return (Date) parse(value, pattern, (Locale) null, timeZone);
     }
 
     /**
@@ -343,7 +343,7 @@ public class DateValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Date</code> if valid or {@code null} if 
invalid.
      */
     public Date validate(final String value, final TimeZone timeZone) {
-        return (Date)parse(value, (String)null, (Locale)null, timeZone);
+        return (Date) parse(value, (String) null, (Locale) null, timeZone);
     }
 
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/DomainValidator.java 
b/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
index ef2fab15..f7f7845b 100644
--- a/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
@@ -1942,7 +1942,7 @@ public class DomainValidator implements Serializable {
             // characters MUST be recognized as dots: U+002E (full stop), 
U+3002
             // (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61
             // (halfwidth ideographic full stop).
-            final char lastChar = input.charAt(length - 1);// fetch original 
last char
+            final char lastChar = input.charAt(length - 1); // fetch original 
last char
             switch (lastChar) {
             case '\u002E': // "." full stop
             case '\u3002': // ideographic full stop
diff --git 
a/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java 
b/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
index f7ef52e6..46d1abaa 100644
--- a/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
@@ -195,7 +195,7 @@ public class DoubleValidator extends 
AbstractNumberValidator {
         if (value instanceof Double) {
             return value;
         }
-        return Double.valueOf(((Number)value).doubleValue());
+        return Double.valueOf(((Number) value).doubleValue());
 
     }
 
@@ -208,7 +208,7 @@ public class DoubleValidator extends 
AbstractNumberValidator {
      *  if invalid.
      */
     public Double validate(final String value) {
-        return (Double)parse(value, (String)null, (Locale)null);
+        return (Double) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -220,7 +220,7 @@ public class DoubleValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>Double</code> if valid or {@code null} if 
invalid.
      */
     public Double validate(final String value, final Locale locale) {
-        return (Double)parse(value, (String)null, locale);
+        return (Double) parse(value, (String) null, locale);
     }
 
     /**
@@ -232,7 +232,7 @@ public class DoubleValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>BigDecimal</code> if valid or {@code null} if 
invalid.
      */
     public Double validate(final String value, final String pattern) {
-        return (Double)parse(value, pattern, (Locale)null);
+        return (Double) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -246,6 +246,6 @@ public class DoubleValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>Double</code> if valid or {@code null} if 
invalid.
      */
     public Double validate(final String value, final String pattern, final 
Locale locale) {
-        return (Double)parse(value, pattern, locale);
+        return (Double) parse(value, pattern, locale);
     }
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/FloatValidator.java 
b/src/main/java/org/apache/commons/validator/routines/FloatValidator.java
index ede83912..180f976a 100644
--- a/src/main/java/org/apache/commons/validator/routines/FloatValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/FloatValidator.java
@@ -225,7 +225,7 @@ public class FloatValidator extends AbstractNumberValidator 
{
      *  if invalid.
      */
     public Float validate(final String value) {
-        return (Float)parse(value, (String)null, (Locale)null);
+        return (Float) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -237,7 +237,7 @@ public class FloatValidator extends AbstractNumberValidator 
{
      * @return The parsed <code>Float</code> if valid or {@code null} if 
invalid.
      */
     public Float validate(final String value, final Locale locale) {
-        return (Float)parse(value, (String)null, locale);
+        return (Float) parse(value, (String) null, locale);
     }
 
     /**
@@ -249,7 +249,7 @@ public class FloatValidator extends AbstractNumberValidator 
{
      * @return The parsed <code>Float</code> if valid or {@code null} if 
invalid.
      */
     public Float validate(final String value, final String pattern) {
-        return (Float)parse(value, pattern, (Locale)null);
+        return (Float) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -263,7 +263,7 @@ public class FloatValidator extends AbstractNumberValidator 
{
      * @return The parsed <code>Float</code> if valid or {@code null} if 
invalid.
      */
     public Float validate(final String value, final String pattern, final 
Locale locale) {
-        return (Float)parse(value, pattern, locale);
+        return (Float) parse(value, pattern, locale);
     }
 
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/ISINValidator.java 
b/src/main/java/org/apache/commons/validator/routines/ISINValidator.java
index 3ff30c3c..df83bae0 100644
--- a/src/main/java/org/apache/commons/validator/routines/ISINValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/ISINValidator.java
@@ -462,7 +462,7 @@ public class ISINValidator implements Serializable {
     public boolean isValid(final String code) {
         final boolean valid = VALIDATOR.isValid(code);
         if (valid && checkCountryCode) {
-            return checkCode(code.substring(0,2));
+            return checkCode(code.substring(0, 2));
         }
         return valid;
     }
@@ -476,7 +476,7 @@ public class ISINValidator implements Serializable {
     public Object validate(final String code) {
         final Object validate = VALIDATOR.validate(code);
         if (validate != null && checkCountryCode) {
-            return checkCode(code.substring(0,2)) ? validate : null;
+            return checkCode(code.substring(0, 2)) ? validate : null;
         }
         return validate;
     }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java 
b/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java
index 0882bac1..267fc0f3 100644
--- a/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java
@@ -195,10 +195,10 @@ public class IntegerValidator extends 
AbstractNumberValidator {
 
         // Parsed value will be Long if it fits in a long and is not fractional
         if (value instanceof Long) {
-            final long longValue = ((Long)value).longValue();
+            final long longValue = ((Long) value).longValue();
             if (longValue >= Integer.MIN_VALUE &&
                 longValue <= Integer.MAX_VALUE) {
-                return Integer.valueOf((int)longValue);
+                return Integer.valueOf((int) longValue);
             }
         }
         return null;
@@ -213,7 +213,7 @@ public class IntegerValidator extends 
AbstractNumberValidator {
      *  if invalid.
      */
     public Integer validate(final String value) {
-        return (Integer)parse(value, (String)null, (Locale)null);
+        return (Integer) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -225,7 +225,7 @@ public class IntegerValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>Integer</code> if valid or {@code null} if 
invalid.
      */
     public Integer validate(final String value, final Locale locale) {
-        return (Integer)parse(value, (String)null, locale);
+        return (Integer) parse(value, (String) null, locale);
     }
 
     /**
@@ -237,7 +237,7 @@ public class IntegerValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>Integer</code> if valid or {@code null} if 
invalid.
      */
     public Integer validate(final String value, final String pattern) {
-        return (Integer)parse(value, pattern, (Locale)null);
+        return (Integer) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -251,6 +251,6 @@ public class IntegerValidator extends 
AbstractNumberValidator {
      * @return The parsed <code>Integer</code> if valid or {@code null} if 
invalid.
      */
     public Integer validate(final String value, final String pattern, final 
Locale locale) {
-        return (Integer)parse(value, pattern, locale);
+        return (Integer) parse(value, pattern, locale);
     }
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/LongValidator.java 
b/src/main/java/org/apache/commons/validator/routines/LongValidator.java
index 079a151e..edd69d5a 100644
--- a/src/main/java/org/apache/commons/validator/routines/LongValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/LongValidator.java
@@ -208,7 +208,7 @@ public class LongValidator extends AbstractNumberValidator {
      *  if invalid.
      */
     public Long validate(final String value) {
-        return (Long)parse(value, (String)null, (Locale)null);
+        return (Long) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -220,7 +220,7 @@ public class LongValidator extends AbstractNumberValidator {
      * @return The parsed <code>Long</code> if valid or {@code null} if 
invalid.
      */
     public Long validate(final String value, final Locale locale) {
-        return (Long)parse(value, (String)null, locale);
+        return (Long) parse(value, (String) null, locale);
     }
 
     /**
@@ -232,7 +232,7 @@ public class LongValidator extends AbstractNumberValidator {
      * @return The parsed <code>Long</code> if valid or {@code null} if 
invalid.
      */
     public Long validate(final String value, final String pattern) {
-        return (Long)parse(value, pattern, (Locale)null);
+        return (Long) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -246,6 +246,6 @@ public class LongValidator extends AbstractNumberValidator {
      * @return The parsed <code>Long</code> if valid or {@code null} if 
invalid.
      */
     public Long validate(final String value, final String pattern, final 
Locale locale) {
-        return (Long)parse(value, pattern, locale);
+        return (Long) parse(value, pattern, locale);
     }
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/PercentValidator.java 
b/src/main/java/org/apache/commons/validator/routines/PercentValidator.java
index 635dbe95..408783d2 100644
--- a/src/main/java/org/apache/commons/validator/routines/PercentValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/PercentValidator.java
@@ -97,13 +97,13 @@ public class PercentValidator extends BigDecimalValidator {
     protected Object parse(final String value, final Format formatter) {
 
         // Initial parse of the value
-        BigDecimal parsedValue = (BigDecimal)super.parse(value, formatter);
+        BigDecimal parsedValue = (BigDecimal) super.parse(value, formatter);
         if (parsedValue != null || !(formatter instanceof DecimalFormat)) {
             return parsedValue;
         }
 
         // Re-parse using a pattern without the percent symbol
-        final DecimalFormat decimalFormat = (DecimalFormat)formatter;
+        final DecimalFormat decimalFormat = (DecimalFormat) formatter;
         final String pattern = decimalFormat.toPattern();
         if (pattern.indexOf(PERCENT_SYMBOL) >= 0) {
             final StringBuilder buffer = new StringBuilder(pattern.length());
@@ -113,7 +113,7 @@ public class PercentValidator extends BigDecimalValidator {
                 }
             }
             decimalFormat.applyPattern(buffer.toString());
-            parsedValue = (BigDecimal)super.parse(value, decimalFormat);
+            parsedValue = (BigDecimal) super.parse(value, decimalFormat);
 
             // If parsed OK, divide by 100 to get percent
             if (parsedValue != null) {
diff --git 
a/src/main/java/org/apache/commons/validator/routines/ShortValidator.java 
b/src/main/java/org/apache/commons/validator/routines/ShortValidator.java
index f23d6762..c1c8ae7b 100644
--- a/src/main/java/org/apache/commons/validator/routines/ShortValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/ShortValidator.java
@@ -193,13 +193,13 @@ public class ShortValidator extends 
AbstractNumberValidator {
     @Override
     protected Object processParsedValue(final Object value, final Format 
formatter) {
 
-        final long longValue = ((Number)value).longValue();
+        final long longValue = ((Number) value).longValue();
 
         if (longValue < Short.MIN_VALUE ||
             longValue > Short.MAX_VALUE) {
             return null;
         }
-        return Short.valueOf((short)longValue);
+        return Short.valueOf((short) longValue);
     }
 
     /**
@@ -211,7 +211,7 @@ public class ShortValidator extends AbstractNumberValidator 
{
      *  if invalid.
      */
     public Short validate(final String value) {
-        return (Short)parse(value, (String)null, (Locale)null);
+        return (Short) parse(value, (String) null, (Locale) null);
     }
 
     /**
@@ -223,7 +223,7 @@ public class ShortValidator extends AbstractNumberValidator 
{
      * @return The parsed <code>Short</code> if valid or {@code null} if 
invalid.
      */
     public Short validate(final String value, final Locale locale) {
-        return (Short)parse(value, (String)null, locale);
+        return (Short) parse(value, (String) null, locale);
     }
 
     /**
@@ -235,7 +235,7 @@ public class ShortValidator extends AbstractNumberValidator 
{
      * @return The parsed <code>Short</code> if valid or {@code null} if 
invalid.
      */
     public Short validate(final String value, final String pattern) {
-        return (Short)parse(value, pattern, (Locale)null);
+        return (Short) parse(value, pattern, (Locale) null);
     }
 
     /**
@@ -249,6 +249,6 @@ public class ShortValidator extends AbstractNumberValidator 
{
      * @return The parsed <code>Short</code> if valid or {@code null} if 
invalid.
      */
     public Short validate(final String value, final String pattern, final 
Locale locale) {
-        return (Short)parse(value, pattern, locale);
+        return (Short) parse(value, pattern, locale);
     }
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/TimeValidator.java 
b/src/main/java/org/apache/commons/validator/routines/TimeValidator.java
index eee7ad42..f7b35c35 100644
--- a/src/main/java/org/apache/commons/validator/routines/TimeValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/TimeValidator.java
@@ -176,7 +176,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      */
     @Override
     protected Object processParsedValue(final Object value, final Format 
formatter) {
-        return ((DateFormat)formatter).getCalendar();
+        return ((DateFormat) formatter).getCalendar();
     }
 
     /**
@@ -188,7 +188,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      *  if invalid.
      */
     public Calendar validate(final String value) {
-        return (Calendar)parse(value, (String)null, (Locale)null, 
(TimeZone)null);
+        return (Calendar) parse(value, (String) null, (Locale) null, 
(TimeZone) null);
     }
 
     /**
@@ -200,7 +200,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final Locale locale) {
-        return (Calendar)parse(value, (String)null, locale, (TimeZone)null);
+        return (Calendar) parse(value, (String) null, locale, (TimeZone) null);
     }
 
     /**
@@ -213,7 +213,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final Locale locale, final 
TimeZone timeZone) {
-        return (Calendar)parse(value, (String)null, locale, timeZone);
+        return (Calendar) parse(value, (String) null, locale, timeZone);
     }
 
     /**
@@ -225,7 +225,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern) {
-        return (Calendar)parse(value, pattern, (Locale)null, (TimeZone)null);
+        return (Calendar) parse(value, pattern, (Locale) null, (TimeZone) 
null);
     }
 
     /**
@@ -239,7 +239,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern, final 
Locale locale) {
-        return (Calendar)parse(value, pattern, locale, (TimeZone)null);
+        return (Calendar) parse(value, pattern, locale, (TimeZone) null);
     }
 
     /**
@@ -254,7 +254,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern, final 
Locale locale, final TimeZone timeZone) {
-        return (Calendar)parse(value, pattern, locale, timeZone);
+        return (Calendar) parse(value, pattern, locale, timeZone);
     }
 
     /**
@@ -267,7 +267,7 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final String pattern, final 
TimeZone timeZone) {
-        return (Calendar)parse(value, pattern, (Locale)null, timeZone);
+        return (Calendar) parse(value, pattern, (Locale) null, timeZone);
     }
 
     /**
@@ -279,6 +279,6 @@ public class TimeValidator extends 
AbstractCalendarValidator {
      * @return The parsed <code>Calendar</code> if valid or {@code null} if 
invalid.
      */
     public Calendar validate(final String value, final TimeZone timeZone) {
-        return (Calendar)parse(value, (String)null, (Locale)null, timeZone);
+        return (Calendar) parse(value, (String) null, (Locale) null, timeZone);
     }
 }
diff --git 
a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java 
b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
index 62fb1697..1312b64e 100644
--- a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
@@ -494,10 +494,10 @@ public class UrlValidator implements Serializable {
 
         try {
             // Don't omit host otherwise leading path may be taken as host if 
it starts with //
-            final URI uri = new URI(null,"localhost",path,null);
+            final URI uri = new URI(null, "localhost", path, null);
             final String norm = uri.normalize().getPath();
             if (norm.startsWith("/../") // Trying to go via the parent dir
-             || norm.equals("/..")) {   // Trying to go to the parent dir
+                    || norm.equals("/..")) { // Trying to go to the parent dir
                 return false;
             }
         } catch (final URISyntaxException e) {
@@ -521,7 +521,6 @@ public class UrlValidator implements Serializable {
         if (query == null) {
             return true;
         }
-
         return QUERY_PATTERN.matcher(query).matches();
     }
 
diff --git 
a/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java
 
b/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java
index 42fe5417..4e8e0bef 100644
--- 
a/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java
+++ 
b/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java
@@ -96,7 +96,7 @@ public final class VerhoeffCheckDigit implements CheckDigit, 
Serializable {
             final int num = Character.getNumericValue(code.charAt(idx));
             if (num < 0 || num > 9) { // CHECKSTYLE IGNORE MagicNumber
                 throw new CheckDigitException("Invalid Character[" +
-                        i + "] = '" + (int)code.charAt(idx) + "'");
+                        i + "] = '" + (int) code.charAt(idx) + "'");
             }
             final int pos = includesCheckDigit ? i : i + 1;
             checksum = D_TABLE[checksum][P_TABLE[pos % 8][num]]; // CHECKSTYLE 
IGNORE MagicNumber
diff --git a/src/test/java/org/apache/commons/validator/EmailTest.java 
b/src/test/java/org/apache/commons/validator/EmailTest.java
index 63f1ef9b..cd9b4b9e 100644
--- a/src/test/java/org/apache/commons/validator/EmailTest.java
+++ b/src/test/java/org/apache/commons/validator/EmailTest.java
@@ -58,13 +58,13 @@ public class EmailTest extends AbstractCommonTest {
             new ResultPair("\"Abigail \"<abig...@example.com>", true), new 
ResultPair("\"Joe & J. Harvey\" <example @Org>", true),
             new ResultPair("Abigail <abigail @ example.com>", true), new 
ResultPair("Abigail made this <  abigail   @   example  .    com    >", true),
             new ResultPair("Abigail(the bitch)@example.com", true), new 
ResultPair("Abigail <abigail @ example . (bar) com >", true),
-            new ResultPair("Abigail < (one)  abigail (two) @(three)example . 
(bar) com (quz) >", true),
-            new ResultPair("Abigail (foo) (((baz)(nested) (comment)) ! ) < 
(one)  abigail (two) @(three)example . (bar) com (quz) >", true),
+            new ResultPair("Abigail < (one)  abigail (two) @(three) example . 
(bar) com (quz) >", true),
+            new ResultPair("Abigail (foo) (((baz)(nested) (comment)) ! ) < 
(one)  abigail (two) @(three) example . (bar) com (quz) >", true),
             new ResultPair("Abigail <abigail(fo\\(o)@example.com>", true), new 
ResultPair("Abigail <abigail(fo\\)o)@example.com> ", true),
             new ResultPair("(foo) abig...@example.com", true), new 
ResultPair("abig...@example.com (foo)", true),
             new ResultPair("\"Abi\\\"gail\" <abig...@example.com>", true), new 
ResultPair("abigail@[example.com]", true),
             new ResultPair("abigail@[exa\\[ple.com]", true), new 
ResultPair("abigail@[exa\\]ple.com]", true),
-            new ResultPair("\":sysmail\"@  Some-Group. Some-Org", true), new 
ResultPair("Muhammed.(I am  the greatest) Ali @(the)Vegas.WBA", true),
+            new ResultPair("\":sysmail\"@  Some-Group. Some-Org", true), new 
ResultPair("Muhammed.(I am  the greatest) Ali @(the) Vegas.WBA", true),
             new ResultPair("mailbox.sub1.sub2@this-domain", true), new 
ResultPair("sub-net.mailbox@sub-domain.domain", true), new ResultPair("name:;", 
true),
             new ResultPair("':;", true), new ResultPair("name:   ;", true), 
new ResultPair("Alfred Neuman <Neuman@BBN-TENEXA>", true),
             new ResultPair("Neuman@BBN-TENEXA", true), new 
ResultPair("\"George, Ted\" <Shared@Group.Arpanet>", true),
@@ -78,7 +78,7 @@ public class EmailTest extends AbstractCommonTest {
             new ResultPair("   Just a string", false), new 
ResultPair("string", false), new ResultPair("(comment)", false),
             new ResultPair("()@example.com", false), new 
ResultPair("fred(&)ba...@example.com", false), new ResultPair("fred\\ 
ba...@example.com", false),
             new ResultPair("Abigail <abi gail @ example.com>", false), new 
ResultPair("Abigail <abigail(fo(o)@example.com>", false),
-            new ResultPair("Abigail <abigail(fo)o)@example.com>", false), new 
ResultPair("\"Abi\"gail\" <abig...@example.com>", false),
+            new ResultPair("Abigail <abigail(fo) o)@example.com>", false), new 
ResultPair("\"Abi\"gail\" <abig...@example.com>", false),
             new ResultPair("abigail@[exa]ple.com]", false), new 
ResultPair("abigail@[exa[ple.com]", false), new 
ResultPair("abigail@[exaple].com]", false),
             new ResultPair("abigail@", false), new ResultPair("@example.com", 
false),
             new ResultPair("phrase: abig...@example.com abig...@example.com 
;", false), new ResultPair("invalid�c...@example.com", false) };
diff --git 
a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java 
b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
index 67c0a495..81e1a488 100644
--- 
a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
+++ 
b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
@@ -74,8 +74,8 @@ public class EmailValidatorTest {
         new ResultPair("Abigail made this <  abigail   @   example  .    com   
 >", true),
         new ResultPair("Abigail(the bitch)@example.com", true),
         new ResultPair("Abigail <abigail @ example . (bar) com >", true),
-        new ResultPair("Abigail < (one)  abigail (two) @(three)example . (bar) 
com (quz) >", true),
-        new ResultPair("Abigail (foo) (((baz)(nested) (comment)) ! ) < (one)  
abigail (two) @(three)example . (bar) com (quz) >", true),
+        new ResultPair("Abigail < (one)  abigail (two) @(three) example . 
(bar) com (quz) >", true),
+        new ResultPair("Abigail (foo) (((baz)(nested) (comment)) ! ) < (one)  
abigail (two) @(three) example . (bar) com (quz) >", true),
         new ResultPair("Abigail <abigail(fo\\(o)@example.com>", true),
         new ResultPair("Abigail <abigail(fo\\)o)@example.com> ", true),
         new ResultPair("(foo) abig...@example.com", true),
@@ -85,7 +85,7 @@ public class EmailValidatorTest {
         new ResultPair("abigail@[exa\\[ple.com]", true),
         new ResultPair("abigail@[exa\\]ple.com]", true),
         new ResultPair("\":sysmail\"@  Some-Group. Some-Org", true),
-        new ResultPair("Muhammed.(I am  the greatest) Ali @(the)Vegas.WBA", 
true),
+        new ResultPair("Muhammed.(I am  the greatest) Ali @(the) Vegas.WBA", 
true),
         new ResultPair("mailbox.sub1.sub2@this-domain", true),
         new ResultPair("sub-net.mailbox@sub-domain.domain", true),
         new ResultPair("name:;", true),
@@ -113,7 +113,7 @@ public class EmailValidatorTest {
         new ResultPair("fred\\ ba...@example.com", false),
         new ResultPair("Abigail <abi gail @ example.com>", false),
         new ResultPair("Abigail <abigail(fo(o)@example.com>", false),
-        new ResultPair("Abigail <abigail(fo)o)@example.com>", false),
+        new ResultPair("Abigail <abigail(fo) o)@example.com>", false),
         new ResultPair("\"Abi\"gail\" <abig...@example.com>", false),
         new ResultPair("abigail@[exa]ple.com]", false),
         new ResultPair("abigail@[exa[ple.com]", false),

Reply via email to