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
The following commit(s) were added to refs/heads/master by this push:
new b8286523d Sort members
b8286523d is described below
commit b8286523defe897679c18a3e85be227e9ec2956a
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Jan 22 08:10:34 2026 -0500
Sort members
---
.../org/apache/commons/lang3/time/TimeZones.java | 18 +++++-----
.../org/apache/commons/lang3/ArrayUtilsTest.java | 12 +++----
.../commons/lang3/reflect/TypeUtilsTest.java | 38 +++++++++++-----------
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/time/TimeZones.java
b/src/main/java/org/apache/commons/lang3/time/TimeZones.java
index db498bcc8..953006e5e 100644
--- a/src/main/java/org/apache/commons/lang3/time/TimeZones.java
+++ b/src/main/java/org/apache/commons/lang3/time/TimeZones.java
@@ -47,6 +47,15 @@ public class TimeZones {
private static final boolean JAVA_25 =
SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_25);
+ /**
+ * The sorted available IDs.
+ * <p>
+ * Make a defensive copy, just in case.
+ * </p>
+ * @see TimeZone#getAvailableIDs()
+ */
+ static final String[] SORTED_AVAILABLE_IDS =
ArraySorter.sort(TimeZone.getAvailableIDs().clone());
+
/**
* Delegates to {@link TimeZone#getTimeZone(String)}, on Java 25 and up,
maps an ID if it's a key in {@link ZoneId#SHORT_IDS}.
* <p>
@@ -83,15 +92,6 @@ public static TimeZone toTimeZone(final TimeZone timeZone) {
return ObjectUtils.getIfNull(timeZone, TimeZone::getDefault);
}
- /**
- * The sorted available IDs.
- * <p>
- * Make a defensive copy, just in case.
- * </p>
- * @see TimeZone#getAvailableIDs()
- */
- static final String[] SORTED_AVAILABLE_IDS =
ArraySorter.sort(TimeZone.getAvailableIDs().clone());
-
/** Do not instantiate. */
private TimeZones() {
}
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index 18dc5f377..fa06f61f4 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -1970,6 +1970,12 @@ void testLastIndexOfWithStartIndex() {
assertEquals(5, ArrayUtils.lastIndexOf(array, "0", 88));
}
+ @Test
+ void testMaxArrayLength() {
+ assertEquals(Integer.MAX_VALUE - 8, ArrayUtils.SAFE_MAX_ARRAY_LENGTH);
+ assertEquals(Integer.MAX_VALUE - 8, ArrayUtils.SOFT_MAX_ARRAY_LENGTH);
+ }
+
@Test
void testNullToEmptyBoolean() {
final boolean[] original = {true, false};
@@ -6958,10 +6964,4 @@ void testToStringDefault() {
assertEquals("{<null>}", ArrayUtils.toString(new String[]{null},
"<empty>"));
assertEquals("{pink,blue}", ArrayUtils.toString(new String[]{"pink",
"blue"}, "<empty>"));
}
-
- @Test
- void testMaxArrayLength() {
- assertEquals(Integer.MAX_VALUE - 8, ArrayUtils.SAFE_MAX_ARRAY_LENGTH);
- assertEquals(Integer.MAX_VALUE - 8, ArrayUtils.SOFT_MAX_ARRAY_LENGTH);
- }
}
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index ec62b70ff..488e57095 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -741,6 +741,25 @@ void testIsAssignable_ClassWithParameterizedType3() {
assertFalse(TypeUtils.isAssignable(from3, to3), "Class<TestImpl2>
should not be assignable to Class<? extends TestIF<Number>>");
}
+ @Test
+ public void testIsAssignable_HiddenMapLogic() {
+ class Container<T> {
+ }
+ class StringContainer extends Container<String> {
+ }
+ final Type stringContainerType =
StringContainer.class.getGenericSuperclass();
+ assertTrue(TypeUtils.isAssignable(StringContainer.class,
Container.class));
+ }
+
+ @Test
+ public void testIsAssignable_Type_TypeVariable_Map_Public() throws
Exception {
+ class Container<T> {
+ }
+ final TypeVariable<?> typeVarT =
Container.class.getTypeParameters()[0];
+ final boolean result = TypeUtils.isAssignable(Integer.class, typeVarT);
+ assertFalse(result);
+ }
+
@Test
void testIsAssignableClasses() {
assertTrue(TypeUtils.isAssignable(char.class, double.class));
@@ -1227,23 +1246,4 @@ void testWrap() {
assertEquals(String.class, TypeUtils.wrap(String.class).getType());
}
- @Test
- public void testIsAssignable_Type_TypeVariable_Map_Public() throws
Exception {
- class Container<T> {
- }
- final TypeVariable<?> typeVarT =
Container.class.getTypeParameters()[0];
- final boolean result = TypeUtils.isAssignable(Integer.class, typeVarT);
- assertFalse(result);
- }
-
- @Test
- public void testIsAssignable_HiddenMapLogic() {
- class Container<T> {
- }
- class StringContainer extends Container<String> {
- }
- final Type stringContainerType =
StringContainer.class.getGenericSuperclass();
- assertTrue(TypeUtils.isAssignable(StringContainer.class,
Container.class));
- }
-
}