This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 9e8bf567e48cc647f35ccb7d24e4bc078784cc3c Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Sat Sep 6 07:56:30 2025 -0700 Deprecate NumberUtils.compare(short, short) in favor of Short.compare(short, short) --- src/changes/changes.xml | 1 + src/main/java/org/apache/commons/lang3/ArrayUtils.java | 3 +-- src/main/java/org/apache/commons/lang3/math/NumberUtils.java | 7 +++---- src/main/java/org/apache/commons/lang3/mutable/MutableShort.java | 4 +--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index bf886ce19..fa1aab0f4 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -64,6 +64,7 @@ The <action> type attribute can be add,update,fix,remove. <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate NumberUtils.compare(byte, byte) in favor of Byte.compare(byte, byte).</action> <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate NumberUtils.compare(int, int) in favor of Integer.compare(int, int).</action> <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate NumberUtils.compare(long, long) in favor of Long.compare(long, long).</action> + <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate NumberUtils.compare(short, short) in favor of Short.compare(short, short).</action> <!-- FIX Javadoc --> <action type="fix" dev="ggregory" due-to="Gary Gregory">[javadoc] General improvements.</action> <action type="fix" dev="ggregory" due-to="Gary Gregory">[javadoc] Fix thrown exception documentation for org.apache.commons.lang3.reflect.MethodUtils.getMethodObject(Class<?>, String, Class<?>...).</action> diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java index 5923a9804..1566e37d3 100644 --- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java +++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java @@ -39,7 +39,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.function.FailableFunction; -import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.stream.IntStreams; import org.apache.commons.lang3.stream.Streams; @@ -3760,7 +3759,7 @@ public static boolean isSorted(final short[] array) { final int n = array.length; for (int i = 1; i < n; i++) { final short current = array[i]; - if (NumberUtils.compare(previous, current) > 0) { + if (Short.compare(previous, current) > 0) { return false; } previous = current; diff --git a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java index a9504f0b0..aaa836fff 100644 --- a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java +++ b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java @@ -143,12 +143,11 @@ public static int compare(final long x, final long y) { * a value less than {@code 0} if {@code x < y}; and * a value greater than {@code 0} if {@code x > y} * @since 3.4 + * @deprecated Use {@link Short#compare(short, short)}. */ + @Deprecated public static int compare(final short x, final short y) { - if (x == y) { - return 0; - } - return x < y ? -1 : 1; + return Short.compare(x, y); } /** diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java index f2765b368..b2cdc51f2 100644 --- a/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java +++ b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java @@ -16,8 +16,6 @@ */ package org.apache.commons.lang3.mutable; -import org.apache.commons.lang3.math.NumberUtils; - /** * A mutable {@code short} wrapper. * <p> @@ -131,7 +129,7 @@ public short addAndGet(final short operand) { */ @Override public int compareTo(final MutableShort other) { - return NumberUtils.compare(this.value, other.value); + return Short.compare(this.value, other.value); } /**