Author: adityasharma
Date: Mon Dec 31 12:54:38 2018
New Revision: 1850043
URL: http://svn.apache.org/viewvc?rev=1850043&view=rev
Log:
Improved: Refactor boolean returns for UtilValidate methods
(OFBIZ-10728)
Improved boolean returns with single statement, replacing if blocks with
explicit boolean return.
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java?rev=1850043&r1=1850042&r2=1850043&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
Mon Dec 31 12:54:38 2018
@@ -383,11 +383,7 @@ public final class UtilValidate {
try {
long temp = Long.parseLong(s);
-
- if (temp > 0) {
- return true;
- }
- return false;
+ return temp > 0;
} catch (Exception e) {
return false;
}
@@ -403,11 +399,7 @@ public final class UtilValidate {
try {
int temp = Integer.parseInt(s);
-
- if (temp >= 0) {
- return true;
- }
- return false;
+ return temp >= 0;
} catch (Exception e) {
return false;
}
@@ -423,11 +415,7 @@ public final class UtilValidate {
try {
int temp = Integer.parseInt(s);
-
- if (temp < 0) {
- return true;
- }
- return false;
+ return temp < 0;
} catch (Exception e) {
return false;
}
@@ -443,11 +431,7 @@ public final class UtilValidate {
try {
int temp = Integer.parseInt(s);
-
- if (temp <= 0) {
- return true;
- }
- return false;
+ return temp <= 0;
} catch (Exception e) {
return false;
}
@@ -504,28 +488,16 @@ public final class UtilValidate {
try {
float temp = Float.parseFloat(s);
- if (!allowNegative && temp < 0) {
- return false;
- }
- if (!allowPositive && temp > 0) {
+ if ((!allowNegative && temp < 0) || (!allowPositive && temp > 0)) {
return false;
}
int decimalPoint = s.indexOf(".");
if (decimalPoint == -1) {
- if (minDecimal > 0) {
- return false;
- }
- return true;
+ return !(minDecimal > 0);
}
// 1.2345; length=6; point=1; num=4
int numDecimals = s.length() - decimalPoint - 1;
- if (minDecimal >= 0 && numDecimals < minDecimal) {
- return false;
- }
- if (maxDecimal >= 0 && numDecimals > maxDecimal) {
- return false;
- }
- return true;
+ return !(minDecimal >= 0 && numDecimals < minDecimal) &&
!(maxDecimal >= 0 && numDecimals > maxDecimal);
} catch (Exception e) {
return false;
}
@@ -540,28 +512,16 @@ public final class UtilValidate {
try {
double temp = Double.parseDouble(s);
- if (!allowNegative && temp < 0) {
- return false;
- }
- if (!allowPositive && temp > 0) {
+ if ((!allowNegative && temp < 0) || (!allowPositive && temp > 0)) {
return false;
}
int decimalPoint = s.indexOf(".");
if (decimalPoint == -1) {
- if (minDecimal > 0) {
- return false;
- }
- return true;
+ return !(minDecimal > 0);
}
// 1.2345; length=6; point=1; num=4
int numDecimals = s.length() - decimalPoint - 1;
- if (minDecimal >= 0 && numDecimals < minDecimal) {
- return false;
- }
- if (maxDecimal >= 0 && numDecimals > maxDecimal) {
- return false;
- }
- return true;
+ return !(minDecimal >= 0 && numDecimals < minDecimal) &&
!(maxDecimal >= 0 && numDecimals > maxDecimal);
} catch (Exception e) {
return false;
}
@@ -748,10 +708,7 @@ public final class UtilValidate {
if (isEmpty(s)) {
return defaultEmptyOK;
}
- if (s.indexOf("://") != -1) {
- return true;
- }
- return false;
+ return s.indexOf("://") != -1;
}
/** isYear returns true if string s is a valid
@@ -764,11 +721,7 @@ public final class UtilValidate {
if (isEmpty(s)) {
return defaultEmptyOK;
}
-
- if (!isNonnegativeInteger(s)) {
- return false;
- }
- return ((s.length() == 2) || (s.length() == 4));
+ return isNonnegativeInteger(s) && ((s.length() == 2) || (s.length() ==
4));
}
/** isIntegerInRange returns true if string s is an integer
@@ -850,14 +803,8 @@ public final class UtilValidate {
int intMonth = Integer.parseInt(month);
int intDay = Integer.parseInt(day);
- // catch invalid days, except for February
- if (intDay > daysInMonth[intMonth - 1]) {
- return false;
- }
- if ((intMonth == 2) && (intDay > daysInFebruary(intYear))) {
- return false;
- }
- return true;
+ // catch invalid days, except for February, so intDay >
daysInMonth[intMonth - 1]
+ return !(intDay > daysInMonth[intMonth - 1]) && !((intMonth == 2) &&
(intDay > daysInFebruary(intYear)));
}
/** isDate returns true if string argument date forms a valid date. */
@@ -999,10 +946,7 @@ public final class UtilValidate {
/** isTime returns true if string arguments hour, minute, and second form
a valid time. */
public static boolean isTime(String hour, String minute, String second) {
// catch invalid years(not 2- or 4-digit) and invalid months and days.
- if (isHour(hour) && isMinute(minute) && isSecond(second)) {
- return true;
- }
- return false;
+ return isHour(hour) && isMinute(minute) && isSecond(second);
}
/** isTime returns true if string argument time forms a valid time. */
@@ -1058,10 +1002,7 @@ public final class UtilValidate {
return defaultEmptyOK;
}
String st = stripCharsInBag(stPassed, creditCardDelimiters);
- if (st.length() == 15 && sumIsMod10(getLuhnSum(st))) {
- return true;
- }
- return false;
+ return st.length() == 15 && sumIsMod10(getLuhnSum(st));
}
/** Check to see if a card number is a supported Gift Card
@@ -1114,15 +1055,8 @@ public final class UtilValidate {
}
String st = stripCharsInBag(stPassed, creditCardDelimiters);
- if (!isInteger(st)) {
- return false;
- }
-
- // encoding only works on cars with less the 19 digits
- if (st.length() > 19) {
- return false;
- }
- return sumIsMod10(getLuhnSum(st));
+ // encoding only works on cars with less the 19 digits, so st.length()
> 19
+ return isInteger(st) && !(st.length() > 19) &&
sumIsMod10(getLuhnSum(st));
}
/** Checks to see if the cc number is a valid Visa number
@@ -1298,15 +1232,8 @@ public final class UtilValidate {
}
String cc = stripCharsInBag(ccPassed, creditCardDelimiters);
-
- if (!isCreditCard(cc)) {
- return false;
- }
- if (isMasterCard(cc) || isVisa(cc) || isAmericanExpress(cc) ||
isDinersClub(cc) ||
- isDiscover(cc) || isEnRoute(cc) || isJCB(cc) || isSolo(cc)||
isSwitch (cc)|| isVisaElectron(cc)) {
- return true;
- }
- return false;
+ return isCreditCard(cc) && (isMasterCard(cc) || isVisa(cc) ||
isAmericanExpress(cc) || isDinersClub(cc) ||
+ isDiscover(cc) || isEnRoute(cc) || isJCB(cc) ||
isSolo(cc)|| isSwitch (cc)|| isVisaElectron(cc));
}
/** Checks to see if the cc number is a valid number for any accepted
credit card, and return the name of that type
@@ -1362,10 +1289,7 @@ public final class UtilValidate {
* @return true, if the credit card number is valid for the particular
credit card type given in "cardType", false otherwise
*/
public static boolean isCardMatch(String cardType, String
cardNumberPassed) {
- if (isEmpty(cardType)) {
- return defaultEmptyOK;
- }
- if (isEmpty(cardNumberPassed)) {
+ if (isEmpty(cardType) || isEmpty(cardNumberPassed)) {
return defaultEmptyOK;
}
String cardNumber = stripCharsInBag(cardNumberPassed,
creditCardDelimiters);
