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 9e0515ad1d35c30be5ef6372035429a1d5b58ee2
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Dec 18 09:17:14 2024 -0500
Use final
Use a method reference
---
.../apache/commons/validator/ExceptionTest.java | 2 +-
.../validator/routines/CalendarValidatorTest.java | 2 +-
.../validator/routines/IBANValidatorTest.java | 30 +++++++++++-----------
.../validator/routines/ISBNValidatorTest.java | 10 ++++----
.../validator/routines/ISSNValidatorTest.java | 6 ++---
.../validator/routines/RegexValidatorTest.java | 2 +-
.../checkdigit/AbstractCheckDigitTest.java | 2 +-
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/test/java/org/apache/commons/validator/ExceptionTest.java
b/src/test/java/org/apache/commons/validator/ExceptionTest.java
index e3ac90f8..0532fc6c 100644
--- a/src/test/java/org/apache/commons/validator/ExceptionTest.java
+++ b/src/test/java/org/apache/commons/validator/ExceptionTest.java
@@ -132,7 +132,7 @@ public class ExceptionTest extends AbstractCommonTest {
validator.setParameter(Validator.BEAN_PARAM, info);
// Get results of the validation which can throw ValidatorException
- Exception expected = assertThrows(ValidatorException.class,
validator::validate);
+ final Exception expected = assertThrows(ValidatorException.class,
validator::validate);
assertEquals("VALIDATOR-EXCEPTION", expected.getMessage());
}
}
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 ebbcd25a..969a2fc5 100644
---
a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
@@ -219,7 +219,7 @@ public class CalendarValidatorTest extends
AbstractCalendarValidatorTest {
assertEquals(1, calValidator.compareYears(value, cal20041231), "year
GT"); // -1 year
// invalid compare
- Exception e = assertThrows(IllegalArgumentException.class, () ->
calValidator.compare(value, value, -1), "Invalid Compare field");
+ final Exception e = assertThrows(IllegalArgumentException.class, () ->
calValidator.compare(value, value, -1), "Invalid Compare field");
assertEquals(e.getMessage(), "Invalid field: -1", "check message");
}
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 8cec6e21..05de94ed 100644
--- a/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
@@ -249,7 +249,7 @@ public class IBANValidatorTest {
}
static Collection<Arguments> ibanRegistryV98Source() throws Exception {
- Path ibanRegistryV98 =
Paths.get(IBANValidator.class.getResource("iban_registry_v98.txt").toURI());
+ final Path ibanRegistryV98 =
Paths.get(IBANValidator.class.getResource("iban_registry_v98.txt").toURI());
final CSVFormat format =
CSVFormat.DEFAULT.builder().setDelimiter('\t').build();
final Reader rdr = Files.newBufferedReader(ibanRegistryV98,
StandardCharsets.ISO_8859_1);
@@ -291,10 +291,10 @@ public class IBANValidatorTest {
assertNotNull(structure);
assertNotNull(length);
- Collection<Arguments> result = new ArrayList<>();
+ final Collection<Arguments> result = new ArrayList<>();
for (int i = 1; i < country.size(); i++) {
- String ac = additionalCc.get(i);
- List<String> aCountry = Arrays.stream(ac.split(","))
+ final String ac = additionalCc.get(i);
+ final List<String> aCountry = Arrays.stream(ac.split(","))
.filter(s -> !"N/A".equals(s))
.map(s -> s.replace("(French part)", "")) // special case
.map(String::trim)
@@ -307,7 +307,7 @@ public class IBANValidatorTest {
}
static Collection<Arguments> ibanRegistryV98SourceExamples() throws
Exception {
- Path ibanRegistryV98 =
Paths.get(IBANValidator.class.getResource("iban_registry_v98.txt").toURI());
+ final Path ibanRegistryV98 =
Paths.get(IBANValidator.class.getResource("iban_registry_v98.txt").toURI());
final CSVFormat format =
CSVFormat.DEFAULT.builder().setDelimiter('\t').build();
final Reader rdr = Files.newBufferedReader(ibanRegistryV98,
StandardCharsets.ISO_8859_1);
@@ -334,7 +334,7 @@ public class IBANValidatorTest {
assertNotNull(country);
assertNotNull(electronicExample);
- Collection<Arguments> result = new ArrayList<>();
+ final Collection<Arguments> result = new ArrayList<>();
for (int i = 1; i < country.size(); i++) {
result.add(Arguments.of(country.get(i), electronicExample.get(i)));
}
@@ -344,7 +344,7 @@ public class IBANValidatorTest {
@ParameterizedTest
@MethodSource("ibanRegistryV98SourceExamples")
- public void exampleAccountsShouldBeValid(String countryName, String
example) {
+ public void exampleAccountsShouldBeValid(final String countryName, final
String example) {
Assumptions.assumeFalse(INVALID_IBAN_FIXTURES.contains(example), "Skip
invalid example: " + example + " for " + countryName);
assertTrue(IBANValidator.getInstance().isValid(example), "IBAN
validator returned false for " + example + " for " + countryName);
}
@@ -368,7 +368,7 @@ public class IBANValidatorTest {
@ParameterizedTest
@FieldSource("INVALID_IBAN_FIXTURES")
- public void testInValid(String invalidIban) {
+ public void testInValid(final String invalidIban) {
assertFalse(VALIDATOR.isValid(invalidIban), invalidIban);
}
@@ -432,7 +432,7 @@ public class IBANValidatorTest {
@ParameterizedTest
@FieldSource("VALID_IBAN_FIXTURES")
- public void testValid(String iban) {
+ public void testValid(final String iban) {
assertTrue(IBANCheckDigit.IBAN_CHECK_DIGIT.isValid(iban),
"Checksum fail: " + iban);
assertTrue(VALIDATOR.hasValidator(iban), "Missing validator: " +
iban);
assertTrue(VALIDATOR.isValid(iban), iban);
@@ -440,19 +440,19 @@ public class IBANValidatorTest {
@ParameterizedTest
@MethodSource("ibanRegistryV98Source")
- public void validatorShouldExistWithProperConfiguration(String
countryName, String countryCode, List<String> acountyCode, int ibanLength,
String structure) throws Exception {
- String countryInfo = " countryCode: " + countryCode + ", countryName:
" + countryName;
- Validator validator =
IBANValidator.getInstance().getValidator(countryCode);
+ public void validatorShouldExistWithProperConfiguration(final String
countryName, final String countryCode, final List<String> acountyCode, final
int ibanLength, final String structure) throws Exception {
+ final String countryInfo = " countryCode: " + countryCode + ",
countryName: " + countryName;
+ final Validator validator =
IBANValidator.getInstance().getValidator(countryCode);
assertNotNull(validator, "IBAN validator returned null for" +
countryInfo);
assertEquals(ibanLength, validator.getIbanLength(), "IBAN length
should be " + ibanLength + " for" + countryInfo);
- List<String> allPatterns =
Arrays.stream(validator.getRegexValidator().getPatterns()).map(Pattern::pattern).collect(
+ final List<String> allPatterns =
Arrays.stream(validator.getRegexValidator().getPatterns()).map(Pattern::pattern).collect(
Collectors.toList());
- String re = fmtRE(structure.substring(2));
+ final String re = fmtRE(structure.substring(2));
assertTrue(allPatterns.remove(countryCode + re), "No pattern " +
countryCode + re + " found for " + countryInfo);
- for (String ac : acountyCode) {
+ for (final String ac : acountyCode) {
assertTrue(allPatterns.remove(ac + re), "No additional country
code " + ac + " found for " + countryInfo);
}
assertTrue(allPatterns.isEmpty(), "Unrecognized patterns: " +
allPatterns + " for" + countryInfo);
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 35512f03..bf5e03f3 100644
--- a/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ISBNValidatorTest.java
@@ -86,17 +86,17 @@ public class ISBNValidatorTest {
*/
@Test
public void testConversionErrors() {
- ISBNValidator validator = ISBNValidator.getInstance();
- String input1 = "123456789 ";
+ final ISBNValidator validator = ISBNValidator.getInstance();
+ final String input1 = "123456789 ";
assertThrows(IllegalArgumentException.class, () ->
validator.convertToISBN13(input1), "Expected IllegalArgumentException for '" +
input1 + "'");
- String input2 = "12345678901";
+ final String input2 = "12345678901";
assertThrows(IllegalArgumentException.class, () ->
validator.convertToISBN13(input2), "Expected IllegalArgumentException for '" +
input2 + "'");
- String input3 = "";
+ final String input3 = "";
assertThrows(IllegalArgumentException.class, () ->
validator.convertToISBN13(input3), "Expected IllegalArgumentException for '" +
input3 + "'");
- String input4 = "X234567890";
+ final String input4 = "X234567890";
assertThrows(IllegalArgumentException.class, () ->
validator.convertToISBN13(input4), "Expected IllegalArgumentException for '" +
input4 + "'");
}
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 6d09f5d6..94157211 100644
--- a/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
@@ -57,13 +57,13 @@ public class ISSNValidatorTest {
*/
@Test
public void testConversionErrors() {
- String input1 = "9780072129519";
+ final String input1 = "9780072129519";
assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.extractFromEAN13(input1), "Expected IllegalArgumentException for '" +
input1 + "'");
- String input2 = "9791090636071";
+ final String input2 = "9791090636071";
assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.extractFromEAN13(input2), "Expected IllegalArgumentException for '" +
input2 + "'");
- String input3 = "03178471";
+ final String input3 = "03178471";
assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.extractFromEAN13(input3), "Expected IllegalArgumentException for '" +
input3 + "'");
}
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 8ab10f22..71f9004c 100644
---
a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
@@ -117,7 +117,7 @@ public class RegexValidatorTest {
assertEquals("Regular expressions are missing", e.getMessage(), "Null
Array");
// Multiple Regular Expression - Zero Length array
- e = assertThrows(IllegalArgumentException.class, () -> new
RegexValidator(), "Zero Length Array");
+ e = assertThrows(IllegalArgumentException.class, RegexValidator::new,
"Zero Length Array");
assertEquals("Regular expressions are missing", e.getMessage(), "Zero
Length Array");
// Multiple Regular Expression - Array has Null
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 85de68af..00cc56e7 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
@@ -304,7 +304,7 @@ public abstract class AbstractCheckDigitTest {
@Test
public void testZeroSum() {
assertFalse(routine.isValid(zeroSum), "isValid() Zero Sum");
- Exception e = assertThrows(Exception.class, () ->
routine.calculate(zeroSum), "Zero Sum");
+ final Exception e = assertThrows(Exception.class, () ->
routine.calculate(zeroSum), "Zero Sum");
assertEquals("Invalid code, sum is zero", e.getMessage(), "isValid()
Zero Sum");
}
