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 e2edf6a Use isEmpty().
e2edf6a is described below
commit e2edf6a55b9d65116de6d94bcc972bca4d4d13b5
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jan 17 09:22:28 2021 -0500
Use isEmpty().
---
src/main/java/org/apache/commons/validator/Field.java | 2 +-
src/main/java/org/apache/commons/validator/GenericTypeValidator.java | 2 +-
src/main/java/org/apache/commons/validator/GenericValidator.java | 2 +-
src/main/java/org/apache/commons/validator/ValidatorResources.java | 4 ++--
.../apache/commons/validator/routines/AbstractCalendarValidator.java | 2 +-
.../apache/commons/validator/routines/AbstractNumberValidator.java | 2 +-
.../java/org/apache/commons/validator/routines/CodeValidator.java | 2 +-
.../org/apache/commons/validator/routines/CreditCardValidator.java | 4 ++--
.../org/apache/commons/validator/routines/InetAddressValidator.java | 4 ++--
.../java/org/apache/commons/validator/routines/RegexValidator.java | 2 +-
.../apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java | 2 +-
.../commons/validator/routines/checkdigit/ModulusCheckDigit.java | 4 ++--
.../commons/validator/routines/checkdigit/ModulusTenCheckDigit.java | 2 +-
.../commons/validator/routines/checkdigit/VerhoeffCheckDigit.java | 4 ++--
14 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/Field.java
b/src/main/java/org/apache/commons/validator/Field.java
index 1d324b7..ff6d25c 100644
--- a/src/main/java/org/apache/commons/validator/Field.java
+++ b/src/main/java/org/apache/commons/validator/Field.java
@@ -330,7 +330,7 @@ public class Field implements Cloneable, Serializable {
*/
public void addArg(Arg arg) {
// TODO this first if check can go away after arg0, etc. are removed
from dtd
- if (arg == null || arg.getKey() == null || arg.getKey().length() == 0)
{
+ if (arg == null || arg.getKey() == null || arg.getKey().isEmpty()) {
return;
}
diff --git
a/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
b/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
index d3d72a9..b27b6c8 100644
--- a/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
+++ b/src/main/java/org/apache/commons/validator/GenericTypeValidator.java
@@ -431,7 +431,7 @@ public class GenericTypeValidator implements Serializable {
if (value == null
|| datePattern == null
- || datePattern.length() == 0) {
+ || datePattern.isEmpty()) {
return null;
}
diff --git a/src/main/java/org/apache/commons/validator/GenericValidator.java
b/src/main/java/org/apache/commons/validator/GenericValidator.java
index 5251ef9..904892e 100644
--- a/src/main/java/org/apache/commons/validator/GenericValidator.java
+++ b/src/main/java/org/apache/commons/validator/GenericValidator.java
@@ -53,7 +53,7 @@ public class GenericValidator implements Serializable {
* @return true if blank or null.
*/
public static boolean isBlankOrNull(String value) {
- return ((value == null) || (value.trim().length() == 0));
+ return value == null || value.trim().isEmpty();
}
/**
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResources.java
b/src/main/java/org/apache/commons/validator/ValidatorResources.java
index 496d56b..efa90df 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResources.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResources.java
@@ -319,7 +319,7 @@ public class ValidatorResources implements Serializable {
*/
public void addFormSet(FormSet fs) {
String key = this.buildKey(fs);
- if (key.length() == 0) {// there can only be one default formset
+ if (key.isEmpty()) {// there can only be one default formset
if (getLog().isWarnEnabled() && defaultFormSet != null) {
// warn the user he might not get the expected results
getLog().warn("Overriding default FormSet definition.");
@@ -595,7 +595,7 @@ public class ValidatorResources implements Serializable {
String key = buildLocale(language, country, variant);
- if (key.length() == 0) {
+ if (key.isEmpty()) {
return defaultFormSet;
}
diff --git
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
index 14f9b92..84371bc 100644
---
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
@@ -176,7 +176,7 @@ public abstract class AbstractCalendarValidator extends
AbstractFormatValidator
protected Object parse(String value, String pattern, Locale locale,
TimeZone timeZone) {
value = (value == null ? null : value.trim());
- if (value == null || value.length() == 0) {
+ if (value == null || value.isEmpty()) {
return null;
}
DateFormat formatter = (DateFormat)getFormat(pattern, locale);
diff --git
a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
index f8c6cce..e341596 100644
---
a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
@@ -155,7 +155,7 @@ public abstract class AbstractNumberValidator extends
AbstractFormatValidator {
protected Object parse(String value, String pattern, Locale locale) {
value = (value == null ? null : value.trim());
- if (value == null || value.length() == 0) {
+ if (value == null || value.isEmpty()) {
return null;
}
Format formatter = getFormat(pattern, locale);
diff --git
a/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
b/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
index 130e7c1..2696e82 100644
--- a/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
@@ -253,7 +253,7 @@ public final class CodeValidator implements Serializable {
}
String code = input.trim();
- if (code.length() == 0) {
+ if (code.isEmpty()) {
return null;
}
diff --git
a/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
b/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
index 7d269b5..f15f307 100644
---
a/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
@@ -414,7 +414,7 @@ public class CreditCardValidator implements Serializable {
* @return Whether the card number is valid.
*/
public boolean isValid(String card) {
- if (card == null || card.length() == 0) {
+ if (card == null || card.isEmpty()) {
return false;
}
for (CodeValidator cardType : cardTypes) {
@@ -432,7 +432,7 @@ public class CreditCardValidator implements Serializable {
* if invalid.
*/
public Object validate(String card) {
- if (card == null || card.length() == 0) {
+ if (card == null || card.isEmpty()) {
return null;
}
Object result = null;
diff --git
a/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
b/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
index a9648b1..c3dab6e 100644
---
a/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
@@ -95,7 +95,7 @@ public class InetAddressValidator implements Serializable {
// verify that address subgroups are legal
for (String ipSegment : groups) {
- if (ipSegment == null || ipSegment.length() == 0) {
+ if (ipSegment == null || ipSegment.isEmpty()) {
return false;
}
@@ -182,7 +182,7 @@ public class InetAddressValidator implements Serializable {
int emptyOctets = 0; // consecutive empty chunks
for (int index = 0; index < octets.length; index++) {
String octet = octets[index];
- if (octet.length() == 0) {
+ if (octet.isEmpty()) {
emptyOctets++;
if (emptyOctets > 1) {
return false;
diff --git
a/src/main/java/org/apache/commons/validator/routines/RegexValidator.java
b/src/main/java/org/apache/commons/validator/routines/RegexValidator.java
index 78195f2..79d7fef 100644
--- a/src/main/java/org/apache/commons/validator/routines/RegexValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/RegexValidator.java
@@ -124,7 +124,7 @@ public class RegexValidator implements Serializable {
patterns = new Pattern[regexs.length];
int flags = (caseSensitive ? 0: Pattern.CASE_INSENSITIVE);
for (int i = 0; i < regexs.length; i++) {
- if (regexs[i] == null || regexs[i].length() == 0) {
+ if (regexs[i] == null || regexs[i].isEmpty()) {
throw new IllegalArgumentException("Regular expression[" + i +
"] is missing");
}
patterns[i] = Pattern.compile(regexs[i], flags);
diff --git
a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java
b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java
index 02f0efd..d6bbb38 100644
---
a/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java
+++
b/src/main/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigit.java
@@ -65,7 +65,7 @@ public final class ISBNCheckDigit implements CheckDigit,
Serializable {
*/
@Override
public String calculate(String code) throws CheckDigitException {
- if (code == null || code.length() == 0) {
+ if (code == null || code.isEmpty()) {
throw new CheckDigitException("ISBN Code is missing");
} else if (code.length() == 9) { // CHECKSTYLE IGNORE MagicNumber
return ISBN10_CHECK_DIGIT.calculate(code);
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 ab73e7b..2313406 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
@@ -68,7 +68,7 @@ public abstract class ModulusCheckDigit implements
CheckDigit, Serializable {
*/
@Override
public boolean isValid(String code) {
- if (code == null || code.length() == 0) {
+ if (code == null || code.isEmpty()) {
return false;
}
try {
@@ -89,7 +89,7 @@ public abstract class ModulusCheckDigit implements
CheckDigit, Serializable {
*/
@Override
public String calculate(String code) throws CheckDigitException {
- if (code == null || code.length() == 0) {
+ if (code == null || code.isEmpty()) {
throw new CheckDigitException("Code is missing");
}
int modulusResult = calculateModulus(code, false);
diff --git
a/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCheckDigit.java
b/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCheckDigit.java
index 7637226..3cf0d4d 100644
---
a/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCheckDigit.java
+++
b/src/main/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCheckDigit.java
@@ -173,7 +173,7 @@ public final class ModulusTenCheckDigit extends
ModulusCheckDigit {
*/
@Override
public boolean isValid(String code) {
- if (code == null || code.length() == 0) {
+ if (code == null || code.isEmpty()) {
return false;
}
if (!Character.isDigit(code.charAt(code.length() - 1))) {
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 b4e5c66..87e5370 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
@@ -76,7 +76,7 @@ public final class VerhoeffCheckDigit implements CheckDigit,
Serializable {
*/
@Override
public boolean isValid(String code) {
- if (code == null || code.length() == 0) {
+ if (code == null || code.isEmpty()) {
return false;
}
try {
@@ -96,7 +96,7 @@ public final class VerhoeffCheckDigit implements CheckDigit,
Serializable {
*/
@Override
public String calculate(String code) throws CheckDigitException {
- if (code == null || code.length() == 0) {
+ if (code == null || code.isEmpty()) {
throw new CheckDigitException("Code is missing");
}
int checksum = calculateChecksum(code, false);
