flips the order of conditional expressions and 'if' statements whose conditions were negated
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/77febcfa Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/77febcfa Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/77febcfa Branch: refs/heads/master Commit: 77febcfa8d3a5e078330c4911a94e399589734e5 Parents: b610707 Author: Igor Curdvanovschi <ingvar....@gmail.com> Authored: Wed Jun 20 14:45:54 2018 +0300 Committer: Igor Curdvanovschi <ingvar....@gmail.com> Committed: Mon Jun 25 21:21:02 2018 +0200 ---------------------------------------------------------------------- src/main/java/org/apache/commons/lang3/ArchUtils.java | 8 +++----- src/main/java/org/apache/commons/lang3/BitField.java | 2 +- src/main/java/org/apache/commons/lang3/ObjectUtils.java | 6 +++--- src/main/java/org/apache/commons/lang3/StringUtils.java | 10 +++++----- .../apache/commons/lang3/builder/CompareToBuilder.java | 6 +++--- .../org/apache/commons/lang3/builder/EqualsBuilder.java | 10 +++++----- .../lang3/concurrent/EventCountCircuitBreaker.java | 4 ++-- .../org/apache/commons/lang3/time/FastDateParser.java | 2 +- .../org/apache/commons/lang3/time/FastDatePrinter.java | 8 ++++---- 9 files changed, 27 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/ArchUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/ArchUtils.java b/src/main/java/org/apache/commons/lang3/ArchUtils.java index 05f2f8a..4b0d3ff 100644 --- a/src/main/java/org/apache/commons/lang3/ArchUtils.java +++ b/src/main/java/org/apache/commons/lang3/ArchUtils.java @@ -86,12 +86,10 @@ public class ArchUtils { * @throws IllegalStateException If the key already exists. */ private static void addProcessor(final String key, final Processor processor) { - if (!ARCH_TO_PROCESSOR.containsKey(key)) { - ARCH_TO_PROCESSOR.put(key, processor); - } else { - final String msg = "Key " + key + " already exists in processor map"; - throw new IllegalStateException(msg); + if (ARCH_TO_PROCESSOR.containsKey(key)) { + throw new IllegalStateException("Key " + key + " already exists in processor map"); } + ARCH_TO_PROCESSOR.put(key, processor); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/BitField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/BitField.java b/src/main/java/org/apache/commons/lang3/BitField.java index bc2147e..dc70df4 100644 --- a/src/main/java/org/apache/commons/lang3/BitField.java +++ b/src/main/java/org/apache/commons/lang3/BitField.java @@ -84,7 +84,7 @@ public class BitField { */ public BitField(final int mask) { _mask = mask; - _shift_count = mask != 0 ? Integer.numberOfTrailingZeros(mask) : 0; + _shift_count = mask == 0 ? 0 : Integer.numberOfTrailingZeros(mask); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/ObjectUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java b/src/main/java/org/apache/commons/lang3/ObjectUtils.java index c18e33b..c3b031e 100644 --- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java +++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java @@ -689,14 +689,14 @@ public class ObjectUtils { final Object result; if (obj.getClass().isArray()) { final Class<?> componentType = obj.getClass().getComponentType(); - if (!componentType.isPrimitive()) { - result = ((Object[]) obj).clone(); - } else { + if (componentType.isPrimitive()) { int length = Array.getLength(obj); result = Array.newInstance(componentType, length); while (length-- > 0) { Array.set(result, length, Array.get(obj, length)); } + } else { + result = ((Object[]) obj).clone(); } } else { try { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/StringUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index ff06e8c..1d7b9b9 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -8857,15 +8857,15 @@ public class StringUtils { for (int i = 0; i < size; i++) { final char actualChar = str.charAt(i); final boolean isWhitespace = Character.isWhitespace(actualChar); - if (!isWhitespace) { - startWhitespaces = false; - newChars[count++] = (actualChar == 160 ? 32 : actualChar); - whitespacesCount = 0; - } else { + if (isWhitespace) { if (whitespacesCount == 0 && !startWhitespaces) { newChars[count++] = SPACE.charAt(0); } whitespacesCount++; + } else { + startWhitespaces = false; + newChars[count++] = (actualChar == 160 ? 32 : actualChar); + whitespacesCount = 0; } } if (startWhitespaces) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java index 0884543..f4082a9 100644 --- a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java @@ -600,10 +600,10 @@ public class CompareToBuilder implements Builder<Integer> { if (lhs == rhs) { return this; } - if (!lhs) { - comparison = -1; - } else { + if (lhs) { comparison = +1; + } else { + comparison = -1; } return this; } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java index 22ad16c..2af57c3 100644 --- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java @@ -637,17 +637,17 @@ public class EqualsBuilder implements Builder<Boolean> { return this; } final Class<?> lhsClass = lhs.getClass(); - if (!lhsClass.isArray()) { + if (lhsClass.isArray()) { + // factor out array case in order to keep method small enough + // to be inlined + appendArray(lhs, rhs); + } else { // The simple case, not an array, just test the element if (testRecursive && !ClassUtils.isPrimitiveOrWrapper(lhsClass)) { reflectionAppend(lhs, rhs); } else { isEquals = lhs.equals(rhs); } - } else { - // factor out array case in order to keep method small enough - // to be inlined - appendArray(lhs, rhs); } return this; } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java index daac026..4a0a2e2 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java @@ -469,8 +469,8 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { * @return the updated instance */ public CheckIntervalData increment(final int delta) { - return (delta != 0) ? new CheckIntervalData(getEventCount() + delta, - getCheckIntervalStart()) : this; + return (delta == 0) ? this : new CheckIntervalData(getEventCount() + delta, + getCheckIntervalStart()); } } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/time/FastDateParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java index 6f31af3..05eeb47 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java @@ -958,7 +958,7 @@ public class FastDateParser implements DateParser, Serializable { private static final Strategy DAY_OF_WEEK_STRATEGY = new NumberStrategy(Calendar.DAY_OF_WEEK) { @Override int modify(final FastDateParser parser, final int iValue) { - return iValue != 7 ? iValue + 1 : Calendar.SUNDAY; + return iValue == 7 ? Calendar.SUNDAY : iValue + 1; } }; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/77febcfa/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java index df7af4e..eaf95e8 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java @@ -1266,7 +1266,7 @@ public class FastDatePrinter implements DatePrinter, Serializable { @Override public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException { final int value = calendar.get(Calendar.DAY_OF_WEEK); - mRule.appendTo(buffer, value != Calendar.SUNDAY ? value - 1 : 7); + mRule.appendTo(buffer, value == Calendar.SUNDAY ? 7 : value - 1); } @Override @@ -1369,10 +1369,10 @@ public class FastDatePrinter implements DatePrinter, Serializable { @Override public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException { final TimeZone zone = calendar.getTimeZone(); - if (calendar.get(Calendar.DST_OFFSET) != 0) { - buffer.append(getTimeZoneDisplay(zone, true, mStyle, mLocale)); - } else { + if (calendar.get(Calendar.DST_OFFSET) == 0) { buffer.append(getTimeZoneDisplay(zone, false, mStyle, mLocale)); + } else { + buffer.append(getTimeZoneDisplay(zone, true, mStyle, mLocale)); } } }