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

Author: garydgregory

src/main/java/org/apache/commons/lang3/builder/AbstractSupplier.java

@@ -22,7 +22,7 @@
 /**
  * Abstracts supplying an instance of {@code T}. Use to implement the builder pattern.
  *
- * @param <T> the type of instances to build.
+ * @param <T> The type of results supplied by this supplier.
  * @param <B> the type of builder.
  * @param <E> The kind of thrown exception or error.
  * @since 3.14.0

src/main/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer.java

@@ -36,9 +36,9 @@ public abstract class AbstractConcurrentInitializer<T, E extends Exception> impl
     /**
      * Builds a new instance for subclasses.
      *
-     * @param <T> the type of the object managed by the initializer class.
-     * @param <I> the type of the initializer class.
-     * @param <B> the type of builder.
+     * @param <I> The type of results supplied by this builder.
+     * @param <T> The type of the object managed by the initializer class.
+     * @param <B> The type of builder.
      * @param <E> The exception type thrown by {@link #initialize()}.
      */
     public abstract static class AbstractBuilder<I extends AbstractConcurrentInitializer<T, E>, T, B extends AbstractBuilder<I, T, B, E>, E extends Exception>

src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java

@@ -70,8 +70,8 @@ public class AtomicInitializer<T> extends AbstractConcurrentInitializer<T, Concu
     /**
      * Builds a new instance.
      *
-     * @param <T> the type of the object managed by the initializer.
-     * @param <I> the type of the initializer managed by this builder.
+     * @param <T> The type of results supplied by this builder.
+     * @param <I> The type of the initializer managed by this builder.
      * @since 3.14.0
      */
     public static class Builder<I extends AtomicInitializer<T>, T> extends AbstractBuilder<I, T, Builder<I, T>, ConcurrentException> {

src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java

@@ -59,8 +59,8 @@ public class AtomicSafeInitializer<T> extends AbstractConcurrentInitializer<T, C
     /**
      * Builds a new instance.
      *
-     * @param <T> the type of the object managed by the initializer.
-     * @param <I> the type of the initializer managed by this builder.
+     * @param <T> The type of results supplied by this builder.
+     * @param <I> The type of the initializer managed by this builder.
      * @since 3.14.0
      */
     public static class Builder<I extends AtomicSafeInitializer<T>, T> extends AbstractBuilder<I, T, Builder<I, T>, ConcurrentException> {

src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java

@@ -90,8 +90,8 @@ public class BackgroundInitializer<T> extends AbstractConcurrentInitializer<T, E
     /**
      * Builds a new instance.
      *
-     * @param <T> the type of the object managed by the initializer.
-     * @param <I> the type of the initializer managed by this builder.
+     * @param <T> The type of results supplied by this builder.
+     * @param <I> The type of the initializer managed by this builder.
      * @since 3.14.0
      */
     public static class Builder<I extends BackgroundInitializer<T>, T> extends AbstractBuilder<I, T, Builder<I, T>, Exception> {

src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java

@@ -74,8 +74,8 @@ public class LazyInitializer<T> extends AbstractConcurrentInitializer<T, Concurr
     /**
      * Builds a new instance.
      *
-     * @param <T> the type of the object managed by the initializer.
-     * @param <I> the type of the initializer managed by this builder.
+     * @param <T> The type of results supplied by this builder.
+     * @param <I> The type of the initializer managed by this builder.
      * @since 3.14.0
      */
     public static class Builder<I extends LazyInitializer<T>, T> extends AbstractBuilder<I, T, Builder<I, T>, ConcurrentException> {

src/main/java/org/apache/commons/lang3/function/FailableSupplier.java

@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link Supplier} that declares a {@link Throwable}.
  *
- * @param <T> Return type.
+ * @param <T> The type of results supplied by this supplier.
  * @param <E> The kind of thrown exception or error.
  * @since 3.11
  */

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

@@ -252,6 +252,12 @@ final class LANG1261ChildObject extends LANG1261ParentObject {
         assertTrue(ArrayUtils.contains(array, new LANG1261ParentObject()));
     }
 
+    @Test
+    public void testContainsAnyEnum() {
+        assertTrue(ArrayUtils.containsAny(ElementType.values(), ElementType.ANNOTATION_TYPE));
+        assertFalse(ArrayUtils.containsAny(ElementType.values(), (ElementType) null));
+    }
+
     @Test
     public void testContainsAnyInt() {
         final int[] array = {0, 1, 2, 3, 0};
@@ -262,12 +268,6 @@ public void testContainsAnyInt() {
         assertTrue(ArrayUtils.containsAny(array, 3));
     }
 
-    @Test
-    public void testContainsAnyEnum() {
-        assertTrue(ArrayUtils.containsAny(ElementType.values(), ElementType.ANNOTATION_TYPE));
-        assertFalse(ArrayUtils.containsAny(ElementType.values(), (ElementType) null));
-    }
-
     @Test
     public void testContainsAnyObject() {
         final Object[] array = {"0", "1", "2", "3", null, "0"};

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

@@ -57,12 +57,6 @@ public void testCaseInsensitiveConstant() {
         assertFalse(Strings.CI.isCaseSensitive());
     }
 
-    @Test
-    public void testCaseSensitiveConstant() {
-        assertNotNull(Strings.CS);
-        assertTrue(Strings.CS.isCaseSensitive());
-    }
-
     /**
      * Expanding the existing test group {@link StringUtilsStartsEndsWithTest#testStartsWithAny()} to include case-insensitive cases
      */
@@ -84,13 +78,10 @@ public void testCaseInsensitiveStartsWithAny() {
         assertTrue(Strings.CI.startsWithAny(new StringBuffer("AbCxYz"), new StringBuilder("XyZ"), new StringBuffer("abc")));
     }
 
-    @ParameterizedTest
-    @MethodSource("stringsFactory")
-    public void testEqualsStrings(final Strings strings) {
-        final String nullStr = null;
-        assertTrue(strings.equals(nullStr, nullStr));
-        assertFalse(strings.equals(nullStr, ""));
-        assertFalse(strings.equals("", nullStr));
+    @Test
+    public void testCaseSensitiveConstant() {
+        assertNotNull(Strings.CS);
+        assertTrue(Strings.CS.isCaseSensitive());
     }
 
     @ParameterizedTest
@@ -101,4 +92,13 @@ public void testEqualsCharSequence(final Strings strings) {
         assertFalse(strings.equals(nullCharSequence, ""));
         assertFalse(strings.equals("", nullCharSequence));
     }
+
+    @ParameterizedTest
+    @MethodSource("stringsFactory")
+    public void testEqualsStrings(final Strings strings) {
+        final String nullStr = null;
+        assertTrue(strings.equals(nullStr, nullStr));
+        assertFalse(strings.equals(nullStr, ""));
+        assertFalse(strings.equals("", nullStr));
+    }
 }

src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java

@@ -62,11 +62,6 @@
  * Tests MethodUtils
  */
 public class MethodUtilsTest extends AbstractLangTest {
-    interface InterfaceGetMatchingMethod {
-        default void testMethod6() {
-        }
-    }
-
     protected abstract static class AbstractGetMatchingMethod implements InterfaceGetMatchingMethod {
         public abstract void testMethod5(Exception exception);
     }
@@ -118,9 +113,9 @@ private static final class GetMatchingMethodImpl extends AbstractGetMatchingMeth
         public void testMethod5(final Exception exception) {
         }
     }
+
     public static class GrandParentObject {
     }
-
     public static class InheritanceBean {
         public void testOne(final GrandParentObject obj) {
         }
@@ -141,6 +136,11 @@ public void testTwo(final Object obj) {
         }
     }
 
+    interface InterfaceGetMatchingMethod {
+        default void testMethod6() {
+        }
+    }
+
     private static final class MethodDescriptor {
         final Class<?> declaringClass;
         final String name;