Skip to content

Commit

Permalink
No need to nest in else.
Browse files Browse the repository at this point in the history
  • Loading branch information
@garydgregory
garydgregory committed Mar 5, 2021
1 parent a2b2b35 commit 6b9964f
Show file tree
Hide file tree
Showing 24 changed files with 283 additions and 223 deletions.
135 changes: 90 additions & 45 deletions src/main/java/org/apache/commons/lang3/ArrayUtils.java
View file

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions src/main/java/org/apache/commons/lang3/BooleanUtils.java
View file
Expand Up @@ -466,12 +466,15 @@ public static boolean toBoolean(final String str) {
public static boolean toBoolean(final String str, final String trueString, final String falseString) {
if (str == trueString) {
return true;
} else if (str == falseString) {
}
if (str == falseString) {
return false;
} else if (str != null) {
}
if (str != null) {
if (str.equals(trueString)) {
return true;
} else if (str.equals(falseString)) {
}
if (str.equals(falseString)) {
return false;
}
}
Expand Down
18 changes: 12 additions & 6 deletions src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
View file
Expand Up @@ -52,9 +52,11 @@ private static boolean checkLaterThan1(final CharSequence cs, final CharSequence
static int indexOf(final CharSequence cs, final CharSequence searchChar, final int start) {
if (cs instanceof String) {
return ((String) cs).indexOf(searchChar.toString(), start);
} else if (cs instanceof StringBuilder) {
}
if (cs instanceof StringBuilder) {
return ((StringBuilder) cs).indexOf(searchChar.toString(), start);
} else if (cs instanceof StringBuffer) {
}
if (cs instanceof StringBuffer) {
return ((StringBuffer) cs).indexOf(searchChar.toString(), start);
}
return cs.toString().indexOf(searchChar.toString(), start);
Expand Down Expand Up @@ -152,9 +154,11 @@ static int lastIndexOf(final CharSequence cs, final CharSequence searchChar, int
if (searchChar instanceof String) {
if (cs instanceof String) {
return ((String) cs).lastIndexOf((String) searchChar, start);
} else if (cs instanceof StringBuilder) {
}
if (cs instanceof StringBuilder) {
return ((StringBuilder) cs).lastIndexOf((String) searchChar, start);
} else if (cs instanceof StringBuffer) {
}
if (cs instanceof StringBuffer) {
return ((StringBuffer) cs).lastIndexOf((String) searchChar, start);
}
}
Expand All @@ -177,9 +181,11 @@ static int lastIndexOf(final CharSequence cs, final CharSequence searchChar, int
if (len2 <= TO_STRING_LIMIT) {
if (cs instanceof String) {
return ((String) cs).lastIndexOf(searchChar.toString(), start);
} else if (cs instanceof StringBuilder) {
}
if (cs instanceof StringBuilder) {
return ((StringBuilder) cs).lastIndexOf(searchChar.toString(), start);
} else if (cs instanceof StringBuffer) {
}
if (cs instanceof StringBuffer) {
return ((StringBuffer) cs).lastIndexOf(searchChar.toString(), start);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/apache/commons/lang3/ClassUtils.java
View file
Expand Up @@ -1228,7 +1228,8 @@ private static String toCanonicalName(String className) {
public static Class<?>[] toClass(final Object... array) {
if (array == null) {
return null;
} else if (array.length == 0) {
}
if (array.length == 0) {
return ArrayUtils.EMPTY_CLASS_ARRAY;
}
final Class<?>[] classes = new Class[array.length];
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/apache/commons/lang3/Functions.java
View file
Expand Up @@ -523,13 +523,14 @@ public static RuntimeException rethrow(final Throwable throwable) {
Objects.requireNonNull(throwable, "throwable");
if (throwable instanceof RuntimeException) {
throw (RuntimeException) throwable;
} else if (throwable instanceof Error) {
}
if (throwable instanceof Error) {
throw (Error) throwable;
} else if (throwable instanceof IOException) {
}
if (throwable instanceof IOException) {
throw new UncheckedIOException((IOException) throwable);
} else {
throw new UndeclaredThrowableException(throwable);
}
throw new UndeclaredThrowableException(throwable);
}

/**
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/apache/commons/lang3/JavaVersion.java
View file
Expand Up @@ -311,14 +311,13 @@ private static float maxVersion() {
*/
private static float toFloatVersion(final String value) {
final int defaultReturnValue = -1;
if (value.contains(".")) {
final String[] toParse = value.split("\\.");
if (toParse.length >= 2) {
return NumberUtils.toFloat(toParse[0] + '.' + toParse[1], defaultReturnValue);
}
} else {
if (!value.contains(".")) {
return NumberUtils.toFloat(value, defaultReturnValue);
}
final String[] toParse = value.split("\\.");
if (toParse.length >= 2) {
return NumberUtils.toFloat(toParse[0] + '.' + toParse[1], defaultReturnValue);
}
return defaultReturnValue;
}
}
6 changes: 4 additions & 2 deletions src/main/java/org/apache/commons/lang3/ObjectUtils.java
View file
Expand Up @@ -329,9 +329,11 @@ public static <T extends Comparable<? super T>> int compare(final T c1, final T
public static <T extends Comparable<? super T>> int compare(final T c1, final T c2, final boolean nullGreater) {
if (c1 == c2) {
return 0;
} else if (c1 == null) {
}
if (c1 == null) {
return nullGreater ? 1 : -1;
} else if (c2 == null) {
}
if (c2 == null) {
return nullGreater ? -1 : 1;
}
return c1.compareTo(c2);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/apache/commons/lang3/RandomStringUtils.java
View file
Expand Up @@ -362,7 +362,8 @@ public static String random(int count, int start, int end, final boolean letters
final char[] chars, final Random random) {
if (count == 0) {
return StringUtils.EMPTY;
} else if (count < 0) {
}
if (count < 0) {
throw new IllegalArgumentException("Requested random string length " + count + " is less than 0.");
}
if (chars != null && chars.length == 0) {
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/org/apache/commons/lang3/Range.java
View file
Expand Up @@ -226,11 +226,11 @@ public int elementCompareTo(final T element) {
Validate.notNull(element, "element");
if (isAfter(element)) {
return -1;
} else if (isBefore(element)) {
}
if (isBefore(element)) {
return 1;
} else {
return 0;
}
return 0;
}

// Element tests
Expand All @@ -249,15 +249,15 @@ public int elementCompareTo(final T element) {
public boolean equals(final Object obj) {
if (obj == this) {
return true;
} else if (obj == null || obj.getClass() != getClass()) {
}
if (obj == null || obj.getClass() != getClass()) {
return false;
} else {
@SuppressWarnings("unchecked") // OK because we checked the class above
final
Range<T> range = (Range<T>) obj;
return minimum.equals(range.minimum) &&
maximum.equals(range.maximum);
}
@SuppressWarnings("unchecked") // OK because we checked the class above
final
Range<T> range = (Range<T>) obj;
return minimum.equals(range.minimum) &&
maximum.equals(range.maximum);
}

/**
Expand Down Expand Up @@ -471,11 +471,11 @@ public T fit(final T element) {
Validate.notNull(element, "element");
if (isAfter(element)) {
return minimum;
} else if (isBefore(element)) {
}
if (isBefore(element)) {
return maximum;
} else {
return element;
}
return element;
}

/**
Expand Down

0 comments on commit 6b9964f

Please sign in to comment.