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 2024/05/25 19:18:09 UTC

(commons-validator) 03/04: Use final

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 8af79bd99801e287c05d5e3cbd570eff45e0dc4e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat May 25 15:04:47 2024 -0400

    Use final
---
 .../routines/checkdigit/ECNumberCheckDigit.java       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/commons/validator/routines/checkdigit/ECNumberCheckDigit.java b/src/main/java/org/apache/commons/validator/routines/checkdigit/ECNumberCheckDigit.java
index 37152c8b..3be34804 100644
--- a/src/main/java/org/apache/commons/validator/routines/checkdigit/ECNumberCheckDigit.java
+++ b/src/main/java/org/apache/commons/validator/routines/checkdigit/ECNumberCheckDigit.java
@@ -97,7 +97,7 @@ public final class ECNumberCheckDigit extends ModulusCheckDigit {
         if (GenericValidator.isBlankOrNull(code)) {
             throw new CheckDigitException("Code is missing");
         }
-        int modulusResult = INSTANCE.calculateModulus(code, false);
+        final int modulusResult = INSTANCE.calculateModulus(code, false);
         return toCheckDigit(modulusResult);
     }
 
@@ -109,15 +109,14 @@ public final class ECNumberCheckDigit extends ModulusCheckDigit {
         if (GenericValidator.isBlankOrNull(code)) {
             return false;
         }
-        Object cde = REGEX_VALIDATOR.validate(code);
-        if (cde instanceof String) {
-            try {
-                final int modulusResult = INSTANCE.calculateModulus((String) cde, true);
-                return modulusResult == Character.getNumericValue(code.charAt(code.length() - 1));
-            } catch (final CheckDigitException ex) {
-                return false;
-            }
-        } else {
+        final Object cde = REGEX_VALIDATOR.validate(code);
+        if (!(cde instanceof String)) {
+            return false;
+        }
+        try {
+            final int modulusResult = INSTANCE.calculateModulus((String) cde, true);
+            return modulusResult == Character.getNumericValue(code.charAt(code.length() - 1));
+        } catch (final CheckDigitException ex) {
             return false;
         }
     }