You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/02/04 14:00:20 UTC
[commons-validator] branch master updated (731a3c0d -> d64c529f)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git
from 731a3c0d Bump commons-csv from 1.9.0 to 1.10.0 #118
new 90dd23c2 Replace star imports with actual imports
new 0ad2ffc1 Declutter the root folder
new d64c529f Pickup JApiCmp version from parent POM
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 10 ++++------
.../conf/checkstyle-suppressions.xml | 0
checkstyle.xml => src/conf/checkstyle.xml | 0
src/main/java/org/apache/commons/validator/EmailValidator.java | 4 ++--
src/main/java/org/apache/commons/validator/Field.java | 1 -
src/main/java/org/apache/commons/validator/FormSetFactory.java | 2 +-
.../java/org/apache/commons/validator/GenericValidator.java | 2 +-
.../java/org/apache/commons/validator/ValidatorResources.java | 2 +-
.../java/org/apache/commons/validator/ValidatorResult.java | 2 +-
.../commons/validator/routines/AbstractCalendarValidator.java | 2 +-
.../commons/validator/routines/AbstractFormatValidator.java | 2 +-
.../commons/validator/routines/AbstractNumberValidator.java | 2 +-
.../apache/commons/validator/routines/CreditCardValidator.java | 7 ++++---
.../org/apache/commons/validator/routines/ISBNValidator.java | 3 ++-
.../apache/commons/validator/routines/PercentValidator.java | 2 +-
.../java/org/apache/commons/validator/util/ValidatorUtils.java | 2 --
.../java/org/apache/commons/validator/AbstractCommonTest.java | 4 ++--
.../org/apache/commons/validator/GenericTypeValidatorImpl.java | 3 ++-
.../org/apache/commons/validator/MultipleConfigFilesTest.java | 4 ++--
.../java/org/apache/commons/validator/RetrieveFormTest.java | 4 +++-
src/test/java/org/apache/commons/validator/ValidatorTest.java | 4 ++--
.../commons/validator/custom/CustomValidatorResources.java | 5 +++--
.../validator/routines/AbstractCalendarValidatorTest.java | 6 +++---
.../validator/routines/AbstractNumberValidatorTest.java | 8 ++++----
.../commons/validator/routines/CalendarValidatorTest.java | 2 +-
.../commons/validator/routines/CreditCardValidatorTest.java | 5 +++--
.../commons/validator/routines/CurrencyValidatorTest.java | 6 +++---
.../commons/validator/routines/DomainValidatorStartupTest.java | 9 ++++++---
.../apache/commons/validator/routines/EmailValidatorTest.java | 6 ++++--
.../apache/commons/validator/routines/ISBNValidatorTest.java | 1 +
.../commons/validator/routines/PercentValidatorTest.java | 6 +++---
.../apache/commons/validator/routines/TimeValidatorTest.java | 6 +++---
.../apache/commons/validator/routines/UrlValidatorTest.java | 6 ++++--
.../validator/routines/checkdigit/AbstractCheckDigitTest.java | 2 +-
34 files changed, 70 insertions(+), 60 deletions(-)
rename checkstyle-suppressions.xml => src/conf/checkstyle-suppressions.xml (100%)
rename checkstyle.xml => src/conf/checkstyle.xml (100%)
[commons-validator] 02/03: Declutter the root folder
Posted by gg...@apache.org.
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 0ad2ffc1c1d0aef8b2828c386e581189de81234c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 4 08:57:29 2023 -0500
Declutter the root folder
---
pom.xml | 8 ++++----
.../conf/checkstyle-suppressions.xml | 0
checkstyle.xml => src/conf/checkstyle.xml | 0
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 50b7b4b9..604c76c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,9 +118,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
<!-- Needed to define config_loc -->
- <propertyExpansion>config_loc=${basedir}</propertyExpansion>
+ <propertyExpansion>config_loc=${basedir}/src/conf</propertyExpansion>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
</plugin>
@@ -198,9 +198,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
<!-- Needed to define config_loc -->
- <propertyExpansion>config_loc=${basedir}</propertyExpansion>
+ <propertyExpansion>config_loc=${basedir}/src/conf</propertyExpansion>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
<reportSets>
diff --git a/checkstyle-suppressions.xml b/src/conf/checkstyle-suppressions.xml
similarity index 100%
rename from checkstyle-suppressions.xml
rename to src/conf/checkstyle-suppressions.xml
diff --git a/checkstyle.xml b/src/conf/checkstyle.xml
similarity index 100%
rename from checkstyle.xml
rename to src/conf/checkstyle.xml
[commons-validator] 03/03: Pickup JApiCmp version from parent POM
Posted by gg...@apache.org.
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 d64c529fcb5b216355f6c0cdad1605196fd4a9e3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 4 09:00:15 2023 -0500
Pickup JApiCmp version from parent POM
---
pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 604c76c3..be62859a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<commons.release.isDistModule>true</commons.release.isDistModule>
-
- <commons.japicmp.version>0.16.0</commons.japicmp.version>
</properties>
<scm>
[commons-validator] 01/03: Replace star imports with actual imports
Posted by gg...@apache.org.
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 90dd23c29b5536dd3eb0d3026d7df9ce5a66d180
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 4 08:50:48 2023 -0500
Replace star imports with actual imports
Sort imports
---
src/main/java/org/apache/commons/validator/EmailValidator.java | 4 ++--
src/main/java/org/apache/commons/validator/Field.java | 1 -
src/main/java/org/apache/commons/validator/FormSetFactory.java | 2 +-
src/main/java/org/apache/commons/validator/GenericValidator.java | 2 +-
.../java/org/apache/commons/validator/ValidatorResources.java | 2 +-
src/main/java/org/apache/commons/validator/ValidatorResult.java | 2 +-
.../commons/validator/routines/AbstractCalendarValidator.java | 2 +-
.../commons/validator/routines/AbstractFormatValidator.java | 2 +-
.../commons/validator/routines/AbstractNumberValidator.java | 2 +-
.../apache/commons/validator/routines/CreditCardValidator.java | 7 ++++---
.../org/apache/commons/validator/routines/ISBNValidator.java | 3 ++-
.../org/apache/commons/validator/routines/PercentValidator.java | 2 +-
.../java/org/apache/commons/validator/util/ValidatorUtils.java | 2 --
.../java/org/apache/commons/validator/AbstractCommonTest.java | 4 ++--
.../org/apache/commons/validator/GenericTypeValidatorImpl.java | 3 ++-
.../org/apache/commons/validator/MultipleConfigFilesTest.java | 4 ++--
src/test/java/org/apache/commons/validator/RetrieveFormTest.java | 4 +++-
src/test/java/org/apache/commons/validator/ValidatorTest.java | 4 ++--
.../commons/validator/custom/CustomValidatorResources.java | 5 +++--
.../validator/routines/AbstractCalendarValidatorTest.java | 6 +++---
.../commons/validator/routines/AbstractNumberValidatorTest.java | 8 ++++----
.../apache/commons/validator/routines/CalendarValidatorTest.java | 2 +-
.../commons/validator/routines/CreditCardValidatorTest.java | 5 +++--
.../apache/commons/validator/routines/CurrencyValidatorTest.java | 6 +++---
.../commons/validator/routines/DomainValidatorStartupTest.java | 9 ++++++---
.../apache/commons/validator/routines/EmailValidatorTest.java | 6 ++++--
.../org/apache/commons/validator/routines/ISBNValidatorTest.java | 1 +
.../apache/commons/validator/routines/PercentValidatorTest.java | 6 +++---
.../org/apache/commons/validator/routines/TimeValidatorTest.java | 6 +++---
.../org/apache/commons/validator/routines/UrlValidatorTest.java | 6 ++++--
.../validator/routines/checkdigit/AbstractCheckDigitTest.java | 2 +-
31 files changed, 66 insertions(+), 54 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/EmailValidator.java b/src/main/java/org/apache/commons/validator/EmailValidator.java
index cb968452..4952d8ad 100644
--- a/src/main/java/org/apache/commons/validator/EmailValidator.java
+++ b/src/main/java/org/apache/commons/validator/EmailValidator.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.validator;
-import org.apache.commons.validator.routines.InetAddressValidator;
-
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.validator.routines.InetAddressValidator;
+
/**
* <p>Perform email validations.</p>
* <p>
diff --git a/src/main/java/org/apache/commons/validator/Field.java b/src/main/java/org/apache/commons/validator/Field.java
index b30dbaa3..513ec136 100644
--- a/src/main/java/org/apache/commons/validator/Field.java
+++ b/src/main/java/org/apache/commons/validator/Field.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
diff --git a/src/main/java/org/apache/commons/validator/FormSetFactory.java b/src/main/java/org/apache/commons/validator/FormSetFactory.java
index 801335c5..763d62ba 100644
--- a/src/main/java/org/apache/commons/validator/FormSetFactory.java
+++ b/src/main/java/org/apache/commons/validator/FormSetFactory.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.validator;
-import org.xml.sax.Attributes;
import org.apache.commons.digester.AbstractObjectCreationFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.xml.sax.Attributes;
/**
* Factory class used by Digester to create FormSet's.
diff --git a/src/main/java/org/apache/commons/validator/GenericValidator.java b/src/main/java/org/apache/commons/validator/GenericValidator.java
index b512e5da..66f0af62 100644
--- a/src/main/java/org/apache/commons/validator/GenericValidator.java
+++ b/src/main/java/org/apache/commons/validator/GenericValidator.java
@@ -20,10 +20,10 @@ import java.io.Serializable;
import java.util.Locale;
import java.util.regex.Pattern;
-import org.apache.commons.validator.routines.UrlValidator;
import org.apache.commons.validator.routines.CreditCardValidator;
import org.apache.commons.validator.routines.DateValidator;
import org.apache.commons.validator.routines.EmailValidator;
+import org.apache.commons.validator.routines.UrlValidator;
/**
* This class contains basic methods for performing validations.
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResources.java b/src/main/java/org/apache/commons/validator/ValidatorResources.java
index 7f7258ef..3d3ca89f 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResources.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResources.java
@@ -30,8 +30,8 @@ import org.apache.commons.digester.Rule;
import org.apache.commons.digester.xmlrules.DigesterLoader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.xml.sax.SAXException;
import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
/**
* <p>
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResult.java b/src/main/java/org/apache/commons/validator/ValidatorResult.java
index 27a5e1b6..ec90d0dc 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResult.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResult.java
@@ -19,8 +19,8 @@ package org.apache.commons.validator;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
/**
* This contains the results of a set of validation rules processed
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 f9137ff0..18c3d6af 100644
--- a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
@@ -16,9 +16,9 @@
*/
package org.apache.commons.validator.routines;
+import java.text.DateFormat;
import java.text.DateFormatSymbols;
import java.text.Format;
-import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
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 11e09aa5..2c62f037 100644
--- a/src/main/java/org/apache/commons/validator/routines/AbstractFormatValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/AbstractFormatValidator.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.validator.routines;
+import java.io.Serializable;
import java.text.Format;
import java.text.ParsePosition;
import java.util.Locale;
-import java.io.Serializable;
/**
* <p>Abstract class for <i>Format</i> based Validation.</p>
diff --git a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
index 2ea68b6e..61ecdf5c 100644
--- a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.validator.routines;
+import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.Format;
import java.text.NumberFormat;
-import java.text.DecimalFormat;
import java.util.Locale;
/**
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 14d6e7a7..a5e3531a 100644
--- a/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
@@ -16,12 +16,13 @@
*/
package org.apache.commons.validator.routines;
-import org.apache.commons.validator.routines.checkdigit.CheckDigit;
-import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.ArrayList;
+
+import org.apache.commons.validator.routines.checkdigit.CheckDigit;
+import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit;
/**
* Perform credit card validations.
diff --git a/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java b/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java
index cac162a8..e2ea4c38 100644
--- a/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java
@@ -17,9 +17,10 @@
package org.apache.commons.validator.routines;
import java.io.Serializable;
+
+import org.apache.commons.validator.routines.checkdigit.CheckDigitException;
import org.apache.commons.validator.routines.checkdigit.EAN13CheckDigit;
import org.apache.commons.validator.routines.checkdigit.ISBN10CheckDigit;
-import org.apache.commons.validator.routines.checkdigit.CheckDigitException;
/**
* <b>ISBN-10</b> and <b>ISBN-13</b> Code Validation.
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 2715da78..089e233e 100644
--- a/src/main/java/org/apache/commons/validator/routines/PercentValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/PercentValidator.java
@@ -16,9 +16,9 @@
*/
package org.apache.commons.validator.routines;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.Format;
-import java.math.BigDecimal;
/**
* <p><b>Percentage Validation</b> and Conversion routines (<code>java.math.BigDecimal</code>).</p>
diff --git a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
index 6f1d6f43..76371b73 100644
--- a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
+++ b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
@@ -19,9 +19,7 @@ package org.apache.commons.validator.util;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.collections.FastHashMap; // DEPRECATED
diff --git a/src/test/java/org/apache/commons/validator/AbstractCommonTest.java b/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
index bd6ef414..c8bb8a8f 100644
--- a/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
+++ b/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
@@ -19,10 +19,10 @@ package org.apache.commons.validator;
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.TestCase;
-
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* Consolidates reading in XML config file into parent class.
*
diff --git a/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java b/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java
index 357971a1..eb6cbfd1 100644
--- a/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java
+++ b/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java
@@ -16,7 +16,8 @@
*/
package org.apache.commons.validator;
-import java.util.*;
+import java.util.Date;
+import java.util.Locale;
import org.apache.commons.validator.util.ValidatorUtils;
diff --git a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
index 0af9b769..2e8bb26b 100644
--- a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
@@ -19,10 +19,10 @@ package org.apache.commons.validator;
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.TestCase;
-
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* Tests that validator rules split between 2 different XML files get
* merged properly.
diff --git a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
index a741aed4..a20fdc58 100644
--- a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
+++ b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
@@ -19,9 +19,11 @@ package org.apache.commons.validator;
import java.io.IOException;
import java.io.InputStream;
import java.util.Locale;
-import junit.framework.TestCase;
+
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* Tests retrieving forms using different Locales.
*
diff --git a/src/test/java/org/apache/commons/validator/ValidatorTest.java b/src/test/java/org/apache/commons/validator/ValidatorTest.java
index 49ad75dd..0b94117c 100644
--- a/src/test/java/org/apache/commons/validator/ValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/ValidatorTest.java
@@ -23,10 +23,10 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
-import junit.framework.TestCase;
-
import org.apache.commons.validator.util.ValidatorUtils;
+import junit.framework.TestCase;
+
/**
* Performs Validation Test.
*
diff --git a/src/test/java/org/apache/commons/validator/custom/CustomValidatorResources.java b/src/test/java/org/apache/commons/validator/custom/CustomValidatorResources.java
index 1e9355c3..65dcfe12 100644
--- a/src/test/java/org/apache/commons/validator/custom/CustomValidatorResources.java
+++ b/src/test/java/org/apache/commons/validator/custom/CustomValidatorResources.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.validator.custom;
-import java.io.InputStream;
import java.io.IOException;
-import org.xml.sax.SAXException;
+import java.io.InputStream;
+
import org.apache.commons.validator.ValidatorResources;
+import org.xml.sax.SAXException;
/**
* Custom ValidatorResources implementation.
diff --git a/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java
index 86711101..2f3925ff 100644
--- a/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java
@@ -16,17 +16,17 @@
*/
package org.apache.commons.validator.routines;
-import junit.framework.TestCase;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.Date;
import java.util.Calendar;
+import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import junit.framework.TestCase;
+
/**
* Base Calendar Test Case.
*
diff --git a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
index ab81b126..c79a1408 100644
--- a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.commons.validator.routines;
-import junit.framework.TestCase;
-
-import java.util.Locale;
-import java.text.DecimalFormat;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.Locale;
+
+import junit.framework.TestCase;
/**
* Base Number Test Case.
*
diff --git a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
index d6bca3cc..9cb15913 100644
--- a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.validator.routines;
-import java.text.Format;
import java.text.DateFormat;
+import java.text.Format;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
diff --git a/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
index 35a5db3e..40f34044 100644
--- a/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.commons.validator.routines;
-import junit.framework.TestCase;
-import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit;
import org.apache.commons.validator.routines.CreditCardValidator.CreditCardRange;
+import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit;
+
+import junit.framework.TestCase;
/**
* Test the CreditCardValidator class.
diff --git a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
index 4fb8bd70..6e33965e 100644
--- a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.validator.routines;
-import junit.framework.TestCase;
-
-import java.util.Locale;
import java.math.BigDecimal;
import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+import junit.framework.TestCase;
/**
* Test Case for CurrencyValidator.
diff --git a/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java b/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
index 5d3d5c20..1782b607 100644
--- a/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
@@ -19,17 +19,20 @@ package org.apache.commons.validator.routines;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.validator.routines.DomainValidator.ArrayType;
+import org.bitstrings.test.junit.runner.ClassLoaderPerTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.bitstrings.test.junit.runner.ClassLoaderPerTestRunner;
-
/**
* Startup Tests for the DomainValidator.
*
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 27770801..5669968b 100644
--- a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
@@ -19,7 +19,10 @@ package org.apache.commons.validator.routines;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.List;
@@ -28,7 +31,6 @@ import org.apache.commons.validator.ResultPair;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
/**
* Performs Validation Test for e-mail validations.
diff --git a/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java
index 2ca31693..8be10afe 100644
--- a/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.validator.routines;
import java.util.regex.Pattern;
+
import junit.framework.TestCase;
/**
diff --git a/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java
index 1cd41c97..6f6c8f66 100644
--- a/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.validator.routines;
-import junit.framework.TestCase;
-
-import java.util.Locale;
import java.math.BigDecimal;
+import java.util.Locale;
+
+import junit.framework.TestCase;
/**
* Test Case for PercentValidator.
*
diff --git a/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java
index ed31ba6b..42fc8f6e 100644
--- a/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.commons.validator.routines;
-import junit.framework.TestCase;
-
-import java.util.Date;
import java.util.Calendar;
+import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import junit.framework.TestCase;
+
/**
* Test Case for TimeValidator.
*
diff --git a/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
index d1ccc5b3..ef53c14a 100644
--- a/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
@@ -19,7 +19,10 @@ package org.apache.commons.validator.routines;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
import java.net.URI;
import java.net.URISyntaxException;
@@ -29,7 +32,6 @@ import java.util.List;
import org.apache.commons.validator.ResultPair;
import org.junit.Before;
import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
/**
* Performs Validation Test for url validations.
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java
index 1b096bb0..060cc770 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java
@@ -20,8 +20,8 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;