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 2014/12/29 16:28:01 UTC
svn commit: r1648368 - in
/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator:
./ routines/
Author: ggregory
Date: Mon Dec 29 15:28:01 2014
New Revision: 1648368
URL: http://svn.apache.org/r1648368
Log:
Statement unnecessarily nested within else clause.
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.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/ByteValidator.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/DoubleValidator.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/IntegerValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/LongValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ShortValidator.java
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java?rev=1648368&r1=1648367&r2=1648368&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java Mon Dec 29 15:28:01 2014
@@ -752,9 +752,8 @@ public class ValidatorAction implements
if (result instanceof Boolean) {
Boolean valid = (Boolean) result;
return valid.booleanValue();
- } else {
- return (result != null);
}
+ return (result != null);
}
/**
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=1648368&r1=1648367&r2=1648368&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 Mon Dec 29 15:28:01 2014
@@ -123,9 +123,8 @@ public abstract class AbstractNumberVali
public boolean minValue(Number value, Number min) {
if (isAllowFractions()) {
return (value.doubleValue() >= min.doubleValue());
- } else {
- return (value.longValue() >= min.longValue());
}
+ return (value.longValue() >= min.longValue());
}
/**
@@ -139,9 +138,8 @@ public abstract class AbstractNumberVali
public boolean maxValue(Number value, Number max) {
if (isAllowFractions()) {
return (value.doubleValue() <= max.doubleValue());
- } else {
- return (value.longValue() <= max.longValue());
}
+ return (value.longValue() <= max.longValue());
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ByteValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ByteValidator.java?rev=1648368&r1=1648367&r2=1648368&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ByteValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ByteValidator.java Mon Dec 29 15:28:01 2014
@@ -248,9 +248,8 @@ public class ByteValidator extends Abstr
if (longValue < Byte.MIN_VALUE ||
longValue > Byte.MAX_VALUE) {
return null;
- } else {
- return new Byte((byte)longValue);
}
+ return new Byte((byte)longValue);
}
}
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=1648368&r1=1648367&r2=1648368&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 Mon Dec 29 15:28:01 2014
@@ -132,9 +132,8 @@ public class DomainValidator implements
String[] groups = domainRegex.match(domain);
if (groups != null && groups.length > 0) {
return isValidTld(groups[0]);
- } else {
- return allowLocal && hostnameRegex.isValid(domain);
}
+ return allowLocal && hostnameRegex.isValid(domain);
}
/**
@@ -200,9 +199,8 @@ public class DomainValidator implements
private String chompLeadingDot(String str) {
if (str.startsWith(".")) {
return str.substring(1);
- } else {
- return str;
}
+ return str;
}
// ---------------------------------------------
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java?rev=1648368&r1=1648367&r2=1648368&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DoubleValidator.java Mon Dec 29 15:28:01 2014
@@ -244,9 +244,8 @@ public class DoubleValidator extends Abs
if (value instanceof Double) {
return value;
- } else {
- return new Double(((Number)value).doubleValue());
}
+ return new Double(((Number)value).doubleValue());
}
}
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=1648368&r1=1648367&r2=1648368&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 Mon Dec 29 15:28:01 2014
@@ -156,13 +156,12 @@ public class EmailValidator implements S
InetAddressValidator inetAddressValidator =
InetAddressValidator.getInstance();
return inetAddressValidator.isValid(ipDomainMatcher.group(1));
- } else {
- // Domain is symbolic name
- DomainValidator domainValidator =
- DomainValidator.getInstance(allowLocal);
- return domainValidator.isValid(domain) ||
- domainValidator.isValidTld(domain);
}
+ // Domain is symbolic name
+ DomainValidator domainValidator =
+ DomainValidator.getInstance(allowLocal);
+ return domainValidator.isValid(domain) ||
+ domainValidator.isValidTld(domain);
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java?rev=1648368&r1=1648367&r2=1648368&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IntegerValidator.java Mon Dec 29 15:28:01 2014
@@ -248,8 +248,7 @@ public class IntegerValidator extends Ab
if (longValue < Integer.MIN_VALUE ||
longValue > Integer.MAX_VALUE) {
return null;
- } else {
- return new Integer((int)longValue);
}
+ return new Integer((int)longValue);
}
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/LongValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/LongValidator.java?rev=1648368&r1=1648367&r2=1648368&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/LongValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/LongValidator.java Mon Dec 29 15:28:01 2014
@@ -243,9 +243,8 @@ public class LongValidator extends Abstr
if (value instanceof Long) {
return value;
- } else {
- return new Long(((Number)value).longValue());
}
+ return new Long(((Number)value).longValue());
}
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ShortValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ShortValidator.java?rev=1648368&r1=1648367&r2=1648368&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ShortValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/ShortValidator.java Mon Dec 29 15:28:01 2014
@@ -248,8 +248,7 @@ public class ShortValidator extends Abst
if (longValue < Short.MIN_VALUE ||
longValue > Short.MAX_VALUE) {
return null;
- } else {
- return new Short((short)longValue);
}
+ return new Short((short)longValue);
}
}