Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PMD: Nested if statements can be combined

This commit is contained in:
Benedikt Ritter 2017-04-17 13:00:37 +02:00
parent fb4803623b
commit c82b1f062a
No known key found for this signature in database
GPG Key ID: 9DAADC1C9FCC82D0
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/apache/commons/lang3/RandomStringUtils.java
View File

@ -372,12 +372,10 @@ public class RandomStringUtils {
final int zero_digit_ascii = 48; final int zero_digit_ascii = 48;
final int first_letter_ascii = 65; final int first_letter_ascii = 65;
if (chars == null) { if (chars == null && (numbers && end <= zero_digit_ascii
if (numbers && end <= zero_digit_ascii || letters && end <= first_letter_ascii)) {
|| letters && end <= first_letter_ascii) { throw new IllegalArgumentException("Parameter end (" + end + ") must be greater then (" + zero_digit_ascii + ") for generating digits " +
throw new IllegalArgumentException("Parameter end (" + end + ") must be greater then (" + zero_digit_ascii + ") for generating digits " + "or greater then (" + first_letter_ascii + ") for generating letters.");
"or greater then (" + first_letter_ascii + ") for generating letters.");
}
} }
StringBuilder builder = new StringBuilder(count); StringBuilder builder = new StringBuilder(count);

6
src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
View File

@ -211,10 +211,8 @@ public class MethodUtils {
messagePrefix = "No such method: "; messagePrefix = "No such method: ";
method = getMatchingMethod(object.getClass(), method = getMatchingMethod(object.getClass(),
methodName, parameterTypes); methodName, parameterTypes);
if (method != null) { if (method != null && !method.isAccessible()) {
if (!method.isAccessible()) { method.setAccessible(true);
method.setAccessible(true);
}
} }
} else { } else {
messagePrefix = "No such accessible method: "; messagePrefix = "No such accessible method: ";