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 72734d2 No need to nest in else.
72734d2 is described below
commit 72734d296ccb46f36a7b0d56f0b810e5d9588477
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 5 15:03:55 2021 -0500
No need to nest in else.
---
.../apache/commons/validator/EmailValidator.java | 18 ++++---
.../java/org/apache/commons/validator/Field.java | 15 +++---
.../java/org/apache/commons/validator/FormSet.java | 8 ++--
.../apache/commons/validator/ValidatorAction.java | 3 +-
.../routines/AbstractCalendarValidator.java | 15 +++---
.../commons/validator/routines/EmailValidator.java | 27 +++++------
.../validator/routines/InetAddressValidator.java | 13 +++--
.../commons/validator/routines/UrlValidator.java | 12 ++---
.../routines/checkdigit/ISBNCheckDigit.java | 18 +++----
.../commons/validator/util/ValidatorUtils.java | 6 +--
.../commons/validator/GenericValidatorImpl.java | 9 ++--
.../apache/commons/validator/ValidatorTest.java | 14 +++---
.../validator/routines/DomainValidatorTest.java | 5 +-
.../validator/routines/IBANValidatorTest.java | 55 +++++++++++-----------
.../validator/routines/RegexValidatorTest.java | 3 +-
15 files changed, 105 insertions(+), 116 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/EmailValidator.java
b/src/main/java/org/apache/commons/validator/EmailValidator.java
index 40d3be1..44f6b4c 100644
--- a/src/main/java/org/apache/commons/validator/EmailValidator.java
+++ b/src/main/java/org/apache/commons/validator/EmailValidator.java
@@ -111,11 +111,10 @@ public class EmailValidator {
symbolic = DOMAIN_PATTERN.matcher(domain).matches();
}
- if (symbolic) {
- if (!isValidSymbolicDomain(domain)) {
- return false;
- }
- } else {
+ if (!symbolic) {
+ return false;
+ }
+ if (!isValidSymbolicDomain(domain)) {
return false;
}
@@ -192,11 +191,10 @@ public class EmailValidator {
}
String tld = domainSegment[len - 1];
- if (tld.length() > 1) {
- if (! TLD_PATTERN.matcher(tld).matches()) {
- return false;
- }
- } else {
+ if (tld.length() <= 1) {
+ return false;
+ }
+ if (! TLD_PATTERN.matcher(tld).matches()) {
return false;
}
diff --git a/src/main/java/org/apache/commons/validator/Field.java
b/src/main/java/org/apache/commons/validator/Field.java
index 5dd7373..4ba9e68 100644
--- a/src/main/java/org/apache/commons/validator/Field.java
+++ b/src/main/java/org/apache/commons/validator/Field.java
@@ -762,12 +762,12 @@ public class Field implements Cloneable, Serializable {
if (indexProp instanceof Collection) {
return ((Collection<?>) indexProp).toArray();
- } else if (indexProp.getClass().isArray()) {
+ }
+ if (indexProp.getClass().isArray()) {
return (Object[]) indexProp;
- } else {
- throw new ValidatorException(this.getKey() + " is not indexed");
}
+ throw new ValidatorException(this.getKey() + " is not indexed");
}
/**
@@ -790,13 +790,14 @@ public class Field implements Cloneable, Serializable {
if (indexProp == null) {
return 0;
- } else if (indexProp instanceof Collection) {
+ }
+ if (indexProp instanceof Collection) {
return ((Collection<?>)indexProp).size();
- } else if (indexProp.getClass().isArray()) {
+ }
+ if (indexProp.getClass().isArray()) {
return ((Object[])indexProp).length;
- } else {
- throw new ValidatorException(this.getKey() + " is not indexed");
}
+ throw new ValidatorException(this.getKey() + " is not indexed");
}
diff --git a/src/main/java/org/apache/commons/validator/FormSet.java
b/src/main/java/org/apache/commons/validator/FormSet.java
index 98b0508..ba54664 100644
--- a/src/main/java/org/apache/commons/validator/FormSet.java
+++ b/src/main/java/org/apache/commons/validator/FormSet.java
@@ -122,19 +122,17 @@ public class FormSet implements Serializable {
}
return VARIANT_FORMSET;
}
- else if (getCountry() != null) {
+ if (getCountry() != null) {
if (getLanguage() == null) {
throw new NullPointerException(
"When country is specified, language must be specified.");
}
return COUNTRY_FORMSET;
}
- else if (getLanguage() != null) {
+ if (getLanguage() != null) {
return LANGUAGE_FORMSET;
}
- else {
- return GLOBAL_FORMSET;
- }
+ return GLOBAL_FORMSET;
}
/**
diff --git a/src/main/java/org/apache/commons/validator/ValidatorAction.java
b/src/main/java/org/apache/commons/validator/ValidatorAction.java
index 90f9290..4ce1565 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorAction.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorAction.java
@@ -558,7 +558,8 @@ public class ValidatorAction implements Serializable {
if (e.getTargetException() instanceof Exception) {
throw (Exception) e.getTargetException();
- } else if (e.getTargetException() instanceof Error) {
+ }
+ if (e.getTargetException() instanceof Error) {
throw (Error) e.getTargetException();
}
}
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 6f80207..7567a64 100644
---
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
@@ -157,7 +157,8 @@ public abstract class AbstractCalendarValidator extends
AbstractFormatValidator
protected String format(Object value, Format formatter) {
if (value == null) {
return null;
- } else if (value instanceof Calendar) {
+ }
+ if (value instanceof Calendar) {
value = ((Calendar)value).getTime();
}
return formatter.format(value);
@@ -373,11 +374,11 @@ public abstract class AbstractCalendarValidator extends
AbstractFormatValidator
int compareQuarter = calculateQuarter(compare, monthOfFirstQuarter);
if (valueQuarter < compareQuarter) {
return -1;
- } else if (valueQuarter > compareQuarter) {
+ }
+ if (valueQuarter > compareQuarter) {
return 1;
- } else {
- return 0;
}
+ return 0;
}
/**
@@ -418,10 +419,10 @@ public abstract class AbstractCalendarValidator extends
AbstractFormatValidator
int difference = value.get(field) - compare.get(field);
if (difference < 0) {
return -1;
- } else if (difference > 0) {
+ }
+ if (difference > 0) {
return 1;
- } else {
- return 0;
}
+ return 0;
}
}
diff --git
a/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
b/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
index 26ec185..1dee040 100644
--- a/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/EmailValidator.java
@@ -99,19 +99,16 @@ public class EmailValidator implements Serializable {
* @return singleton instance of this validator
*/
public static EmailValidator getInstance(boolean allowLocal, boolean
allowTld) {
- if(allowLocal) {
+ if (allowLocal) {
if (allowTld) {
return EMAIL_VALIDATOR_WITH_LOCAL_WITH_TLD;
- } else {
- return EMAIL_VALIDATOR_WITH_LOCAL;
- }
- } else {
- if (allowTld) {
- return EMAIL_VALIDATOR_WITH_TLD;
- } else {
- return EMAIL_VALIDATOR;
}
+ return EMAIL_VALIDATOR_WITH_LOCAL;
+ }
+ if (allowTld) {
+ return EMAIL_VALIDATOR_WITH_TLD;
}
+ return EMAIL_VALIDATOR;
}
/**
@@ -138,12 +135,11 @@ public class EmailValidator implements Serializable {
this.allowTld = allowTld;
if (domainValidator == null) {
throw new IllegalArgumentException("DomainValidator cannot be
null");
- } else {
- if (domainValidator.isAllowLocal() != allowLocal) {
- throw new IllegalArgumentException("DomainValidator must agree
with allowLocal setting");
- }
- this.domainValidator = domainValidator;
}
+ if (domainValidator.isAllowLocal() != allowLocal) {
+ throw new IllegalArgumentException("DomainValidator must agree
with allowLocal setting");
+ }
+ this.domainValidator = domainValidator;
}
/**
@@ -217,9 +213,8 @@ public class EmailValidator implements Serializable {
// Domain is symbolic name
if (allowTld) {
return domainValidator.isValid(domain) || (!domain.startsWith(".")
&& domainValidator.isValidTld(domain));
- } else {
- return domainValidator.isValid(domain);
}
+ return domainValidator.isValid(domain);
}
/**
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 8150b9a..357386d 100644
---
a/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
@@ -135,20 +135,19 @@ public class InetAddressValidator implements Serializable
{
return false; // can only have one prefix specifier
}
if (parts.length == 2) {
- if (parts[1].matches("\\d{1,3}")) { // Need to eliminate signs
- int bits = Integer.parseInt(parts[1]); // cannot fail because
of RE check
- if (bits < 0 || bits > MAX_BYTE) {
- return false; // out of range
- }
- } else {
+ if (!parts[1].matches("\\d{1,3}")) {
return false; // not a valid number
}
+ int bits = Integer.parseInt(parts[1]); // cannot fail because of
RE check
+ if (bits < 0 || bits > MAX_BYTE) {
+ return false; // out of range
+ }
}
// remove zone-id
parts = parts[0].split("%", -1);
if (parts.length > 2) {
return false;
- } else
+ }
// The id syntax is implementation independent, but it presumably
cannot allow:
// whitespace, '/' or '%'
if ((parts.length == 2) && !parts[1].matches("[^\\s/%]+")) {
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 e8787b2..cb138b5 100644
--- a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
@@ -317,13 +317,13 @@ public class UrlValidator implements Serializable {
String authority = uri.getRawAuthority();
if ("file".equals(scheme) && (authority == null ||
"".equals(authority))) {// Special case - file: allows an empty authority
return true; // this is a local file - nothing more to do here
- } else if ("file".equals(scheme) && authority != null &&
authority.contains(":")) {
+ }
+ if ("file".equals(scheme) && authority != null &&
authority.contains(":")) {
+ return false;
+ }
+ // Validate the authority
+ if (!isValidAuthority(authority)) {
return false;
- } else {
- // Validate the authority
- if (!isValidAuthority(authority)) {
- return false;
- }
}
if (!isValidPath(uri.getRawPath())) {
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 d6bbb38..3775c1a 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
@@ -67,13 +67,14 @@ public final class ISBNCheckDigit implements CheckDigit,
Serializable {
public String calculate(String code) throws CheckDigitException {
if (code == null || code.isEmpty()) {
throw new CheckDigitException("ISBN Code is missing");
- } else if (code.length() == 9) { // CHECKSTYLE IGNORE MagicNumber
+ }
+ if (code.length() == 9) { // CHECKSTYLE IGNORE MagicNumber
return ISBN10_CHECK_DIGIT.calculate(code);
- } else if (code.length() == 12) { // CHECKSTYLE IGNORE MagicNumber
+ }
+ if (code.length() == 12) { // CHECKSTYLE IGNORE MagicNumber
return ISBN13_CHECK_DIGIT.calculate(code);
- } else {
- throw new CheckDigitException("Invalid ISBN Length = " +
code.length());
}
+ throw new CheckDigitException("Invalid ISBN Length = " +
code.length());
}
/**
@@ -94,13 +95,14 @@ public final class ISBNCheckDigit implements CheckDigit,
Serializable {
public boolean isValid(String code) {
if (code == null) {
return false;
- } else if (code.length() == 10) { // CHECKSTYLE IGNORE MagicNumber
+ }
+ if (code.length() == 10) { // CHECKSTYLE IGNORE MagicNumber
return ISBN10_CHECK_DIGIT.isValid(code);
- } else if (code.length() == 13) { // CHECKSTYLE IGNORE MagicNumber
+ }
+ if (code.length() == 13) { // CHECKSTYLE IGNORE MagicNumber
return ISBN13_CHECK_DIGIT.isValid(code);
- } else {
- return false;
}
+ return false;
}
}
diff --git
a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
index da92df1..d063250 100644
--- a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
+++ b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
@@ -115,12 +115,12 @@ public class ValidatorUtils {
if (value instanceof String[]) {
return ((String[]) value).length > 0 ? value.toString() : "";
- } else if (value instanceof Collection) {
+ }
+ if (value instanceof Collection) {
return ((Collection<?>) value).isEmpty() ? "" : value.toString();
- } else {
- return value.toString();
}
+ return value.toString();
}
diff --git
a/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
b/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
index 736493f..358a131 100644
--- a/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
+++ b/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
@@ -48,12 +48,12 @@ public class GenericValidatorImpl {
if ("RUNTIME".equals(value)) {
throw new RuntimeException("RUNTIME-EXCEPTION");
- } else if ("CHECKED".equals(value)) {
+ }
+ if ("CHECKED".equals(value)) {
throw new Exception("CHECKED-EXCEPTION");
- } else {
- throw new ValidatorException("VALIDATOR-EXCEPTION");
}
+ throw new ValidatorException("VALIDATOR-EXCEPTION");
}
/**
@@ -257,9 +257,8 @@ public class GenericValidatorImpl {
if (required) {
if ((value != null) && (!value.isEmpty())) {
return true;
- } else {
- return false;
}
+ return false;
}
return true;
}
diff --git a/src/test/java/org/apache/commons/validator/ValidatorTest.java
b/src/test/java/org/apache/commons/validator/ValidatorTest.java
index eddc1a5..679dcd9 100644
--- a/src/test/java/org/apache/commons/validator/ValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/ValidatorTest.java
@@ -226,17 +226,15 @@ public class ValidatorTest extends TestCase {
public static boolean isCapLetter(Object bean, Field field, List<String> l)
{
String value = ValidatorUtils.getValueAsString(bean,
field.getProperty());
- if (value != null && value.length() == 1) {
- if (value.charAt(0) >= 'A' && value.charAt(0) <= 'Z') {
- return true;
- } else {
- l.add("Error");
- return false;
- }
- } else {
+ if ((value == null) || (value.length() != 1)) {
l.add("Error");
return false;
}
+ if (value.charAt(0) >= 'A' && value.charAt(0) <= 'Z') {
+ return true;
+ }
+ l.add("Error");
+ return false;
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
index 5a74cef..6ec6e9b 100644
---
a/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
@@ -342,12 +342,11 @@ public class DomainValidatorTest extends TestCase {
String line;
final String header;
line = br.readLine(); // header
- if (line.startsWith("# Version ")) {
- header = line.substring(2);
- } else {
+ if (!line.startsWith("# Version ")) {
br.close();
throw new IOException("File does not have expected Version
header");
}
+ header = line.substring(2);
final boolean generateUnicodeTlds = false; // Change this to generate
Unicode TLDs as well
// Parse html page to get entries
diff --git
a/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
index 995f30c..4cea213 100644
--- a/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
@@ -325,37 +325,36 @@ public class IBANValidatorTest {
private static String fmtRE(String iban_pat, int iban_len) {
Matcher m = IBAN_PAT.matcher(iban_pat);
- if (m.matches()) {
- StringBuilder sb = new StringBuilder();
- String cc = m.group(1); // country code
- int totalLen = cc.length();
- sb.append(cc);
- int len = Integer.parseInt(m.group(2)); // length of part
- String curType = m.group(3); // part type
- for (int i = 4; i <= m.groupCount(); i += 2) {
- if (m.group(i) == null) { // reached an optional group
- break;
- }
- int count = Integer.parseInt(m.group(i));
- String type = m.group(i+1);
- if (type.equals(curType)) { // more of the same type
- len += count;
- } else {
- sb.append(formatToRE(curType,len));
- totalLen += len;
- curType = type;
- len = count;
- }
+ if (!m.matches()) {
+ throw new IllegalArgumentException("Unexpected IBAN pattern " +
iban_pat);
+ }
+ StringBuilder sb = new StringBuilder();
+ String cc = m.group(1); // country code
+ int totalLen = cc.length();
+ sb.append(cc);
+ int len = Integer.parseInt(m.group(2)); // length of part
+ String curType = m.group(3); // part type
+ for (int i = 4; i <= m.groupCount(); i += 2) {
+ if (m.group(i) == null) { // reached an optional group
+ break;
}
- sb.append(formatToRE(curType,len));
- totalLen += len;
- if (iban_len != totalLen) {
- throw new IllegalArgumentException("IBAN pattern " + iban_pat
+ " does not match length " + iban_len);
+ int count = Integer.parseInt(m.group(i));
+ String type = m.group(i+1);
+ if (type.equals(curType)) { // more of the same type
+ len += count;
+ } else {
+ sb.append(formatToRE(curType,len));
+ totalLen += len;
+ curType = type;
+ len = count;
}
- return sb.toString();
- } else {
- throw new IllegalArgumentException("Unexpected IBAN pattern " +
iban_pat);
}
+ sb.append(formatToRE(curType,len));
+ totalLen += len;
+ if (iban_len != totalLen) {
+ throw new IllegalArgumentException("IBAN pattern " + iban_pat + "
does not match length " + iban_len);
+ }
+ return sb.toString();
}
public static void main(String [] a) throws Exception {
diff --git
a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
index 2be2392..ac058a3 100644
---
a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
@@ -276,9 +276,8 @@ public class RegexValidatorTest extends TestCase {
if (expect == null || result == null) {
if (expect == null && result == null) {
return; // valid, both null
- } else {
- fail(label + " Null expect=" + expect + " result=" + result);
}
+ fail(label + " Null expect=" + expect + " result=" + result);
return; // not strictly necessary, but prevents possible NPE below
}
