You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/11/20 23:27:22 UTC
svn commit: r1715435 - in
/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator:
./ routines/ routines/checkdigit/ util/
Author: sebb
Date: Fri Nov 20 22:27:21 2015
New Revision: 1715435
URL: http://svn.apache.org/viewvc?rev=1715435&view=rev
Log:
Fix most magic numbers
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java Fri Nov 20 22:27:21 2015
@@ -53,6 +53,7 @@ import org.apache.commons.validator.util
* @deprecated Use the new CreditCardValidator in the routines package. This class
* will be removed in a future release.
*/
+// CHECKSTYLE:OFF (deprecated code)
public class CreditCardValidator {
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java Fri Nov 20 22:27:21 2015
@@ -138,7 +138,7 @@ public class EmailValidator {
*/
protected boolean isValidIpAddress(String ipAddress) {
Matcher ipAddressMatcher = IP_DOMAIN_PATTERN.matcher(ipAddress);
- for (int i = 1; i <= 4; i++) {
+ for (int i = 1; i <= 4; i++) { // CHECKSTYLE IGNORE MagicNumber
String ipSegment = ipAddressMatcher.group(i);
if (ipSegment == null || ipSegment.length() <= 0) {
return false;
@@ -152,7 +152,7 @@ public class EmailValidator {
return false;
}
- if (iIpSegment > 255) {
+ if (iIpSegment > 255) { // CHECKSTYLE IGNORE MagicNumber
return false;
}
@@ -166,7 +166,7 @@ public class EmailValidator {
* @return true if the symbolic domain name is valid.
*/
protected boolean isValidSymbolicDomain(String domain) {
- String[] domainSegment = new String[10];
+ String[] domainSegment = new String[10]; // CHECKSTYLE IGNORE MagicNumber
boolean match = true;
int i = 0;
Matcher atomMatcher = ATOM_PATTERN.matcher(domain);
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/UrlValidator.java Fri Nov 20 22:27:21 2015
@@ -360,7 +360,7 @@ public class UrlValidator implements Ser
}
}
String topLevel = domainSegment[segmentCount - 1];
- if (topLevel.length() < 2 || topLevel.length() > 4) {
+ if (topLevel.length() < 2 || topLevel.length() > 4) { // CHECKSTYLE IGNORE MagicNumber (deprecated code)
return false;
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java Fri Nov 20 22:27:21 2015
@@ -294,7 +294,8 @@ public class ValidatorResources implemen
arg.setResource(false);
}
try {
- arg.setPosition(Integer.parseInt(name.substring(3)));
+ final int length = "arg".length(); // skip the arg prefix
+ arg.setPosition(Integer.parseInt(name.substring(length)));
} catch (Exception ex) {
getLog().error("Error parsing Arg position: "
+ name + " " + arg + " " + ex);
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java Fri Nov 20 22:27:21 2015
@@ -389,13 +389,13 @@ public abstract class AbstractCalendarVa
int month = (calendar.get(Calendar.MONTH) + 1);
int relativeMonth = (month >= monthOfFirstQuarter)
? (month - monthOfFirstQuarter)
- : (month + (12 - monthOfFirstQuarter));
- int quarter = ((relativeMonth / 3) + 1);
+ : (month + (12 - monthOfFirstQuarter)); // CHECKSTYLE IGNORE MagicNumber
+ int quarter = ((relativeMonth / 3) + 1); // CHECKSTYLE IGNORE MagicNumber
// adjust the year if the quarter doesn't start in January
if (month < monthOfFirstQuarter) {
--year;
}
- return (year * 10) + quarter;
+ return (year * 10) + quarter; // CHECKSTYLE IGNORE MagicNumber
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java Fri Nov 20 22:27:21 2015
@@ -223,13 +223,13 @@ public abstract class AbstractNumberVali
int scale = minimumFraction;
if (format instanceof DecimalFormat) {
int multiplier = ((DecimalFormat)format).getMultiplier();
- if (multiplier == 100) {
- scale += 2;
- } else if (multiplier == 1000) {
- scale += 3;
+ if (multiplier == 100) { // CHECKSTYLE IGNORE MagicNumber
+ scale += 2; // CHECKSTYLE IGNORE MagicNumber
+ } else if (multiplier == 1000) { // CHECKSTYLE IGNORE MagicNumber
+ scale += 3; // CHECKSTYLE IGNORE MagicNumber
}
} else if (formatType == PERCENT_FORMAT) {
- scale += 2;
+ scale += 2; // CHECKSTYLE IGNORE MagicNumber
}
return scale;
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java Fri Nov 20 22:27:21 2015
@@ -90,18 +90,18 @@ public class CreditCardValidator impleme
/**
* Option specifying that Discover cards are allowed.
*/
- public static final long DISCOVER = 1 << 3;
+ public static final long DISCOVER = 1 << 3; // CHECKSTYLE IGNORE MagicNumber
/**
* Option specifying that Diners cards are allowed.
*/
- public static final long DINERS = 1 << 4;
+ public static final long DINERS = 1 << 4; // CHECKSTYLE IGNORE MagicNumber
/**
* Option specifying that VPay (Visa) cards are allowed.
* @since 1.5.0
*/
- public static final long VPAY = 1 << 5;
+ public static final long VPAY = 1 << 5; // CHECKSTYLE IGNORE MagicNumber
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java Fri Nov 20 22:27:21 2015
@@ -63,6 +63,8 @@ import java.util.Locale;
*/
public class DomainValidator implements Serializable {
+ private static final int MAX_DOMAIN_LENGTH = 253;
+
private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final long serialVersionUID = -4407125112880174009L;
@@ -156,7 +158,7 @@ public class DomainValidator implements
// Unicode is never shorter than punycode, so check punycode
// if domain did not convert, then it will be caught by ASCII
// checks in the regexes below
- if (domain.length() > 253) {
+ if (domain.length() > MAX_DOMAIN_LENGTH) {
return false;
}
String[] groups = domainRegex.match(domain);
@@ -177,7 +179,7 @@ public class DomainValidator implements
// Unicode is never shorter than punycode, so check punycode
// if domain did not convert, then it will be caught by ASCII
// checks in the regexes below
- if (domain.length() > 253) {
+ if (domain.length() > MAX_DOMAIN_LENGTH) {
return false;
}
String[] groups = domainRegex.match(domain);
@@ -1411,7 +1413,7 @@ public class DomainValidator implements
* using the getInstance methods which are all (now) synchronised.
*/
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
- private static volatile String[] COUNTRY_CODE_TLDS_PLUS = EMPTY_STRING_ARRAY;
+ private static volatile String[] COUNTRY_CODE_TLDS_PLUS = EMPTY_STRING_ARRAY; //
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
private static volatile String[] GENERIC_TLDS_PLUS = EMPTY_STRING_ARRAY;
@@ -1545,7 +1547,7 @@ public class DomainValidator implements
return true;
}
for(int i=0; i < input.length(); i++) {
- if (input.charAt(i) > 0x7F) {
+ if (input.charAt(i) > 0x7F) { // CHECKSTYLE IGNORE MagicNumber
return false;
}
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/EmailValidator.java Fri Nov 20 22:27:21 2015
@@ -50,6 +50,8 @@ public class EmailValidator implements S
private static final Pattern IP_DOMAIN_PATTERN = Pattern.compile(IP_DOMAIN_REGEX);
private static final Pattern USER_PATTERN = Pattern.compile(USER_REGEX);
+ private static final int MAX_USERNAME_LEN = 64;
+
private final boolean allowLocal;
private final boolean allowTld;
@@ -211,7 +213,7 @@ public class EmailValidator implements S
*/
protected boolean isValidUser(String user) {
- if (user == null || user.length() > 64) {
+ if (user == null || user.length() > MAX_USERNAME_LEN) {
return false;
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ISBNValidator.java Fri Nov 20 22:27:21 2015
@@ -55,6 +55,8 @@ import org.apache.commons.validator.rout
*/
public class ISBNValidator implements Serializable {
+ private static final int ISBN_10_LEN = 10;
+
private static final long serialVersionUID = 4319515687976420405L;
private static final String SEP = "(?:\\-|\\s)";
@@ -239,12 +241,12 @@ public class ISBNValidator implements Se
}
String input = isbn10.trim();
- if (input.length() != 10) {
+ if (input.length() != ISBN_10_LEN) {
throw new IllegalArgumentException("Invalid length " + input.length() + " for '" + input + "'");
}
- // Calculate the new ISBN-13 code
- String isbn13 = "978" + input.substring(0, 9);
+ // Calculate the new ISBN-13 code (drop the original checkdigit)
+ String isbn13 = "978" + input.substring(0, ISBN_10_LEN - 1);
try {
String checkDigit = isbn13Validator.getCheckDigit().calculate(isbn13);
isbn13 += checkDigit;
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java Fri Nov 20 22:27:21 2015
@@ -36,11 +36,23 @@ import java.util.List;
*/
public class InetAddressValidator implements Serializable {
+ private static final int IPV4_MAX_OCTET_VALUE = 255;
+
+ private static final int MAX_UNSIGNED_SHORT = 0xffff;
+
+ private static final int BASE_16 = 16;
+
private static final long serialVersionUID = -919201640201914789L;
private static final String IPV4_REGEX =
"^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$";
+ // Max number of hex groups (separated by :) in an IPV6 address
+ private static final int IPV6_MAX_HEX_GROUPS = 8;
+
+ // Max hex digits in each IPv6 group
+ private static final int IPV6_MAX_HEX_DIGITS_PER_GROUP = 4;
+
/**
* Singleton instance of this class.
*/
@@ -94,7 +106,7 @@ public class InetAddressValidator implem
return false;
}
- if (iIpSegment > 255) {
+ if (iIpSegment > IPV4_MAX_OCTET_VALUE) {
return false;
}
@@ -134,7 +146,7 @@ public class InetAddressValidator implem
}
octets = octetList.toArray(new String[octetList.size()]);
}
- if (octets.length > 8) {
+ if (octets.length > IPV6_MAX_HEX_GROUPS) {
return false;
}
int validOctets = 0;
@@ -162,22 +174,22 @@ public class InetAddressValidator implem
validOctets += 2;
continue;
}
- if (octet.length() > 4) {
+ if (octet.length() > IPV6_MAX_HEX_DIGITS_PER_GROUP) {
return false;
}
int octetInt = 0;
try {
- octetInt = Integer.valueOf(octet, 16).intValue();
+ octetInt = Integer.valueOf(octet, BASE_16).intValue();
} catch (NumberFormatException e) {
return false;
}
- if (octetInt < 0 || octetInt > 0xffff) {
+ if (octetInt < 0 || octetInt > MAX_UNSIGNED_SHORT) {
return false;
}
}
validOctets++;
}
- if (validOctets < 8 && !containsCompressedZeroes) {
+ if (validOctets < IPV6_MAX_HEX_GROUPS && !containsCompressedZeroes) {
return false;
}
return true;
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/UrlValidator.java Fri Nov 20 22:27:21 2015
@@ -100,7 +100,7 @@ public class UrlValidator implements Ser
* validation requirements you should create your validator with
* a {@link RegexValidator} instead ({@link #UrlValidator(RegexValidator, long)})
*/
- public static final long ALLOW_LOCAL_URLS = 1 << 3;
+ public static final long ALLOW_LOCAL_URLS = 1 << 3; // CHECKSTYLE IGNORE MagicNumber
/**
* This expression derived/taken from the BNF for URI (RFC2396).
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ABANumberCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -58,7 +58,7 @@ public final class ABANumberCheckDigit e
* Construct a modulus 10 Check Digit routine for ABA Numbers.
*/
public ABANumberCheckDigit() {
- super(10);
+ super(10); // CHECKSTYLE IGNORE MagicNumber
}
/**
@@ -77,7 +77,7 @@ public final class ABANumberCheckDigit e
* @return The weighted value of the character.
*/
protected int weightedValue(int charValue, int leftPos, int rightPos) {
- int weight = POSITION_WEIGHT[rightPos % 3];
+ int weight = POSITION_WEIGHT[rightPos % 3]; // CHECKSTYLE IGNORE MagicNumber
return charValue * weight;
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -53,7 +53,7 @@ public final class CUSIPCheckDigit exten
* Construct an CUSIP Indetifier Check Digit routine.
*/
public CUSIPCheckDigit() {
- super(10);
+ super(10); // CHECKSTYLE IGNORE MagicNumber
}
/**
@@ -69,7 +69,7 @@ public final class CUSIPCheckDigit exten
throws CheckDigitException {
int charValue = Character.getNumericValue(character);
// the final character is only allowed to reach 9
- final int charMax = rightPos == 1 ? 9 : 35;
+ final int charMax = rightPos == 1 ? 9 : 35; // CHECKSTYLE IGNORE MagicNumber
if (charValue < 0 || charValue > charMax) {
throw new CheckDigitException("Invalid Character[" +
leftPos + "," + rightPos + "] = '" + charValue + "' out of range 0 to " + charMax);
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigit.java Fri Nov 20 22:27:21 2015
@@ -54,7 +54,7 @@ public final class EAN13CheckDigit exten
* Construct a modulus 10 Check Digit routine for EAN/UPC.
*/
public EAN13CheckDigit() {
- super(10);
+ super(10); // CHECKSTYLE IGNORE MagicNumber
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -42,6 +42,8 @@ import java.io.Serializable;
*/
public final class IBANCheckDigit implements CheckDigit, Serializable {
+ private static final int MIN_CODE_LEN = 5;
+
private static final long serialVersionUID = -3600191725934382801L;
/** Singleton IBAN Number Check Digit instance */
@@ -68,7 +70,7 @@ public final class IBANCheckDigit implem
if (code == null || code.length() < 5) {
return false;
}
- String check = code.substring(2,4);
+ String check = code.substring(2,4); // CHECKSTYLE IGNORE MagicNumber
if ("00".equals(check) || "01".equals(check) || "99".equals(check)) {
return false;
}
@@ -92,15 +94,15 @@ public final class IBANCheckDigit implem
* the check digit for the specified code
*/
public String calculate(String code) throws CheckDigitException {
- if (code == null || code.length() < 5) {
+ if (code == null || code.length() < MIN_CODE_LEN) {
throw new CheckDigitException("Invalid Code length=" +
(code == null ? 0 : code.length()));
}
- code = code.substring(0, 2) + "00" + code.substring(4);
+ code = code.substring(0, 2) + "00" + code.substring(4); // CHECKSTYLE IGNORE MagicNumber
int modulusResult = calculateModulus(code);
- int charValue = (98 - modulusResult);
+ int charValue = (98 - modulusResult); // CHECKSTYLE IGNORE MagicNumber
String checkDigit = Integer.toString(charValue);
- return (charValue > 9 ? checkDigit : "0" + checkDigit);
+ return (charValue > 9 ? checkDigit : "0" + checkDigit); // CHECKSTYLE IGNORE MagicNumber
}
/**
@@ -112,7 +114,7 @@ public final class IBANCheckDigit implem
* for the specified code
*/
private int calculateModulus(String code) throws CheckDigitException {
- String reformattedCode = code.substring(4) + code.substring(0, 4);
+ String reformattedCode = code.substring(4) + code.substring(0, 4); // CHECKSTYLE IGNORE MagicNumber
long total = 0;
for (int i = 0; i < reformattedCode.length(); i++) {
int charValue = Character.getNumericValue(reformattedCode.charAt(i));
@@ -120,7 +122,7 @@ public final class IBANCheckDigit implem
throw new CheckDigitException("Invalid Character[" +
i + "] = '" + charValue + "'");
}
- total = (charValue > 9 ? total * 100 : total * 10) + charValue;
+ total = (charValue > 9 ? total * 100 : total * 10) + charValue; // CHECKSTYLE IGNORE MagicNumber
if (total > MAX) {
total = total % MODULUS;
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigit.java Fri Nov 20 22:27:21 2015
@@ -53,7 +53,7 @@ public final class ISBN10CheckDigit exte
* Construct a modulus 11 Check Digit routine for ISBN-10.
*/
public ISBN10CheckDigit() {
- super(11);
+ super(11); // CHECKSTYLE IGNORE MagicNumber
}
/**
@@ -87,7 +87,7 @@ public final class ISBN10CheckDigit exte
protected int toInt(char character, int leftPos, int rightPos)
throws CheckDigitException {
if (rightPos == 1 && character == 'X') {
- return 10;
+ return 10; // CHECKSTYLE IGNORE MagicNumber
}
return super.toInt(character, leftPos, rightPos);
}
@@ -103,7 +103,7 @@ public final class ISBN10CheckDigit exte
*/
protected String toCheckDigit(int charValue)
throws CheckDigitException {
- if (charValue == 10) {
+ if (charValue == 10) { // CHECKSTYLE IGNORE MagicNumber
return "X";
}
return super.toCheckDigit(charValue);
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -66,9 +66,9 @@ public final class ISBNCheckDigit implem
public String calculate(String code) throws CheckDigitException {
if (code == null || code.length() == 0) {
throw new CheckDigitException("ISBN Code is missing");
- } else if (code.length() == 9) {
+ } else if (code.length() == 9) { // CHECKSTYLE IGNORE MagicNumber
return ISBN10_CHECK_DIGIT.calculate(code);
- } else if (code.length() == 12) {
+ } else if (code.length() == 12) { // CHECKSTYLE IGNORE MagicNumber
return ISBN13_CHECK_DIGIT.calculate(code);
} else {
throw new CheckDigitException("Invalid ISBN Length = " + code.length());
@@ -92,9 +92,9 @@ public final class ISBNCheckDigit implem
public boolean isValid(String code) {
if (code == null) {
return false;
- } else if (code.length() == 10) {
+ } else if (code.length() == 10) { // CHECKSTYLE IGNORE MagicNumber
return ISBN10_CHECK_DIGIT.isValid(code);
- } else if (code.length() == 13) {
+ } else if (code.length() == 13) { // CHECKSTYLE IGNORE MagicNumber
return ISBN13_CHECK_DIGIT.isValid(code);
} else {
return false;
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -53,7 +53,7 @@ public final class ISINCheckDigit extend
* Construct an ISIN Indetifier Check Digit routine.
*/
public ISINCheckDigit() {
- super(10);
+ super(10); // CHECKSTYLE IGNORE MagicNumber
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -58,17 +58,17 @@ public final class ISSNCheckDigit extend
* Creates the instance using a checkdigit modulus of 11
*/
public ISSNCheckDigit() {
- super(11);
+ super(11); // CHECKSTYLE IGNORE MagicNumber
}
@Override
protected int weightedValue(int charValue, int leftPos, int rightPos) throws CheckDigitException {
- return charValue * (9 - leftPos);
+ return charValue * (9 - leftPos); // CHECKSTYLE IGNORE MagicNumber
}
@Override
protected String toCheckDigit(int charValue) throws CheckDigitException {
- if (charValue == 10) {
+ if (charValue == 10) { // CHECKSTYLE IGNORE MagicNumber
return "X";
}
return super.toCheckDigit(charValue);
@@ -78,7 +78,7 @@ public final class ISSNCheckDigit extend
protected int toInt(char character, int leftPos, int rightPos)
throws CheckDigitException {
if (rightPos == 1 && character == 'X') {
- return 10;
+ return 10; // CHECKSTYLE IGNORE MagicNumber
}
return super.toInt(character, leftPos, rightPos);
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -51,7 +51,7 @@ public final class LuhnCheckDigit extend
* Construct a modulus 10 Luhn Check Digit routine.
*/
public LuhnCheckDigit() {
- super(10);
+ super(10); // CHECKSTYLE IGNORE MagicNumber
}
/**
@@ -68,8 +68,8 @@ public final class LuhnCheckDigit extend
* @return The weighted value of the character.
*/
protected int weightedValue(int charValue, int leftPos, int rightPos) {
- int weight = POSITION_WEIGHT[rightPos % 2];
+ int weight = POSITION_WEIGHT[rightPos % 2]; // CHECKSTYLE IGNORE MagicNumber
int weightedValue = charValue * weight;
- return weightedValue > 9 ? (weightedValue - 9) : weightedValue;
+ return weightedValue > 9 ? (weightedValue - 9) : weightedValue; // CHECKSTYLE IGNORE MagicNumber
}
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -176,7 +176,7 @@ public abstract class ModulusCheckDigit
*/
protected String toCheckDigit(int charValue)
throws CheckDigitException {
- if (charValue >= 0 && charValue <= 9) {
+ if (charValue >= 0 && charValue <= 9) { // CHECKSTYLE IGNORE MagicNumber
return Integer.toString(charValue);
}
throw new CheckDigitException("Invalid Check Digit Value =" +
@@ -193,8 +193,8 @@ public abstract class ModulusCheckDigit
int total = 0;
int todo = number;
while (todo > 0) {
- total += todo % 10;
- todo = todo / 10;
+ total += todo % 10; // CHECKSTYLE IGNORE MagicNumber
+ todo = todo / 10; // CHECKSTYLE IGNORE MagicNumber
}
return total;
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -53,7 +53,7 @@ public final class SedolCheckDigit exten
* Construct a modulus 11 Check Digit routine for ISBN-10.
*/
public SedolCheckDigit() {
- super(10);
+ super(10); // CHECKSTYLE IGNORE MagicNumber
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigit.java Fri Nov 20 22:27:21 2015
@@ -114,12 +114,12 @@ public final class VerhoeffCheckDigit im
for (int i = 0; i < code.length(); i++) {
int idx = code.length() - (i + 1);
int num = Character.getNumericValue(code.charAt(idx));
- if (num < 0 || num > 9) {
+ if (num < 0 || num > 9) { // CHECKSTYLE IGNORE MagicNumber
throw new CheckDigitException("Invalid Character[" +
i + "] = '" + ((int)code.charAt(idx)) + "'");
}
int pos = includesCheckDigit ? i : i + 1;
- checksum = D_TABLE[checksum][P_TABLE[pos % 8][num]];
+ checksum = D_TABLE[checksum][P_TABLE[pos % 8][num]]; // CHECKSTYLE IGNORE MagicNumber
}
return checksum;
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java?rev=1715435&r1=1715434&r2=1715435&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java Fri Nov 20 22:27:21 2015
@@ -193,7 +193,7 @@ public class Flags implements Serializab
*/
public String toString() {
StringBuilder bin = new StringBuilder(Long.toBinaryString(this.flags));
- for (int i = 64 - bin.length(); i > 0; i--) {
+ for (int i = 64 - bin.length(); i > 0; i--) { // CHECKSTYLE IGNORE MagicNumber
bin.insert(0, "0");
}
return bin.toString();