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 2022/06/10 18:14:23 UTC
[commons-validator] branch master updated: Use compact array declarations and static classes.
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
The following commit(s) were added to refs/heads/master by this push:
new c10097a9 Use compact array declarations and static classes.
c10097a9 is described below
commit c10097a9b7446f23531553fe100e8b0cd1316d8d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 10 14:14:18 2022 -0400
Use compact array declarations and static classes.
---
.../apache/commons/validator/routines/DomainValidator.java | 10 +++++-----
.../validator/routines/checkdigit/ABANumberCheckDigit.java | 2 +-
.../validator/routines/checkdigit/CUSIPCheckDigit.java | 2 +-
.../validator/routines/checkdigit/EAN13CheckDigit.java | 2 +-
.../validator/routines/checkdigit/ISINCheckDigit.java | 2 +-
.../validator/routines/checkdigit/LuhnCheckDigit.java | 2 +-
.../validator/routines/checkdigit/SedolCheckDigit.java | 2 +-
.../validator/routines/checkdigit/VerhoeffCheckDigit.java | 7 +++----
.../apache/commons/validator/CreditCardValidatorTest.java | 2 +-
.../apache/commons/validator/MultipleConfigFilesTest.java | 10 +++++-----
.../java/org/apache/commons/validator/RetrieveFormTest.java | 6 +++---
.../java/org/apache/commons/validator/ValidatorTest.java | 2 +-
.../validator/routines/AbstractCalendarValidatorTest.java | 10 +++++-----
.../apache/commons/validator/routines/IBANValidatorTest.java | 6 +++---
.../apache/commons/validator/routines/ISBNValidatorTest.java | 8 ++++----
.../apache/commons/validator/routines/ISINValidatorTest.java | 6 +++---
.../apache/commons/validator/routines/ISSNValidatorTest.java | 4 ++--
.../commons/validator/routines/RegexValidatorTest.java | 8 ++++----
.../apache/commons/validator/routines/TimeValidatorTest.java | 12 ++++++------
.../routines/checkdigit/AbstractCheckDigitTest.java | 2 +-
20 files changed, 52 insertions(+), 53 deletions(-)
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 dcdd9723..b7be90e1 100644
--- a/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
@@ -67,7 +67,7 @@ public class DomainValidator implements Serializable {
/** Maximum allowable length ({@value}) of a domain name */
private static final int MAX_DOMAIN_LENGTH = 253;
- private static final String[] EMPTY_STRING_ARRAY = new String[0];
+ private static final String[] EMPTY_STRING_ARRAY = {};
private static final long serialVersionUID = -4407125112880174009L;
@@ -411,12 +411,12 @@ public class DomainValidator implements Serializable {
// .um country-code Not assigned
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
- private static final String[] INFRASTRUCTURE_TLDS = new String[] {
+ private static final String[] INFRASTRUCTURE_TLDS = {
"arpa", // internet infrastructure
};
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
- private static final String[] GENERIC_TLDS = new String[] {
+ private static final String[] GENERIC_TLDS = {
// Taken from Version 2020073100, Last Updated Fri Jul 31 07:07:01 2020 UTC
"aaa", // aaa American Automobile Association, Inc.
"aarp", // aarp AARP
@@ -1682,7 +1682,7 @@ public class DomainValidator implements Serializable {
};
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
- private static final String[] COUNTRY_CODE_TLDS = new String[] {
+ private static final String[] COUNTRY_CODE_TLDS = {
// Taken from Version 2020051000, Last Updated Sun May 10 07:07:01 2020 UTC
"ac", // Ascension Island
"ad", // Andorra
@@ -1996,7 +1996,7 @@ public class DomainValidator implements Serializable {
};
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
- private static final String[] LOCAL_TLDS = new String[] {
+ private static final String[] LOCAL_TLDS = {
"localdomain", // Also widely used as localhost.localdomain
"localhost", // RFC2606 defined
};
diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java
index fb095b57..c8d082b6 100644
--- a/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java
+++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java
@@ -52,7 +52,7 @@ public final class ABANumberCheckDigit extends ModulusCheckDigit {
public static final CheckDigit ABAN_CHECK_DIGIT = new ABANumberCheckDigit();
/** weighting given to digits depending on their right position */
- private static final int[] POSITION_WEIGHT = new int[] {3, 1, 7};
+ private static final int[] POSITION_WEIGHT = {3, 1, 7};
/**
* Construct a modulus 10 Check Digit routine for ABA Numbers.
diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java
index fd97efae..e2eead83 100644
--- a/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java
+++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java
@@ -47,7 +47,7 @@ public final class CUSIPCheckDigit extends ModulusCheckDigit {
public static final CheckDigit CUSIP_CHECK_DIGIT = new CUSIPCheckDigit();
/** weighting given to digits depending on their right position */
- private static final int[] POSITION_WEIGHT = new int[] {2, 1};
+ private static final int[] POSITION_WEIGHT = {2, 1};
/**
* Construct an CUSIP Indetifier Check Digit routine.
diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java
index ca029a69..b5a21661 100644
--- a/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java
+++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java
@@ -48,7 +48,7 @@ public final class EAN13CheckDigit extends ModulusCheckDigit {
public static final CheckDigit EAN13_CHECK_DIGIT = new EAN13CheckDigit();
/** weighting given to digits depending on their right position */
- private static final int[] POSITION_WEIGHT = new int[] {3, 1};
+ private static final int[] POSITION_WEIGHT = {3, 1};
/**
* Construct a modulus 10 Check Digit routine for EAN/UPC.
diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java
index d1a78a25..84dd3257 100644
--- a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java
+++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java
@@ -49,7 +49,7 @@ public final class ISINCheckDigit extends ModulusCheckDigit {
public static final CheckDigit ISIN_CHECK_DIGIT = new ISINCheckDigit();
/** weighting given to digits depending on their right position */
- private static final int[] POSITION_WEIGHT = new int[] {2, 1};
+ private static final int[] POSITION_WEIGHT = {2, 1};
/**
* Construct an ISIN Indetifier Check Digit routine.
diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java
index 25a39f6c..ff81474e 100644
--- a/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java
+++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java
@@ -45,7 +45,7 @@ public final class LuhnCheckDigit extends ModulusCheckDigit {
public static final CheckDigit LUHN_CHECK_DIGIT = new LuhnCheckDigit();
/** weighting given to digits depending on their right position */
- private static final int[] POSITION_WEIGHT = new int[] {2, 1};
+ private static final int[] POSITION_WEIGHT = {2, 1};
/**
* Construct a modulus 10 Luhn Check Digit routine.
diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java
index 788aafd4..50726a4d 100644
--- a/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java
+++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java
@@ -49,7 +49,7 @@ public final class SedolCheckDigit extends ModulusCheckDigit {
public static final CheckDigit SEDOL_CHECK_DIGIT = new SedolCheckDigit();
/** weighting given to digits depending on their right position */
- private static final int[] POSITION_WEIGHT = new int[] {1, 3, 1, 7, 3, 9, 1};
+ private static final int[] POSITION_WEIGHT = {1, 3, 1, 7, 3, 9, 1};
/**
* Construct a modulus 11 Check Digit routine for ISBN-10.
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 87e53705..cc6c7851 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
@@ -39,7 +39,7 @@ public final class VerhoeffCheckDigit implements CheckDigit, Serializable {
public static final CheckDigit VERHOEFF_CHECK_DIGIT = new VerhoeffCheckDigit();
/** D - multiplication table */
- private static final int[][] D_TABLE = new int[][] {
+ private static final int[][] D_TABLE = {
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
{1, 2, 3, 4, 0, 6, 7, 8, 9, 5},
{2, 3, 4, 0, 1, 7, 8, 9, 5, 6},
@@ -52,7 +52,7 @@ public final class VerhoeffCheckDigit implements CheckDigit, Serializable {
{9, 8, 7, 6, 5, 4, 3, 2, 1, 0}};
/** P - permutation table */
- private static final int[][] P_TABLE = new int[][] {
+ private static final int[][] P_TABLE = {
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
{1, 5, 7, 6, 2, 8, 3, 0, 9, 4},
{5, 8, 0, 3, 7, 9, 6, 1, 4, 2},
@@ -63,8 +63,7 @@ public final class VerhoeffCheckDigit implements CheckDigit, Serializable {
{7, 0, 4, 6, 9, 1, 3, 2, 5, 8}};
/** inv: inverse table */
- private static final int[] INV_TABLE = new int[]
- {0, 4, 3, 2, 1, 5, 6, 7, 8, 9};
+ private static final int[] INV_TABLE = {0, 4, 3, 2, 1, 5, 6, 7, 8, 9};
/**
diff --git a/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java b/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
index 7ea6d327..4680c4c5 100644
--- a/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
@@ -77,7 +77,7 @@ public class CreditCardValidatorTest extends TestCase {
/**
* Test a custom implementation of CreditCardType.
*/
- private class DinersClub implements CreditCardValidator.CreditCardType {
+ private static class DinersClub implements CreditCardValidator.CreditCardType {
private static final String PREFIX = "300,301,302,303,304,305,";
@Override
public boolean matches(String card) {
diff --git a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
index ff1d0faa..6cfb126e 100644
--- a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
@@ -61,11 +61,11 @@ public class MultipleConfigFilesTest extends TestCase {
@Override
protected void setUp() throws IOException, SAXException {
InputStream[] streams =
- new InputStream[] {
- this.getClass().getResourceAsStream(
- "MultipleConfigFilesTest-1-config.xml"),
- this.getClass().getResourceAsStream(
- "MultipleConfigFilesTest-2-config.xml")};
+ {
+ this.getClass().getResourceAsStream(
+ "MultipleConfigFilesTest-1-config.xml"),
+ this.getClass().getResourceAsStream(
+ "MultipleConfigFilesTest-2-config.xml")};
this.resources = new ValidatorResources(streams);
diff --git a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
index 9b59bc46..701afc7b 100644
--- a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
+++ b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
@@ -58,9 +58,9 @@ public class RetrieveFormTest extends TestCase {
@Override
protected void setUp() throws IOException, SAXException {
InputStream[] streams =
- new InputStream[] {
- this.getClass().getResourceAsStream(
- "RetrieveFormTest-config.xml")};
+ {
+ this.getClass().getResourceAsStream(
+ "RetrieveFormTest-config.xml")};
this.resources = new ValidatorResources(streams);
diff --git a/src/test/java/org/apache/commons/validator/ValidatorTest.java b/src/test/java/org/apache/commons/validator/ValidatorTest.java
index 679dcd95..7990ea8f 100644
--- a/src/test/java/org/apache/commons/validator/ValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/ValidatorTest.java
@@ -259,7 +259,7 @@ public class ValidatorTest extends TestCase {
return date;
}
- public class TestBean {
+ public static class TestBean {
private String letter = null;
private String date = null;
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 32a5454c..a56cd016 100644
--- a/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/AbstractCalendarValidatorTest.java
@@ -41,7 +41,7 @@ public abstract class AbstractCalendarValidatorTest extends TestCase {
protected static final TimeZone EET = TimeZone.getTimeZone("EET"); // + 2 hours
protected static final TimeZone UTC = TimeZone.getTimeZone("UTC"); // + 2 hours
- protected String[] patternValid = new String[] {
+ protected String[] patternValid = {
"2005-01-01"
,"2005-12-31"
,"2004-02-29" // valid leap
@@ -49,7 +49,7 @@ public abstract class AbstractCalendarValidatorTest extends TestCase {
,"05-12-31"
,"2005-1-1"
,"05-1-1"};
- protected String[] localeValid = new String[] {
+ protected String[] localeValid = {
"01/01/2005"
,"12/31/2005"
,"02/29/2004" // valid leap
@@ -57,7 +57,7 @@ public abstract class AbstractCalendarValidatorTest extends TestCase {
,"12/31/05"
,"1/1/2005"
,"1/1/05"};
- protected Date[] patternExpect = new Date[] {
+ protected Date[] patternExpect = {
createDate(null, 20050101, 0)
,createDate(null, 20051231, 0)
,createDate(null, 20040229, 0)
@@ -65,7 +65,7 @@ public abstract class AbstractCalendarValidatorTest extends TestCase {
,createDate(null, 20051231, 0)
,createDate(null, 20050101, 0)
,createDate(null, 20050101, 0)};
- protected String[] patternInvalid = new String[] {
+ protected String[] patternInvalid = {
"2005-00-01" // zero month
,"2005-01-00" // zero day
,"2005-13-03" // month invalid
@@ -79,7 +79,7 @@ public abstract class AbstractCalendarValidatorTest extends TestCase {
,"2005-01" // invalid pattern
,"2005--01" // invalid pattern
,"2005-01-"}; // invalid pattern
- protected String[] localeInvalid = new String[] {
+ protected String[] localeInvalid = {
"01/00/2005" // zero month
,"00/01/2005" // zero day
,"13/01/2005" // month invalid
diff --git a/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
index 4cea213c..955c6ace 100644
--- a/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
@@ -45,7 +45,7 @@ public class IBANValidatorTest {
// It's not clear whether IBANs can contain lower case characters
// so we test for both where possible
// Note that the BIC near the start of the code is always upper case or digits
- private final String[] validIBANFormat = new String[] {
+ private final String[] validIBANFormat = {
"AD1200012030200359100100",
"AE070331234567890123456",
"AL47212110090000000235698741",
@@ -133,7 +133,7 @@ public class IBANValidatorTest {
"XK051212012345678906",
};
- private final String[] invalidIBANFormat = new String[] {
+ private final String[] invalidIBANFormat = {
"", // empty
" ", // empty
"A", // too short
@@ -270,7 +270,7 @@ public class IBANValidatorTest {
String currentLength = Integer.toString(valre.lengthOfIBAN);
String currentRE = valre.validator.toString()
.replaceAll("^.+?\\{(.+)}","$1") // Extract RE from RegexValidator{re} string
- .replaceAll("\\\\d","\\\\\\\\d"); // convert \d to \\d
+ .replace("\\d","\\\\d"); // convert \d to \\d
// The above assumes that the RegexValidator contains a single Regex
if (currentRE.equals(newRE) && currentLength.equals(newLength)) {
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 de37dd8d..d87f8221 100644
--- a/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
*/
public class ISBNValidatorTest extends TestCase {
- private final String[] validISBN10Format = new String[] {
+ private final String[] validISBN10Format = {
"1234567890",
"123456789X",
"12345-1234567-123456-X",
@@ -35,7 +35,7 @@ public class ISBNValidatorTest extends TestCase {
"1 2 3 4",
};
- private final String[] invalidISBN10Format = new String[] {
+ private final String[] invalidISBN10Format = {
"", // empty
" ", // empty
"1", // too short
@@ -58,7 +58,7 @@ public class ISBNValidatorTest extends TestCase {
"068-556-98-45" // format
};
- private final String[] validISBN13Format = new String[] {
+ private final String[] validISBN13Format = {
"9781234567890",
"9791234567890",
"978-12345-1234567-123456-1",
@@ -71,7 +71,7 @@ public class ISBNValidatorTest extends TestCase {
"979 1 2 3 4",
};
- private final String[] invalidISBN13Format = new String[] {
+ private final String[] invalidISBN13Format = {
"", // empty
" ", // empty
"1", // too short
diff --git a/src/test/java/org/apache/commons/validator/routines/ISINValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/ISINValidatorTest.java
index 9bf40346..4305133a 100644
--- a/src/test/java/org/apache/commons/validator/routines/ISINValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ISINValidatorTest.java
@@ -29,7 +29,7 @@ public class ISINValidatorTest extends TestCase {
private static final ISINValidator VALIDATOR_FALSE = ISINValidator.getInstance(false);
- private final String[] validFormat = new String[] {
+ private final String[] validFormat = {
"US0378331005",
"BMG8571G1096",
"AU0000XVGZA3",
@@ -46,7 +46,7 @@ public class ISINValidatorTest extends TestCase {
"XS0000000009",
};
- private final String[] invalidFormat = new String[] {
+ private final String[] invalidFormat = {
null,
"", // empty
" ", // empty
@@ -62,7 +62,7 @@ public class ISINValidatorTest extends TestCase {
};
// Invalid codes if country checking is enabled
- private final String[] invalidFormatTrue = new String[] {
+ private final String[] invalidFormatTrue = {
"AA0000000006", // Invalid country code
};
diff --git a/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
index a32581ed..a8e5e2eb 100644
--- a/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
@@ -32,7 +32,7 @@ public class ISSNValidatorTest extends TestCase {
private static final ISSNValidator VALIDATOR = ISSNValidator.getInstance();
- private final String[] validFormat = new String[] {
+ private final String[] validFormat = {
"ISSN 0317-8471",
"1050-124X",
"ISSN 1562-6865",
@@ -49,7 +49,7 @@ public class ISSNValidatorTest extends TestCase {
"1144-875X",
};
- private final String[] invalidFormat = new String[] {
+ private final String[] invalidFormat = {
"", // empty
" ", // empty
"ISBN 0317-8471", // wrong prefix
diff --git a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
index ac058a30..959a0471 100644
--- a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
@@ -38,7 +38,7 @@ public class RegexValidatorTest extends TestCase {
private static final String REGEX_1 = "^" + COMPONENT_1 + SEPARATOR_1 + COMPONENT_2 + SEPARATOR_1 + COMPONENT_3 + "$";
private static final String REGEX_2 = "^" + COMPONENT_1 + SEPARATOR_2 + COMPONENT_2 + SEPARATOR_2 + COMPONENT_3 + "$";
private static final String REGEX_3 = "^" + COMPONENT_1 + COMPONENT_2 + COMPONENT_3 + "$";
- private static final String[] MULTIPLE_REGEX = new String[] {REGEX_1, REGEX_2, REGEX_3};
+ private static final String[] MULTIPLE_REGEX = {REGEX_1, REGEX_2, REGEX_3};
/**
* Constrct a new test case.
@@ -106,7 +106,7 @@ public class RegexValidatorTest extends TestCase {
// ------------ Set up test values
String value = "aac FDE 321";
String expect = "aacFDE321";
- String[] array = new String[] {"aac", "FDE", "321"};
+ String[] array = {"aac", "FDE", "321"};
// isValid()
assertEquals("Sensitive isValid() Multiple", true, multiple.isValid(value));
@@ -147,7 +147,7 @@ public class RegexValidatorTest extends TestCase {
// ------------ Set up test values
String value = "AAC FDE 321";
String expect = "AACFDE321";
- String[] array = new String[] {"AAC", "FDE", "321"};
+ String[] array = {"AAC", "FDE", "321"};
// isValid()
assertEquals("isValid() Multiple", true, multiple.isValid(value));
@@ -223,7 +223,7 @@ public class RegexValidatorTest extends TestCase {
}
// Multiple Regular Expression - Array has Null
- String[] expressions = new String[] {"ABC", null};
+ String[] expressions = {"ABC", null};
try {
new RegexValidator(expressions);
fail("Array has Null - expected IllegalArgumentException");
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 7d6c5ddd..b6b0a99b 100644
--- a/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java
@@ -35,7 +35,7 @@ public class TimeValidatorTest extends TestCase {
protected TimeValidator validator;
- protected String[] patternValid = new String[] {
+ protected String[] patternValid = {
"23-59-59"
,"00-00-00"
,"00-00-01"
@@ -43,7 +43,7 @@ public class TimeValidatorTest extends TestCase {
,"1-12-1"
,"10-49-18"
,"16-23-46"};
- protected Date[] patternExpect = new Date[] {
+ protected Date[] patternExpect = {
createDate(null, 235959, 0)
,createDate(null, 0, 0)
,createDate(null, 1, 0)
@@ -51,7 +51,7 @@ public class TimeValidatorTest extends TestCase {
,createDate(null, 11201, 0)
,createDate(null, 104918, 0)
,createDate(null, 162346, 0)};
- protected String[] localeValid = new String[] {
+ protected String[] localeValid = {
"23:59"
,"00:00"
,"00:01"
@@ -59,7 +59,7 @@ public class TimeValidatorTest extends TestCase {
,"1:12"
,"10:49"
,"16:23"};
- protected Date[] localeExpect = new Date[] {
+ protected Date[] localeExpect = {
createDate(null, 235900, 0)
,createDate(null, 0, 0)
,createDate(null, 100, 0)
@@ -67,7 +67,7 @@ public class TimeValidatorTest extends TestCase {
,createDate(null, 11200, 0)
,createDate(null, 104900, 0)
,createDate(null, 162300, 0)};
- protected String[] patternInvalid = new String[] {
+ protected String[] patternInvalid = {
"24-00-00" // midnight
,"24-00-01" // past midnight
,"25-02-03" // invalid hour
@@ -81,7 +81,7 @@ public class TimeValidatorTest extends TestCase {
,"10-10" // invalid pattern
,"10--10" // invalid pattern
,"10-10-"}; // invalid pattern
- protected String[] localeInvalid = new String[] {
+ protected String[] localeInvalid = {
"24:00" // midnight
,"24:00" // past midnight
,"25:02" // invalid hour
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 8e3748b1..1328478f 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
@@ -75,7 +75,7 @@ public abstract class AbstractCheckDigitTest extends TestCase {
*
* See https://issues.apache.org/jira/browse/VALIDATOR-344 for some dicussion on this
*/
- protected String[] invalid = new String[] {"12345678A"};
+ protected String[] invalid = {"12345678A"};
/** code value which sums to zero */
protected String zeroSum = "0000000000";