This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-validator.git
commit 67b621653b4bd0c717d57a866187fcc7e15a4590 Author: Gary Gregory <[email protected]> AuthorDate: Mon Jul 20 13:08:15 2026 -0700 Internal refactoring --- .../validator/routines/checkdigit/ABANumberCheckDigit.java | 5 +---- .../validator/routines/checkdigit/CUSIPCheckDigit.java | 5 +---- .../validator/routines/checkdigit/EAN13CheckDigit.java | 5 +---- .../validator/routines/checkdigit/ISBN10CheckDigit.java | 5 +---- .../commons/validator/routines/checkdigit/ISSNCheckDigit.java | 5 +---- .../validator/routines/checkdigit/ModulusCheckDigit.java | 11 +++++++++++ 6 files changed, 16 insertions(+), 20 deletions(-) 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 e5d87bea..a78f198a 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 @@ -75,10 +75,7 @@ public final class ABANumberCheckDigit extends ModulusCheckDigit { */ @Override public boolean isValid(final String code) { - if (code != null && code.length() != ABAN_LEN) { - return false; - } - return super.isValid(code); + return isLength(code, ABAN_LEN) && super.isValid(code); } /** 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 a02c0830..de65515b 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 @@ -67,10 +67,7 @@ public final class CUSIPCheckDigit extends ModulusCheckDigit { */ @Override public boolean isValid(final String code) { - if (code != null && code.length() != CUSIP_LEN) { - return false; - } - return super.isValid(code); + return isLength(code, CUSIP_LEN) && super.isValid(code); } /** 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 5f072599..eedf55ac 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 @@ -74,10 +74,7 @@ public final class EAN13CheckDigit extends ModulusCheckDigit { */ @Override public boolean isValid(final String code) { - if (code != null && code.length() != EAN13_LEN) { - return false; - } - return super.isValid(code); + return isLength(code, EAN13_LEN) && super.isValid(code); } /** diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java index ab82c629..e3d183e5 100644 --- a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java +++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java @@ -71,10 +71,7 @@ public final class ISBN10CheckDigit extends ModulusCheckDigit { */ @Override public boolean isValid(final String code) { - if (code != null && code.length() != ISBN10_LEN) { - return false; - } - return super.isValid(code); + return isLength(code, ISBN10_LEN) && super.isValid(code); } /** diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java index 9d5c77e9..56b196aa 100644 --- a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java +++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java @@ -78,10 +78,7 @@ public final class ISSNCheckDigit extends ModulusCheckDigit { */ @Override public boolean isValid(final String code) { - if (code != null && code.length() != ISSN_LEN) { - return false; - } - return super.isValid(code); + return isLength(code, ISSN_LEN) && super.isValid(code); } @Override diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java index 416ef608..0356bba0 100644 --- a/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java +++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java @@ -125,6 +125,17 @@ public abstract class ModulusCheckDigit extends AbstractCheckDigit implements Se return modulus; } + /** + * Tests if the code is of the specified length. + * + * @param code The code to test. + * @param length The length to test for. + * @return {@code true} if the code is of the specified length, otherwise {@code false}. + */ + boolean isLength(final String code, final int length) { + return code != null && code.length() == length; + } + /** * Validates a modulus check digit for a code. *
