Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-lang.git

Author: garydgregory

.github/workflows/codeql-analysis.yml

@@ -57,7 +57,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885    # 3.29.5
+      uses: github/codeql-action/init@e296a935590eb16afc0c0108289f68c87e2a89a5    # 3.29.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885    # 3.29.5
+      uses: github/codeql-action/autobuild@e296a935590eb16afc0c0108289f68c87e2a89a5    # 3.29.5
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -82,4 +82,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885    # 3.29.5
+      uses: github/codeql-action/analyze@e296a935590eb16afc0c0108289f68c87e2a89a5    # 3.29.5

.github/workflows/scorecards-analysis.yml

@@ -64,6 +64,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885    # 3.29.5
+        uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5    # 3.29.5
         with:
           sarif_file: results.sarif

.gitignore

@@ -21,3 +21,4 @@ site-content
 
 # jenv's version file
 .java-version
+/.DS_Store

src/changes/changes.xml

@@ -50,7 +50,10 @@ The <action> type attribute can be add,update,fix,remove.
     <action                   type="fix" dev="ggregory" due-to="Marcono1234, Gary Gregory">[javadoc] Improve StringUtils Javadoc #1450.</action>
     <action                   type="fix" dev="ggregory" due-to="mayuming, Gary Gregory">Fix internal inverted logic in private isEnum() method and correct its usage in getFirstEnum() #1454.</action>
     <action                   type="fix" dev="ggregory" due-to="William Degrange, Gary Gregory, Rob Spoor">Use accessors in ToStringStyle so subclasses can effectively override them.</action>
-    <action                   type="fix" dev="ggregory" due-to="aaaaaa, Gary Gregory">`LocaleUtils.toLocale(String)` for a 2 letter country code now returns a value instead of throwing an `IllegalArgumentException`.</action>
+    <action                   type="fix" dev="ggregory" due-to="jack5505, Gary Gregory">`LocaleUtils.toLocale(String)` for a 2 letter country code now returns a value instead of throwing an `IllegalArgumentException`.</action>
+    <action                   type="fix" dev="ggregory" due-to="mayuming, Gary Gregory">Fix typo in StringUtils.trunctate() IllegalArgumentException message and test assertion messages.</action>
+    <action                   type="fix" dev="ggregory" due-to="mayuming, Gary Gregory">Fix test fixture in ReflectionDiffBuilderTest.testTransientFieldDifference() #1464.</action>
+    <action issue="LANG-1789" type="fix" dev="ggregory" due-to="Hylke van der Schaaf, Gary Gregory">NullPointerException when generating NoSuchMethodException in MethodUtils.</action>
     <!-- ADD -->
     <action                   type="add" dev="ggregory" due-to="Gary Gregory">Add SystemProperties.getPath(String, Supplier&lt;Path&gt;).</action>
     <action                   type="add" dev="ggregory" due-to="Gary Gregory">Add JavaVersion.JAVA_25.</action>

src/main/java/org/apache/commons/lang3/StringUtils.java

@@ -8866,7 +8866,7 @@ public static String truncate(final String str, final int offset, final int maxW
             throw new IllegalArgumentException("offset cannot be negative");
         }
         if (maxWidth < 0) {
-            throw new IllegalArgumentException("maxWith cannot be negative");
+            throw new IllegalArgumentException("maxWidth cannot be negative");
         }
         if (str == null) {
             return null;

src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java

@@ -2951,16 +2951,16 @@ void testToString() throws UnsupportedEncodingException {
     @Test
     void testTruncate_StringInt() {
         assertNull(StringUtils.truncate(null, 12));
-        assertIllegalArgumentException(() -> StringUtils.truncate(null, -1), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate(null, -10), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate(null, Integer.MIN_VALUE), "maxWith cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate(null, -1), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate(null, -10), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate(null, Integer.MIN_VALUE), "maxWidth cannot be negative");
         assertEquals("", StringUtils.truncate("", 10));
         assertEquals("abc", StringUtils.truncate("abcdefghij", 3));
         assertEquals("abcdef", StringUtils.truncate("abcdefghij", 6));
         assertEquals("", StringUtils.truncate("abcdefghij", 0));
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", -1), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", -100), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", Integer.MIN_VALUE), "maxWith cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", -1), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", -100), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", Integer.MIN_VALUE), "maxWidth cannot be negative");
         assertEquals("abcdefghij", StringUtils.truncate("abcdefghijklmno", 10));
         assertEquals("abcdefghijklmno", StringUtils.truncate("abcdefghijklmno", Integer.MAX_VALUE));
         assertEquals("abcde", StringUtils.truncate("abcdefghijklmno", 5));
@@ -2979,11 +2979,11 @@ void testTruncate_StringIntInt() {
         assertEquals("abc", StringUtils.truncate("abcdefghij", 0, 3));
         assertEquals("fghij", StringUtils.truncate("abcdefghij", 5, 6));
         assertEquals("", StringUtils.truncate("abcdefghij", 0, 0));
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, -1), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, -10), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, -100), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 1, -100), "maxWith cannot be negative");
-        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, Integer.MIN_VALUE), "maxWith cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, -1), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, -10), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, -100), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 1, -100), "maxWidth cannot be negative");
+        assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", 0, Integer.MIN_VALUE), "maxWidth cannot be negative");
         assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", -1, 0), "offset cannot be negative");
         assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", -10, 0), "offset cannot be negative");
         assertIllegalArgumentException(() -> StringUtils.truncate("abcdefghij", -100, 1), "offset cannot be negative");

src/test/java/org/apache/commons/lang3/StringUtilsTest.java

@@ -25,9 +25,9 @@
 import org.apache.commons.lang3.AbstractLangTest;
 import org.junit.jupiter.api.Test;
 
-///**
-// * Tests {@link ReflectionDiffBuilder}.
-// */
+/**
+ * Tests {@link ReflectionDiffBuilder}.
+ */
 class ReflectionDiffBuilderTest extends AbstractLangTest {
 
     @SuppressWarnings("unused")
@@ -287,7 +287,7 @@ void testTransientFieldDifference() {
         final TypeTestClass firstObject = new TypeTestClass();
         firstObject.transientField = "a";
         final TypeTestClass secondObject = new TypeTestClass();
-        firstObject.transientField = "b";
+        secondObject.transientField = "b";
         DiffResult<TypeTestClass> list = firstObject.diff(secondObject);
         assertEquals(0, list.getNumberOfDiffs());
         list = firstObject.diffDeprecated(secondObject);

src/test/java/org/apache/commons/lang3/builder/ReflectionDiffBuilderTest.java

@@ -1110,6 +1110,9 @@ void testInvokeMethod() throws Exception {
     void testInvokeMethod_VarArgsWithNullValues() throws Exception {
         assertEquals("String...", MethodUtils.invokeMethod(testBean, "varOverload", "a", null, "c"));
         assertEquals("String...", MethodUtils.invokeMethod(testBean, "varOverload", "a", "b", null));
+        assertEquals("String...", MethodUtils.invokeMethod(testBean, "varOverload", new String[] { "a" }, new Class<?>[] { String.class }));
+        assertThrows(NoSuchMethodException.class,
+                () -> assertEquals("String...", MethodUtils.invokeMethod(testBean, "doesn't exist", new String[] { "a" }, new Class<?>[] { null })));
     }
 
     @Test