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 a24a7bf Use isEmpty().
a24a7bf is described below
commit a24a7bfbbb4d58d2e72dc57f00af3ba8080fb101
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jan 17 10:34:09 2021 -0500
Use isEmpty().
---
src/main/java/org/apache/commons/validator/Field.java | 4 ++--
src/main/java/org/apache/commons/validator/FormSet.java | 6 +++---
.../java/org/apache/commons/validator/ValidatorAction.java | 4 ++--
.../org/apache/commons/validator/ValidatorResources.java | 12 ++++++------
.../validator/routines/AbstractCalendarValidator.java | 2 +-
.../commons/validator/routines/AbstractNumberValidator.java | 2 +-
.../org/apache/commons/validator/routines/CodeValidator.java | 2 +-
.../org/apache/commons/validator/routines/UrlValidator.java | 4 ++--
.../apache/commons/validator/GenericTypeValidatorImpl.java | 4 ++--
.../org/apache/commons/validator/GenericValidatorImpl.java | 6 +++---
.../validator/routines/checkdigit/IBANCheckDigitTest.java | 2 +-
11 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/Field.java
b/src/main/java/org/apache/commons/validator/Field.java
index ff6d25c..5dd7373 100644
--- a/src/main/java/org/apache/commons/validator/Field.java
+++ b/src/main/java/org/apache/commons/validator/Field.java
@@ -257,7 +257,7 @@ public class Field implements Cloneable, Serializable {
while (st.hasMoreTokens()) {
String depend = st.nextToken().trim();
- if (depend != null && depend.length() > 0) {
+ if (depend != null && !depend.isEmpty()) {
this.dependencyList.add(depend);
}
}
@@ -541,7 +541,7 @@ public class Field implements Cloneable, Serializable {
* @return Whether the Field is indexed.
*/
public boolean isIndexed() {
- return (indexedListProperty != null && indexedListProperty.length() >
0);
+ return (indexedListProperty != null && !indexedListProperty.isEmpty());
}
/**
diff --git a/src/main/java/org/apache/commons/validator/FormSet.java
b/src/main/java/org/apache/commons/validator/FormSet.java
index fafc49e..98b0508 100644
--- a/src/main/java/org/apache/commons/validator/FormSet.java
+++ b/src/main/java/org/apache/commons/validator/FormSet.java
@@ -305,18 +305,18 @@ public class FormSet implements Serializable {
*/
public String displayKey() {
StringBuilder results = new StringBuilder();
- if (language != null && language.length() > 0) {
+ if (language != null && !language.isEmpty()) {
results.append("language=");
results.append(language);
}
- if (country != null && country.length() > 0) {
+ if (country != null && !country.isEmpty()) {
if (results.length() > 0) {
results.append(", ");
}
results.append("country=");
results.append(country);
}
- if (variant != null && variant.length() > 0) {
+ if (variant != null && !variant.isEmpty()) {
if (results.length() > 0) {
results.append(", ");
}
diff --git a/src/main/java/org/apache/commons/validator/ValidatorAction.java
b/src/main/java/org/apache/commons/validator/ValidatorAction.java
index 90abd9c..d882e48 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorAction.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorAction.java
@@ -226,7 +226,7 @@ public class ValidatorAction implements Serializable {
while (st.hasMoreTokens()) {
String value = st.nextToken().trim();
- if (value != null && value.length() > 0) {
+ if (value != null && !value.isEmpty()) {
this.methodParameterList.add(value);
}
}
@@ -254,7 +254,7 @@ public class ValidatorAction implements Serializable {
while (st.hasMoreTokens()) {
String depend = st.nextToken().trim();
- if (depend != null && depend.length() > 0) {
+ if (depend != null && !depend.isEmpty()) {
this.dependencyList.add(depend);
}
}
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResources.java
b/src/main/java/org/apache/commons/validator/ValidatorResources.java
index efa90df..cde2574 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResources.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResources.java
@@ -403,9 +403,9 @@ public class ValidatorResources implements Serializable {
* Assembles a Locale code from the given parts.
*/
private String buildLocale(String lang, String country, String variant) {
- String key = ((lang != null && lang.length() > 0) ? lang : "");
- key += ((country != null && country.length() > 0) ? "_" + country :
"");
- key += ((variant != null && variant.length() > 0) ? "_" + variant :
"");
+ String key = ((lang != null && !lang.isEmpty()) ? lang : "");
+ key += ((country != null && !country.isEmpty()) ? "_" + country : "");
+ key += ((variant != null && !variant.isEmpty()) ? "_" + variant : "");
return key;
}
@@ -453,7 +453,7 @@ public class ValidatorResources implements Serializable {
// Try language/country/variant
String key = this.buildLocale(language, country, variant);
- if (key.length() > 0) {
+ if (!key.isEmpty()) {
FormSet formSet = getFormSets().get(key);
if (formSet != null) {
form = formSet.getForm(formKey);
@@ -465,7 +465,7 @@ public class ValidatorResources implements Serializable {
// Try language/country
if (form == null) {
key = buildLocale(language, country, null);
- if (key.length() > 0) {
+ if (!key.isEmpty()) {
FormSet formSet = getFormSets().get(key);
if (formSet != null) {
form = formSet.getForm(formKey);
@@ -476,7 +476,7 @@ public class ValidatorResources implements Serializable {
// Try language
if (form == null) {
key = buildLocale(language, null, null);
- if (key.length() > 0) {
+ if (!key.isEmpty()) {
FormSet formSet = getFormSets().get(key);
if (formSet != null) {
form = formSet.getForm(formKey);
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 84371bc..6f80207 100644
---
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
@@ -211,7 +211,7 @@ public abstract class AbstractCalendarValidator extends
AbstractFormatValidator
@Override
protected Format getFormat(String pattern, Locale locale) {
DateFormat formatter = null;
- boolean usePattern = (pattern != null && pattern.length() > 0);
+ boolean usePattern = pattern != null && !pattern.isEmpty();
if (!usePattern) {
formatter = (DateFormat)getFormat(locale);
} else if (locale == null) {
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 e341596..9d257e3 100644
---
a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
@@ -188,7 +188,7 @@ public abstract class AbstractNumberValidator extends
AbstractFormatValidator {
protected Format getFormat(String pattern, Locale locale) {
NumberFormat formatter = null;
- boolean usePattern = (pattern != null && pattern.length() > 0);
+ boolean usePattern = pattern != null && !pattern.isEmpty();
if (!usePattern) {
formatter = (NumberFormat)getFormat(locale);
} else if (locale == null) {
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 2696e82..64e5e6e 100644
--- a/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
@@ -114,7 +114,7 @@ public final class CodeValidator implements Serializable {
*/
public CodeValidator(String regex, int minLength, int maxLength,
CheckDigit checkdigit) {
- if (regex != null && regex.length() > 0) {
+ if (regex != null && !regex.isEmpty()) {
this.regexValidator = new RegexValidator(regex);
} else {
this.regexValidator = null;
diff --git
a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
index 5e3babc..0a9e9b1 100644
--- a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
@@ -413,7 +413,7 @@ public class UrlValidator implements Serializable {
}
}
String port = authorityMatcher.group(PARSE_AUTHORITY_PORT);
- if (port != null && port.length() > 0) {
+ if (port != null && !port.isEmpty()) {
try {
int iPort = Integer.parseInt(port);
if (iPort < 0 || iPort > MAX_UNSIGNED_16_BIT_INT) {
@@ -426,7 +426,7 @@ public class UrlValidator implements Serializable {
}
String extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
- if (extra != null && extra.trim().length() > 0){
+ if (extra != null && !extra.trim().isEmpty()){
return false;
}
diff --git
a/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java
b/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java
index fd5c272..146df5f 100644
--- a/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java
+++ b/src/test/java/org/apache/commons/validator/GenericTypeValidatorImpl.java
@@ -237,9 +237,9 @@ public class GenericTypeValidatorImpl {
String datePatternStrict = field.getVarValue("datePatternStrict");
Date result = null;
- if (datePattern != null && datePattern.length() > 0) {
+ if (datePattern != null && !datePattern.isEmpty()) {
result = GenericTypeValidator.formatDate(value, datePattern,
false);
- } else if (datePatternStrict != null && datePatternStrict.length() >
0) {
+ } else if (datePatternStrict != null && !datePatternStrict.isEmpty()) {
result = GenericTypeValidator.formatDate(value, datePatternStrict,
true);
}
diff --git
a/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
b/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
index 7af59e3..efd085c 100644
--- a/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
+++ b/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
@@ -231,14 +231,14 @@ public class GenericValidatorImpl {
}
String dependVal = ValidatorUtils.getValueAsString(form,
dependProp);
if (dependTest.equals(FIELD_TEST_NULL)) {
- if ((dependVal != null) && (dependVal.length() > 0)) {
+ if ((dependVal != null) && (!dependVal.isEmpty())) {
this_required = false;
} else {
this_required = true;
}
}
if (dependTest.equals(FIELD_TEST_NOTNULL)) {
- if ((dependVal != null) && (dependVal.length() > 0)) {
+ if ((dependVal != null) && (!dependVal.isEmpty())) {
this_required = true;
} else {
this_required = false;
@@ -255,7 +255,7 @@ public class GenericValidatorImpl {
i++;
}
if (required) {
- if ((value != null) && (value.length() > 0)) {
+ if ((value != null) && (!value.isEmpty())) {
return true;
} else {
return false;
diff --git
a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
index 92b6d86..da7f0e9 100644
---
a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
@@ -235,7 +235,7 @@ public class IBANCheckDigitTest extends
AbstractCheckDigitTest {
this.getClass().getResourceAsStream("IBANtests.txt"),"ASCII"))) {
String line;
while((line=rdr.readLine()) != null) {
- if (!line.startsWith("#") && line.length() > 0) {
+ if (!line.startsWith("#") && !line.isEmpty()) {
if (line.startsWith("-")) {
line = line.substring(1);
Assert.assertFalse(line,
routine.isValid(line.replaceAll(" ", "")));
