replaces primitive comparison with x.compare() where x is a wrapper class of the primitive
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/ae6a24dd Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/ae6a24dd Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/ae6a24dd Branch: refs/heads/master Commit: ae6a24dd439a7b778e35b484a3a6eae1a8eb64d7 Parents: 4aa4291 Author: Igor Curdvanovschi <ingvar....@gmail.com> Authored: Mon Jun 25 22:17:41 2018 +0200 Committer: Igor Curdvanovschi <ingvar....@gmail.com> Committed: Mon Jun 25 22:26:08 2018 +0200 ---------------------------------------------------------------------- .../apache/commons/lang3/builder/CompareToBuilder.java | 10 +++++----- .../commons/lang3/builder/CompareToBuilderTest.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/ae6a24dd/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 688e951..7d3b392 100644 --- a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java @@ -475,7 +475,7 @@ public class CompareToBuilder implements Builder<Integer> { if (comparison != 0) { return this; } - comparison = lhs < rhs ? -1 : lhs > rhs ? 1 : 0; + comparison = Long.compare(lhs, rhs); return this; } @@ -491,7 +491,7 @@ public class CompareToBuilder implements Builder<Integer> { if (comparison != 0) { return this; } - comparison = lhs < rhs ? -1 : lhs > rhs ? 1 : 0; + comparison = Integer.compare(lhs, rhs); return this; } @@ -507,7 +507,7 @@ public class CompareToBuilder implements Builder<Integer> { if (comparison != 0) { return this; } - comparison = lhs < rhs ? -1 : lhs > rhs ? 1 : 0; + comparison = Short.compare(lhs, rhs); return this; } @@ -523,7 +523,7 @@ public class CompareToBuilder implements Builder<Integer> { if (comparison != 0) { return this; } - comparison = lhs < rhs ? -1 : lhs > rhs ? 1 : 0; + comparison = Character.compare(lhs, rhs); return this; } @@ -539,7 +539,7 @@ public class CompareToBuilder implements Builder<Integer> { if (comparison != 0) { return this; } - comparison = lhs < rhs ? -1 : lhs > rhs ? 1 : 0; + comparison = Byte.compare(lhs, rhs); return this; } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/ae6a24dd/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java index 350b567..80ded8a 100644 --- a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java +++ b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java @@ -61,7 +61,7 @@ public class CompareToBuilderTest { } @Override public int compareTo(final TestObject rhs) { - return a < rhs.a ? -1 : a > rhs.a ? +1 : 0; + return Integer.compare(a, rhs.a); } }
