diff --git a/src/main/java/org/apache/commons/lang3/AnnotationUtils.java b/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
index 2a995e3fc1f..bc480081945 100644
--- a/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
@@ -49,7 +49,7 @@ public class AnnotationUtils {
      */
     private static final ToStringStyle TO_STRING_STYLE = new ToStringStyle() {
 
-        /** Serialization version */
+        /** Serialization version. */
         private static final long serialVersionUID = 1L;
 
         {
@@ -232,10 +232,10 @@ && isValidAnnotationMemberType(m.getReturnType())) {
      * @param a the Annotation for a hash code calculation is desired, not
      * {@code null}
      * @return the calculated hash code
-     * @throws RuntimeException if an {@link Exception} is encountered during
-     * annotation member access
      * @throws IllegalStateException if an annotation method invocation returns
      * {@code null}
+     * @throws RuntimeException if an {@link Exception} is encountered during
+     * annotation member access
      */
     public static int hashCode(final Annotation a) {
         int result = 0;
diff --git a/src/main/java/org/apache/commons/lang3/AppendableJoiner.java b/src/main/java/org/apache/commons/lang3/AppendableJoiner.java
index eb19fac2455..bbf9add3bee 100644
--- a/src/main/java/org/apache/commons/lang3/AppendableJoiner.java
+++ b/src/main/java/org/apache/commons/lang3/AppendableJoiner.java
@@ -73,7 +73,7 @@
  * This class is immutable and thread-safe.
  * </p>
  *
- * @param <T> the type of elements to join.
+ * @param <T> the type of elements to join
  * @see Appendable
  * @see StringBuilder
  * @see String#join(CharSequence, CharSequence...)
@@ -86,7 +86,7 @@ public final class AppendableJoiner<T> {
     /**
      * Builds instances of {@link AppendableJoiner}.
      *
-     * @param <T> the type of elements to join.
+     * @param <T> the type of elements to join
      */
     public static final class Builder<T> implements Supplier<AppendableJoiner<T>> {
 
@@ -99,7 +99,9 @@ public static final class Builder<T> implements Supplier<AppendableJoiner<T>> {
         /** The delimiter that separates each element. */
         private CharSequence delimiter;
 
-        /** The consumer used to render each element of type {@code T} onto an {@link Appendable}. */
+        /**
+         * The consumer used to render each element of type {@code T} onto an {@link Appendable}.
+         */
         private FailableBiConsumer<Appendable, T, IOException> appender;
 
         /**
@@ -120,8 +122,8 @@ public AppendableJoiner<T> get() {
         /**
          * Sets the delimiter that separates each element.
          *
-         * @param delimiter The delimiter that separates each element.
-         * @return {@code this} instance.
+         * @param delimiter the delimiter that separates each element
+         * @return {@code this} instance
          */
         public Builder<T> setDelimiter(final CharSequence delimiter) {
             this.delimiter = delimiter;
@@ -131,8 +133,8 @@ public Builder<T> setDelimiter(final CharSequence delimiter) {
         /**
          * Sets the consumer used to render each element of type {@code T} onto an {@link Appendable}.
          *
-         * @param appender The consumer used to render each element of type {@code T} onto an {@link Appendable}.
-         * @return {@code this} instance.
+         * @param appender the consumer used to render each element of type {@code T} onto an {@link Appendable}
+         * @return {@code this} instance
          */
         public Builder<T> setElementAppender(final FailableBiConsumer<Appendable, T, IOException> appender) {
             this.appender = appender;
@@ -142,8 +144,8 @@ public Builder<T> setElementAppender(final FailableBiConsumer<Appendable, T, IOE
         /**
          * Sets the sequence of characters to be used at the beginning.
          *
-         * @param prefix The sequence of characters to be used at the beginning.
-         * @return {@code this} instance.
+         * @param prefix the sequence of characters to be used at the beginning
+         * @return {@code this} instance
          */
         public Builder<T> setPrefix(final CharSequence prefix) {
             this.prefix = prefix;
@@ -153,8 +155,8 @@ public Builder<T> setPrefix(final CharSequence prefix) {
         /**
          * Sets the sequence of characters to be used at the end.
          *
-         * @param suffix The sequence of characters to be used at the end.
-         * @return {@code this} instance.
+         * @param suffix the sequence of characters to be used at the end
+         * @return {@code this} instance
          */
         public Builder<T> setSuffix(final CharSequence suffix) {
             this.suffix = suffix;
@@ -166,8 +168,8 @@ public Builder<T> setSuffix(final CharSequence suffix) {
     /**
      * Creates a new builder.
      *
-     * @param <T> The type of elements.
-     * @return a new builder.
+     * @param <T> the type of elements
+     * @return a new builder
      */
     public static <T> Builder<T> builder() {
         return new Builder<>();
@@ -265,9 +267,9 @@ private AppendableJoiner(final CharSequence prefix, final CharSequence suffix, f
     /**
      * Joins stringified objects from the given Iterable into a StringBuilder.
      *
-     * @param stringBuilder The target.
-     * @param elements      The source.
-     * @return The given StringBuilder.
+     * @param stringBuilder the target
+     * @param elements      the source
+     * @return the given StringBuilder
      */
     public StringBuilder join(final StringBuilder stringBuilder, final Iterable<T> elements) {
         return joinI(stringBuilder, prefix, suffix, delimiter, appender, elements);
@@ -276,9 +278,9 @@ public StringBuilder join(final StringBuilder stringBuilder, final Iterable<T> e
     /**
      * Joins stringified objects from the given array into a StringBuilder.
      *
-     * @param stringBuilder The target.
-     * @param elements      The source.
-     * @return the given target StringBuilder.
+     * @param stringBuilder the target
+     * @param elements      the source
+     * @return the given target StringBuilder
      */
     public StringBuilder join(final StringBuilder stringBuilder, @SuppressWarnings("unchecked") final T... elements) {
         return joinSB(stringBuilder, prefix, suffix, delimiter, appender, elements);
@@ -287,11 +289,11 @@ public StringBuilder join(final StringBuilder stringBuilder, @SuppressWarnings("
     /**
      * Joins stringified objects from the given Iterable into an Appendable.
      *
-     * @param <A>        the Appendable type.
-     * @param appendable The target.
-     * @param elements   The source.
-     * @return The given StringBuilder.
-     * @throws IOException If an I/O error occurs
+     * @param <A>        the Appendable type
+     * @param appendable the target
+     * @param elements   the source
+     * @return the given StringBuilder
+     * @throws IOException if an I/O error occurs
      */
     public <A extends Appendable> A joinA(final A appendable, final Iterable<T> elements) throws IOException {
         return joinIterable(appendable, prefix, suffix, delimiter, appender, elements);
@@ -300,11 +302,11 @@ public <A extends Appendable> A joinA(final A appendable, final Iterable<T> elem
     /**
      * Joins stringified objects from the given array into an Appendable.
      *
-     * @param <A>        the Appendable type.
-     * @param appendable The target.
-     * @param elements   The source.
-     * @return The given StringBuilder.
-     * @throws IOException If an I/O error occurs
+     * @param <A>        the Appendable type
+     * @param appendable the target
+     * @param elements   the source
+     * @return the given StringBuilder
+     * @throws IOException if an I/O error occurs
      */
     public <A extends Appendable> A joinA(final A appendable, @SuppressWarnings("unchecked") final T... elements) throws IOException {
         return joinA(appendable, prefix, suffix, delimiter, appender, elements);
diff --git a/src/main/java/org/apache/commons/lang3/ArchUtils.java b/src/main/java/org/apache/commons/lang3/ArchUtils.java
index 38fff6b8439..b4663f5d239 100644
--- a/src/main/java/org/apache/commons/lang3/ArchUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArchUtils.java
@@ -42,9 +42,9 @@ public class ArchUtils {
     /**
      * Adds the given {@link Processor} with the given key {@link String} to the map.
      *
-     * @param key       The key as {@link String}.
-     * @param processor The {@link Processor} to add.
-     * @throws IllegalStateException If the key already exists.
+     * @param key       the key as {@link String}
+     * @param processor the {@link Processor} to add
+     * @throws IllegalStateException if the key already exists
      */
     private static void addProcessor(final String key, final Processor processor) {
         if (ARCH_TO_PROCESSOR.containsKey(key)) {
@@ -56,9 +56,9 @@ private static void addProcessor(final String key, final Processor processor) {
     /**
      * Adds the given {@link Processor} with the given keys to the map.
      *
-     * @param keys      The keys.
-     * @param processor The {@link Processor} to add.
-     * @throws IllegalStateException If the key already exists.
+     * @param keys      the keys
+     * @param processor the {@link Processor} to add
+     * @throws IllegalStateException if the key already exists
      */
     private static void addProcessors(final Processor processor, final String... keys) {
         Streams.of(keys).forEach(e -> addProcessor(e, processor));
@@ -71,7 +71,7 @@ private static void addProcessors(final Processor processor, final String... key
      * Important: The {@code "os.arch"} system property returns the architecture used by the JVM not of the operating system.
      * </p>
      *
-     * @return A {@link Processor} when supported, else {@code null}.
+     * @return a {@link Processor} when supported, else {@code null}
      */
     public static Processor getProcessor() {
         return getProcessor(SystemProperties.getOsArch());
@@ -81,8 +81,8 @@ public static Processor getProcessor() {
      * Gets a {@link Processor} object the given value {@link String}. The {@link String} must be like a value returned by the {@code "os.arch"} system
      * property.
      *
-     * @param value A {@link String} like a value returned by the {@code os.arch} System Property.
-     * @return A {@link Processor} when it exists, else {@code null}.
+     * @param value a {@link String} like a value returned by the {@code os.arch} System Property
+     * @return a {@link Processor} when it exists, else {@code null}
      */
     public static Processor getProcessor(final String value) {
         return ARCH_TO_PROCESSOR.get(value);
diff --git a/src/main/java/org/apache/commons/lang3/ArrayFill.java b/src/main/java/org/apache/commons/lang3/ArrayFill.java
index d0dc1441852..474ae111a10 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayFill.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayFill.java
@@ -32,9 +32,9 @@ public final class ArrayFill {
     /**
      * Fills and returns the given array, assigning the given {@code boolean} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(boolean[],boolean)
      * @since 3.18.0
      */
@@ -48,9 +48,9 @@ public static boolean[] fill(final boolean[] a, final boolean val) {
     /**
      * Fills and returns the given array, assigning the given {@code byte} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(byte[],byte)
      */
     public static byte[] fill(final byte[] a, final byte val) {
@@ -63,9 +63,9 @@ public static byte[] fill(final byte[] a, final byte val) {
     /**
      * Fills and returns the given array, assigning the given {@code char} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(char[],char)
      */
     public static char[] fill(final char[] a, final char val) {
@@ -78,9 +78,9 @@ public static char[] fill(final char[] a, final char val) {
     /**
      * Fills and returns the given array, assigning the given {@code double} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(double[],double)
      */
     public static double[] fill(final double[] a, final double val) {
@@ -93,9 +93,9 @@ public static double[] fill(final double[] a, final double val) {
     /**
      * Fills and returns the given array, assigning the given {@code float} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(float[],float)
      */
     public static float[] fill(final float[] a, final float val) {
@@ -108,9 +108,9 @@ public static float[] fill(final float[] a, final float val) {
     /**
      * Fills and returns the given array, assigning the given {@code int} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(int[],int)
      */
     public static int[] fill(final int[] a, final int val) {
@@ -123,9 +123,9 @@ public static int[] fill(final int[] a, final int val) {
     /**
      * Fills and returns the given array, assigning the given {@code long} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(long[],long)
      */
     public static long[] fill(final long[] a, final long val) {
@@ -138,9 +138,9 @@ public static long[] fill(final long[] a, final long val) {
     /**
      * Fills and returns the given array, assigning the given {@code short} value to each element of the array.
      *
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(short[],short)
      */
     public static short[] fill(final short[] a, final short val) {
@@ -158,12 +158,12 @@ public static short[] fill(final short[] a, final short val) {
      * state.
      * </p>
      *
-     * @param <T> type of elements of the array.
-     * @param array array to be initialized.
-     * @param generator a function accepting an index and producing the desired value for that position.
+     * @param <T> type of elements of the array
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired value for that position
+     * @param <E> the kind of thrown exception or error
      * @return the input array
-     * @param <E> The kind of thrown exception or error.
-     * @throws E Thrown by the given {@code generator}.
+     * @throws E thrown by the given {@code generator}
      * @see Arrays#setAll(Object[], IntFunction)
      * @since 3.18.0
      */
@@ -179,10 +179,10 @@ public static <T, E extends Throwable> T[] fill(final T[] array, final FailableI
     /**
      * Fills and returns the given array, assigning the given {@code T} value to each element of the array.
      *
-     * @param <T> the array type.
-     * @param a   the array to be filled (may be null).
-     * @param val the value to be stored in all elements of the array.
-     * @return the given array.
+     * @param <T> the array type
+     * @param a   the array to be filled (may be null)
+     * @param val the value to be stored in all elements of the array
+     * @return the given array
      * @see Arrays#fill(Object[],Object)
      */
     public static <T> T[] fill(final T[] a, final T val) {
diff --git a/src/main/java/org/apache/commons/lang3/ArraySorter.java b/src/main/java/org/apache/commons/lang3/ArraySorter.java
index 17ecc0610d6..ea2a1364d71 100644
--- a/src/main/java/org/apache/commons/lang3/ArraySorter.java
+++ b/src/main/java/org/apache/commons/lang3/ArraySorter.java
@@ -31,8 +31,8 @@ public class ArraySorter {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(byte[])
      */
     public static byte[] sort(final byte[] array) {
@@ -45,8 +45,8 @@ public static byte[] sort(final byte[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(char[])
      */
     public static char[] sort(final char[] array) {
@@ -59,8 +59,8 @@ public static char[] sort(final char[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(double[])
      */
     public static double[] sort(final double[] array) {
@@ -73,8 +73,8 @@ public static double[] sort(final double[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(float[])
      */
     public static float[] sort(final float[] array) {
@@ -87,8 +87,8 @@ public static float[] sort(final float[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(int[])
      */
     public static int[] sort(final int[] array) {
@@ -101,8 +101,8 @@ public static int[] sort(final int[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(long[])
      */
     public static long[] sort(final long[] array) {
@@ -115,8 +115,8 @@ public static long[] sort(final long[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(short[])
      */
     public static short[] sort(final short[] array) {
@@ -129,9 +129,9 @@ public static short[] sort(final short[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param <T> the array type.
-     * @param array the array to sort (may be null).
-     * @return the given array.
+     * @param <T> the array type
+     * @param array the array to sort (may be null)
+     * @return the given array
      * @see Arrays#sort(Object[])
      */
     public static <T> T[] sort(final T[] array) {
@@ -144,11 +144,11 @@ public static <T> T[] sort(final T[] array) {
     /**
      * Sorts the given array into ascending order and returns it.
      *
-     * @param <T> the array type.
-     * @param array the array to sort (may be null).
+     * @param <T> the array type
+     * @param array the array to sort (may be null)
      * @param comparator the comparator to determine the order of the array. A {@code null} value uses the elements'
      *        {@link Comparable natural ordering}.
-     * @return the given array.
+     * @return the given array
      * @see Arrays#sort(Object[])
      */
     public static <T> T[] sort(final T[] array, final Comparator<? super T> comparator) {
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index 1faa21e5f40..e10d2633738 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -232,9 +232,9 @@ static int addExact(final int a, final int b) {
      * ArrayUtils.add([true, false], true) = [true, false, true]
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static boolean[] add(final boolean[] array, final boolean element) {
@@ -264,11 +264,11 @@ public static boolean[] add(final boolean[] array, final boolean element) {
      * ArrayUtils.add([true, false], 1, true) = [true, true, false]
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt; array.length).
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt; array.length)
      * @deprecated this method has been superseded by {@link #insert(int, boolean[], boolean...)} and
      * may be removed in a future release. Please note the handling of {@code null} input arrays differs
      * in the new method: inserting {@code X} into a {@code null} array results in {@code null} not {@code X}.
@@ -295,9 +295,9 @@ public static boolean[] add(final boolean[] array, final int index, final boolea
      * ArrayUtils.add([1, 0], 1) = [1, 0, 1]
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static byte[] add(final byte[] array, final byte element) {
@@ -327,10 +327,10 @@ public static byte[] add(final byte[] array, final byte element) {
      * ArrayUtils.add([2, 6, 3], 2, 1)   = [2, 6, 1, 3]
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
      * @throws IndexOutOfBoundsException if the index is out of range.
      * (index &lt; 0 || index &gt; array.length).
      * @deprecated this method has been superseded by {@link #insert(int, byte[], byte...)} and
@@ -359,9 +359,9 @@ public static byte[] add(final byte[] array, final int index, final byte element
      * ArrayUtils.add(['1', '0'], '1') = ['1', '0', '1']
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static char[] add(final char[] array, final char element) {
@@ -392,10 +392,10 @@ public static char[] add(final char[] array, final char element) {
      * ArrayUtils.add(['a', 'b', 'c'], 1, 't') = ['a', 't', 'b', 'c']
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
      * @throws IndexOutOfBoundsException if the index is out of range.
      * (index &lt; 0 || index &gt; array.length).
      * @deprecated this method has been superseded by {@link #insert(int, char[], char...)} and
@@ -425,9 +425,9 @@ public static char[] add(final char[] array, final int index, final char element
      * ArrayUtils.add([1, 0], 1) = [1, 0, 1]
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static double[] add(final double[] array, final double element) {
@@ -457,12 +457,12 @@ public static double[] add(final double[] array, final double element) {
      * ArrayUtils.add([2.9, 6.0, 0.3], 2, 1.0)    = [2.9, 6.0, 1.0, 0.3]
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (index &lt; 0 || index &gt; array.length).
+     * (index &lt; 0 || index &gt; array.length)
      * @deprecated this method has been superseded by {@link #insert(int, double[], double...)} and
      * may be removed in a future release. Please note the handling of {@code null} input arrays differs
      * in the new method: inserting {@code X} into a {@code null} array results in {@code null} not {@code X}.
@@ -489,9 +489,9 @@ public static double[] add(final double[] array, final int index, final double e
      * ArrayUtils.add([1, 0], 1) = [1, 0, 1]
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static float[] add(final float[] array, final float element) {
@@ -521,12 +521,12 @@ public static float[] add(final float[] array, final float element) {
      * ArrayUtils.add([2.9f, 6.0f, 0.3f], 2, 1.0f)   = [2.9f, 6.0f, 1.0f, 0.3f]
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (index &lt; 0 || index &gt; array.length).
+     * (index &lt; 0 || index &gt; array.length)
      * @deprecated this method has been superseded by {@link #insert(int, float[], float...)} and
      * may be removed in a future release. Please note the handling of {@code null} input arrays differs
      * in the new method: inserting {@code X} into a {@code null} array results in {@code null} not {@code X}.
@@ -553,9 +553,9 @@ public static float[] add(final float[] array, final int index, final float elem
      * ArrayUtils.add([1, 0], 1) = [1, 0, 1]
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static int[] add(final int[] array, final int element) {
@@ -585,12 +585,12 @@ public static int[] add(final int[] array, final int element) {
      * ArrayUtils.add([2, 6, 3], 2, 1)   = [2, 6, 1, 3]
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (index &lt; 0 || index &gt; array.length).
+     * (index &lt; 0 || index &gt; array.length)
      * @deprecated this method has been superseded by {@link #insert(int, int[], int...)} and
      * may be removed in a future release. Please note the handling of {@code null} input arrays differs
      * in the new method: inserting {@code X} into a {@code null} array results in {@code null} not {@code X}.
@@ -621,12 +621,12 @@ public static int[] add(final int[] array, final int index, final int element) {
      * ArrayUtils.add([2L, 6L, 3L], 2, 1L)   = [2L, 6L, 1L, 3L]
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (index &lt; 0 || index &gt; array.length).
+     * (index &lt; 0 || index &gt; array.length)
      * @deprecated this method has been superseded by {@link #insert(int, long[], long...)} and
      * may be removed in a future release. Please note the handling of {@code null} input arrays differs
      * in the new method: inserting {@code X} into a {@code null} array results in {@code null} not {@code X}.
@@ -653,9 +653,9 @@ public static long[] add(final long[] array, final int index, final long element
      * ArrayUtils.add([1, 0], 1) = [1, 0, 1]
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static long[] add(final long[] array, final long element) {
@@ -669,11 +669,11 @@ public static long[] add(final long[] array, final long element) {
      * The last parameter is the class, which may not equal element.getClass
      * for primitives.
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @param clazz the type of the element being added.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @param clazz the type of the element being added
+     * @return a new array containing the existing elements and the new element
      */
     private static Object add(final Object array, final int index, final Object element, final Class<?> clazz) {
         if (array == null) {
@@ -717,12 +717,12 @@ private static Object add(final Object array, final int index, final Object elem
      * ArrayUtils.add([2, 6, 3], 2, 1)   = [2, 6, 1, 3]
      * </pre>
      *
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (index &lt; 0 || index &gt; array.length).
+     * (index &lt; 0 || index &gt; array.length)
      * @deprecated this method has been superseded by {@link #insert(int, short[], short...)} and
      * may be removed in a future release. Please note the handling of {@code null} input arrays differs
      * in the new method: inserting {@code X} into a {@code null} array results in {@code null} not {@code X}.
@@ -749,9 +749,9 @@ public static short[] add(final short[] array, final int index, final short elem
      * ArrayUtils.add([1, 0], 1) = [1, 0, 1]
      * </pre>
      *
-     * @param array  the array to copy and add the element to, may be {@code null}.
-     * @param element  the object to add at the last index of the new array.
-     * @return A new array containing the existing elements plus the new element.
+     * @param array  the array to copy and add the element to, may be {@code null}
+     * @param element  the object to add at the last index of the new array
+     * @return a new array containing the existing elements plus the new element
      * @since 2.1
      */
     public static short[] add(final short[] array, final short element) {
@@ -782,13 +782,13 @@ public static short[] add(final short[] array, final short element) {
      * ArrayUtils.add(["a", "b"], 3, "c") = ["a", "b", "c"]
      * </pre>
      *
-     * @param <T> the component type of the array.
-     * @param array  the array to add the element to, may be {@code null}.
-     * @param index  the position of the new object.
-     * @param element  the object to add.
-     * @return A new array containing the existing elements and the new element.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt; array.length).
-     * @throws IllegalArgumentException if both array and element are null.
+     * @param <T> the component type of the array
+     * @param array  the array to add the element to, may be {@code null}
+     * @param index  the position of the new object
+     * @param element  the object to add
+     * @return a new array containing the existing elements and the new element
+     * @throws IllegalArgumentException if both array and element are null
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt; array.length)
      * @deprecated this method has been superseded by {@link #insert(int, Object[], Object...) insert(int, T[], T...)} and
      * may be removed in a future release. Please note the handling of {@code null} input arrays differs
      * in the new method: inserting {@code X} into a {@code null} array results in {@code null} not {@code X}.
@@ -826,14 +826,14 @@ public static <T> T[] add(final T[] array, final int index, final T element) {
      * ArrayUtils.add(["a", "b"], "c") = ["a", "b", "c"]
      * </pre>
      *
-     * @param <T> the component type of the array.
-     * @param array  the array to "add" the element to, may be {@code null}.
-     * @param element  the object to add, may be {@code null}.
-     * @return A new array containing the existing elements plus the new element
+     * @param <T> the component type of the array
+     * @param array  the array to "add" the element to, may be {@code null}
+     * @param element  the object to add, may be {@code null}
+     * @return a new array containing the existing elements plus the new element
      * The returned array type will be that of the input array (unless null),
      * in which case it will have the same type as the element.
      * If both are null, an IllegalArgumentException is thrown.
-     * @throws IllegalArgumentException if both arguments are null.
+     * @throws IllegalArgumentException if both arguments are null
      * @since 2.1
      */
     public static <T> T[] add(final T[] array, final T element) {
@@ -866,9 +866,9 @@ public static <T> T[] add(final T[] array, final T element) {
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new boolean[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new boolean[] array or {@code null}
      * @since 2.1
      */
     public static boolean[] addAll(final boolean[] array1, final boolean... array2) {
@@ -898,9 +898,9 @@ public static boolean[] addAll(final boolean[] array1, final boolean... array2)
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new byte[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new byte[] array or {@code null}
      * @since 2.1
      */
     public static byte[] addAll(final byte[] array1, final byte... array2) {
@@ -930,9 +930,9 @@ public static byte[] addAll(final byte[] array1, final byte... array2) {
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new char[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new char[] array or {@code null}
      * @since 2.1
      */
     public static char[] addAll(final char[] array1, final char... array2) {
@@ -962,9 +962,9 @@ public static char[] addAll(final char[] array1, final char... array2) {
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new double[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new double[] array or {@code null}
      * @since 2.1
      */
     public static double[] addAll(final double[] array1, final double... array2) {
@@ -994,9 +994,9 @@ public static double[] addAll(final double[] array1, final double... array2) {
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new float[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new float[] array or {@code null}
      * @since 2.1
      */
     public static float[] addAll(final float[] array1, final float... array2) {
@@ -1026,9 +1026,9 @@ public static float[] addAll(final float[] array1, final float... array2) {
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new int[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new int[] array or {@code null}
      * @since 2.1
      */
     public static int[] addAll(final int[] array1, final int... array2) {
@@ -1058,9 +1058,9 @@ public static int[] addAll(final int[] array1, final int... array2) {
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new long[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new long[] array or {@code null}
      * @since 2.1
      */
     public static long[] addAll(final long[] array1, final long... array2) {
@@ -1090,9 +1090,9 @@ public static long[] addAll(final long[] array1, final long... array2) {
      * ArrayUtils.addAll(null, null)     = null
      * </pre>
      *
-     * @param array1  the first array whose elements are added to the new array.
-     * @param array2  the second array whose elements are added to the new array.
-     * @return The new short[] array or {@code null}.
+     * @param array1  the first array whose elements are added to the new array
+     * @param array2  the second array whose elements are added to the new array
+     * @return the new short[] array or {@code null}
      * @since 2.1
      */
     public static short[] addAll(final short[] array1, final short... array2) {
@@ -1125,13 +1125,13 @@ public static short[] addAll(final short[] array1, final short... array2) {
      * ArrayUtils.addAll(["a", "b", "c"], ["1", "2", "3"]) = ["a", "b", "c", "1", "2", "3"]
      * </pre>
      *
-     * @param <T> the component type of the array.
-     * @param array1  the first array whose elements are added to the new array, may be {@code null}.
-     * @param array2  the second array whose elements are added to the new array, may be {@code null}.
-     * @return The new array, {@code null} if both arrays are {@code null}.
+     * @param <T> the component type of the array
+     * @param array1  the first array whose elements are added to the new array, may be {@code null}
+     * @param array2  the second array whose elements are added to the new array, may be {@code null}
+     * @return the new array, {@code null} if both arrays are {@code null}.
      *      The type of the new array is the type of the first array,
      *      unless the first array is null, in which case the type is the same as the second array.
-     * @throws IllegalArgumentException if the array types are incompatible.
+     * @throws IllegalArgumentException if the array types are incompatible
      * @since 2.1
      */
     public static <T> T[] addAll(final T[] array1, @SuppressWarnings("unchecked") final T... array2) {
@@ -1167,7 +1167,7 @@ public static <T> T[] addAll(final T[] array1, @SuppressWarnings("unchecked") fi
      * @param array the array whose length should be added (can be {@code null},
      *              in which case its length is considered 0)
      * @return the new total length after adding the array's length
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
      */
     private static int addExact(final int totalLength, final Object array) {
         try {
@@ -1197,10 +1197,10 @@ private static int addExact(final int totalLength, final Object array) {
      * ArrayUtils.addFirst([true, false], true) = [true, true, false]
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static boolean[] addFirst(final boolean[] array, final boolean element) {
@@ -1223,10 +1223,10 @@ public static boolean[] addFirst(final boolean[] array, final boolean element) {
      * ArrayUtils.addFirst([1, 0], 1) = [1, 1, 0]
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static byte[] addFirst(final byte[] array, final byte element) {
@@ -1249,10 +1249,10 @@ public static byte[] addFirst(final byte[] array, final byte element) {
      * ArrayUtils.addFirst(['1', '0'], '1') = ['1', '1', '0']
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static char[] addFirst(final char[] array, final char element) {
@@ -1275,10 +1275,10 @@ public static char[] addFirst(final char[] array, final char element) {
      * ArrayUtils.addFirst([1, 0], 1) = [1, 1, 0]
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static double[] addFirst(final double[] array, final double element) {
@@ -1301,10 +1301,10 @@ public static double[] addFirst(final double[] array, final double element) {
      * ArrayUtils.addFirst([1, 0], 1) = [1, 1, 0]
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static float[] addFirst(final float[] array, final float element) {
@@ -1327,10 +1327,10 @@ public static float[] addFirst(final float[] array, final float element) {
      * ArrayUtils.addFirst([1, 0], 1) = [1, 1, 0]
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static int[] addFirst(final int[] array, final int element) {
@@ -1353,10 +1353,10 @@ public static int[] addFirst(final int[] array, final int element) {
      * ArrayUtils.addFirst([1, 0], 1) = [1, 1, 0]
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static long[] addFirst(final long[] array, final long element) {
@@ -1379,10 +1379,10 @@ public static long[] addFirst(final long[] array, final long element) {
      * ArrayUtils.addFirst([1, 0], 1) = [1, 1, 0]
      * </pre>
      *
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
-     *         the input array (unless null), in which case it will have the same type as the element.
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
+     *         the input array (unless null), in which case it will have the same type as the element
      * @since 3.10
      */
     public static short[] addFirst(final short[] array, final short element) {
@@ -1407,13 +1407,13 @@ public static short[] addFirst(final short[] array, final short element) {
      * ArrayUtils.addFirst(["a", "b"], "c") = ["c", "a", "b"]
      * </pre>
      *
-     * @param <T> the component type of the array.
-     * @param array the array to "add" the element to, may be {@code null}.
-     * @param element the object to add, may be {@code null}.
-     * @return A new array containing the existing elements plus the new element The returned array type will be that of
+     * @param <T> the component type of the array
+     * @param array the array to "add" the element to, may be {@code null}
+     * @param element the object to add, may be {@code null}
+     * @return a new array containing the existing elements plus the new element The returned array type will be that of
      *         the input array (unless null), in which case it will have the same type as the element. If both are null,
      *         an IllegalArgumentException is thrown.
-     * @throws IllegalArgumentException if both arguments are null.
+     * @throws IllegalArgumentException if both arguments are null
      * @since 3.10
      */
     public static <T> T[] addFirst(final T[] array, final T element) {
@@ -1423,17 +1423,17 @@ public static <T> T[] addFirst(final T[] array, final T element) {
     /**
      * A fluent version of {@link System#arraycopy(Object, int, Object, int, int)} that returns the destination array.
      *
-     * @param <T>       the type.
-     * @param source    the source array.
-     * @param sourcePos starting position in the source array.
-     * @param destPos   starting position in the destination data.
-     * @param length    the number of array elements to be copied.
-     * @param allocator allocates the array to populate and return.
+     * @param <T>       the type
+     * @param source    the source array
+     * @param sourcePos starting position in the source array
+     * @param destPos   starting position in the destination data
+     * @param length    the number of array elements to be copied
+     * @param allocator allocates the array to populate and return
      * @return dest
-     * @throws IndexOutOfBoundsException if copying would cause access of data outside array bounds.
      * @throws ArrayStoreException       if an element in the {@code src} array could not be stored into the {@code dest} array because of a type
-     *                                   mismatch.
-     * @throws NullPointerException      if either {@code src} or {@code dest} is {@code null}.
+     *                                   mismatch
+     * @throws IndexOutOfBoundsException if copying would cause access of data outside array bounds
+     * @throws NullPointerException      if either {@code src} or {@code dest} is {@code null}
      * @since 3.15.0
      */
     public static <T> T arraycopy(final T source, final int sourcePos, final int destPos, final int length, final Function<Integer, T> allocator) {
@@ -1443,17 +1443,17 @@ public static <T> T arraycopy(final T source, final int sourcePos, final int des
     /**
      * A fluent version of {@link System#arraycopy(Object, int, Object, int, int)} that returns the destination array.
      *
-     * @param <T>       the type.
-     * @param source    the source array.
-     * @param sourcePos starting position in the source array.
-     * @param destPos   starting position in the destination data.
-     * @param length    the number of array elements to be copied.
-     * @param allocator allocates the array to populate and return.
+     * @param <T>       the type
+     * @param source    the source array
+     * @param sourcePos starting position in the source array
+     * @param destPos   starting position in the destination data
+     * @param length    the number of array elements to be copied
+     * @param allocator allocates the array to populate and return
      * @return dest
-     * @throws IndexOutOfBoundsException if copying would cause access of data outside array bounds.
      * @throws ArrayStoreException       if an element in the {@code src} array could not be stored into the {@code dest} array because of a type
-     *                                   mismatch.
-     * @throws NullPointerException      if either {@code src} or {@code dest} is {@code null}.
+     *                                   mismatch
+     * @throws IndexOutOfBoundsException if copying would cause access of data outside array bounds
+     * @throws NullPointerException      if either {@code src} or {@code dest} is {@code null}
      * @since 3.15.0
      */
     public static <T> T arraycopy(final T source, final int sourcePos, final int destPos, final int length, final Supplier<T> allocator) {
@@ -1463,17 +1463,17 @@ public static <T> T arraycopy(final T source, final int sourcePos, final int des
     /**
      * A fluent version of {@link System#arraycopy(Object, int, Object, int, int)} that returns the destination array.
      *
-     * @param <T>       the type.
-     * @param source    the source array.
-     * @param sourcePos starting position in the source array.
-     * @param dest      the destination array.
-     * @param destPos   starting position in the destination data.
-     * @param length    the number of array elements to be copied.
+     * @param <T>       the type
+     * @param source    the source array
+     * @param sourcePos starting position in the source array
+     * @param dest      the destination array
+     * @param destPos   starting position in the destination data
+     * @param length    the number of array elements to be copied
      * @return dest
-     * @throws IndexOutOfBoundsException if copying would cause access of data outside array bounds.
      * @throws ArrayStoreException       if an element in the {@code src} array could not be stored into the {@code dest} array because of a type
-     *                                   mismatch.
-     * @throws NullPointerException      if either {@code src} or {@code dest} is {@code null}.
+     *                                   mismatch
+     * @throws IndexOutOfBoundsException if copying would cause access of data outside array bounds
+     * @throws NullPointerException      if either {@code src} or {@code dest} is {@code null}
      * @since 3.15.0
      */
     public static <T> T arraycopy(final T source, final int sourcePos, final T dest, final int destPos, final int length) {
@@ -1487,8 +1487,8 @@ public static <T> T arraycopy(final T source, final int sourcePos, final T dest,
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static boolean[] clone(final boolean[] array) {
         return array != null ? array.clone() : null;
@@ -1500,8 +1500,8 @@ public static boolean[] clone(final boolean[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static byte[] clone(final byte[] array) {
         return array != null ? array.clone() : null;
@@ -1513,8 +1513,8 @@ public static byte[] clone(final byte[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static char[] clone(final char[] array) {
         return array != null ? array.clone() : null;
@@ -1526,8 +1526,8 @@ public static char[] clone(final char[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static double[] clone(final double[] array) {
         return array != null ? array.clone() : null;
@@ -1539,8 +1539,8 @@ public static double[] clone(final double[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static float[] clone(final float[] array) {
         return array != null ? array.clone() : null;
@@ -1552,8 +1552,8 @@ public static float[] clone(final float[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static int[] clone(final int[] array) {
         return array != null ? array.clone() : null;
@@ -1565,8 +1565,8 @@ public static int[] clone(final int[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static long[] clone(final long[] array) {
         return array != null ? array.clone() : null;
@@ -1578,8 +1578,8 @@ public static long[] clone(final long[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the array to clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param array the array to clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static short[] clone(final short[] array) {
         return array != null ? array.clone() : null;
@@ -1594,9 +1594,9 @@ public static short[] clone(final short[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param <T>   the component type of the array.
-     * @param array the array to shallow clone, may be {@code null}.
-     * @return the cloned array, {@code null} if {@code null} input.
+     * @param <T>   the component type of the array
+     * @param array the array to shallow clone, may be {@code null}
+     * @return the cloned array, {@code null} if {@code null} input
      */
     public static <T> T[] clone(final T[] array) {
         return array != null ? array.clone() : null;
@@ -1613,9 +1613,9 @@ public static <T> T[] clone(final T[] array) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new boolean array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static boolean[] concat(boolean[]... arrays) {
@@ -1645,9 +1645,9 @@ public static boolean[] concat(boolean[]... arrays) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new byte array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static byte[] concat(byte[]... arrays) {
@@ -1677,9 +1677,9 @@ public static byte[] concat(byte[]... arrays) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new char array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static char[] concat(char[]... arrays) {
@@ -1709,9 +1709,9 @@ public static char[] concat(char[]... arrays) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new double array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static double[] concat(double[]... arrays) {
@@ -1741,9 +1741,9 @@ public static double[] concat(double[]... arrays) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new float array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static float[] concat(float[]... arrays) {
@@ -1773,9 +1773,9 @@ public static float[] concat(float[]... arrays) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new int array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static int[] concat(int[]... arrays) {
@@ -1805,9 +1805,9 @@ public static int[] concat(int[]... arrays) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new long array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static long[] concat(long[]... arrays) {
@@ -1837,9 +1837,9 @@ public static long[] concat(long[]... arrays) {
      * @param arrays the arrays to concatenate. Can be empty, contain nulls,
      *               or be null itself (treated as empty varargs).
      * @return a new short array containing all elements from the input arrays
-     *         in the order they appear, or an empty array if no elements are present.
-     * @throws NullPointerException if the input array of arrays is null.
-     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}.
+     *         in the order they appear, or an empty array if no elements are present
+     * @throws IllegalArgumentException if total arrays length exceed {@link ArrayUtils#SAFE_MAX_ARRAY_LENGTH}
+     * @throws NullPointerException if the input array of arrays is null
      * @since 3.21.0
      */
     public static short[] concat(short[]... arrays) {
@@ -1864,9 +1864,9 @@ public static short[] concat(short[]... arrays) {
      * The method returns {@code false} if a {@code null} array is passed in.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final boolean[] array, final boolean valueToFind) {
         return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
@@ -1882,9 +1882,9 @@ public static boolean contains(final boolean[] array, final boolean valueToFind)
      * {@link Arrays#sort(byte[])} and {@link Arrays#binarySearch(byte[], byte)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final byte[] array, final byte valueToFind) {
         return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
@@ -1900,9 +1900,9 @@ public static boolean contains(final byte[] array, final byte valueToFind) {
      * {@link Arrays#sort(char[])} and {@link Arrays#binarySearch(char[], char)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      * @since 2.1
      */
     public static boolean contains(final char[] array, final char valueToFind) {
@@ -1919,9 +1919,9 @@ public static boolean contains(final char[] array, final char valueToFind) {
      * {@link Arrays#sort(double[])} and {@link Arrays#binarySearch(double[], double)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final double[] array, final double valueToFind) {
         return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
@@ -1940,10 +1940,10 @@ public static boolean contains(final double[] array, final double valueToFind) {
      * {@link Arrays#sort(double[])} and {@link Arrays#binarySearch(double[], double)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @param tolerance  the array contains the tolerance of the search.
-     * @return true if value falling within tolerance is in array.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @param tolerance  the array contains the tolerance of the search
+     * @return true if value falling within tolerance is in array
      */
     public static boolean contains(final double[] array, final double valueToFind, final double tolerance) {
         return indexOf(array, valueToFind, 0, tolerance) != INDEX_NOT_FOUND;
@@ -1959,9 +1959,9 @@ public static boolean contains(final double[] array, final double valueToFind, f
      * {@link Arrays#sort(float[])} and {@link Arrays#binarySearch(float[], float)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final float[] array, final float valueToFind) {
         return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
@@ -1977,9 +1977,9 @@ public static boolean contains(final float[] array, final float valueToFind) {
      * {@link Arrays#sort(int[])} and {@link Arrays#binarySearch(int[], int)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final int[] array, final int valueToFind) {
         return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
@@ -1995,9 +1995,9 @@ public static boolean contains(final int[] array, final int valueToFind) {
      * {@link Arrays#sort(long[])} and {@link Arrays#binarySearch(long[], long)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final long[] array, final long valueToFind) {
         return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
@@ -2013,9 +2013,9 @@ public static boolean contains(final long[] array, final long valueToFind) {
      * {@link Arrays#sort(Object[], Comparator)} and {@link Arrays#binarySearch(Object[], Object)}.
      * </p>
      *
-     * @param array  the array to search, may be {@code null}.
-     * @param objectToFind  the object to find, may be {@code null}.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search, may be {@code null}
+     * @param objectToFind  the object to find, may be {@code null}
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final Object[] array, final Object objectToFind) {
         return indexOf(array, objectToFind) != INDEX_NOT_FOUND;
@@ -2031,9 +2031,9 @@ public static boolean contains(final Object[] array, final Object objectToFind)
      * {@link Arrays#sort(short[])} and {@link Arrays#binarySearch(short[], short)}.
      * </p>
      *
-     * @param array  the array to search.
-     * @param valueToFind  the value to find.
-     * @return {@code true} if the array contains the object.
+     * @param array  the array to search
+     * @param valueToFind  the value to find
+     * @return {@code true} if the array contains the object
      */
     public static boolean contains(final short[] array, final short valueToFind) {
         return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
@@ -2049,9 +2049,9 @@ public static boolean contains(final short[] array, final short valueToFind) {
      * {@link Arrays#sort(int[])} and {@link Arrays#binarySearch(int[], int)}.
      * </p>
      *
-     * @param array         the array to search.
-     * @param objectsToFind any of the ints to find.
-     * @return {@code true} if the array contains any of the ints.
+     * @param array         the array to search
+     * @param objectsToFind any of the ints to find
+     * @return {@code true} if the array contains any of the ints
      * @since 3.18.0
      */
     public static boolean containsAny(final int[] array, final int... objectsToFind) {
@@ -2068,9 +2068,9 @@ public static boolean containsAny(final int[] array, final int... objectsToFind)
      * {@link Arrays#sort(Object[], Comparator)} and {@link Arrays#binarySearch(Object[], Object)}.
      * </p>
      *
-     * @param array         the array to search, may be {@code null}.
-     * @param objectsToFind any of the objects to find, may be {@code null}.
-     * @return {@code true} if the array contains any of the objects.
+     * @param array         the array to search, may be {@code null}
+     * @param objectsToFind any of the objects to find, may be {@code null}
+     * @return {@code true} if the array contains any of the objects
      * @since 3.13.0
      */
     public static boolean containsAny(final Object[] array, final Object... objectsToFind) {
@@ -2081,10 +2081,10 @@ public static boolean containsAny(final Object[] array, final Object... objectsT
      * Returns a copy of the given array of size 1 greater than the argument.
      * The last value of the array is left to the default value.
      *
-     * @param array The array to copy, must not be {@code null}.
-     * @param newArrayComponentType If {@code array} is {@code null}, create a
-     * size 1 array of this type.
-     * @return A new copy of the array of size 1 greater than the input.
+     * @param array the array to copy, must not be {@code null}
+     * @param newArrayComponentType if {@code array} is {@code null}, create a
+     * size 1 array of this type
+     * @return a new copy of the array of size 1 greater than the input
      */
     private static Object copyArrayGrow1(final Object array, final Class<?> newArrayComponentType) {
         if (array != null) {
@@ -2099,10 +2099,10 @@ private static Object copyArrayGrow1(final Object array, final Class<?> newArray
     /**
      * Gets the nTh element of an array or null if the index is out of bounds or the array is null.
      *
-     * @param <T> The type of array elements.
-     * @param array The array to index.
-     * @param index The index.
-     * @return the nTh element of an array or null if the index is out of bounds or the array is null.
+     * @param <T> the type of array elements
+     * @param array the array to index
+     * @param index the index
+     * @return the nTh element of an array or null if the index is out of bounds or the array is null
      * @since 3.11
      */
     public static <T> T get(final T[] array, final int index) {
@@ -2112,11 +2112,11 @@ public static <T> T get(final T[] array, final int index) {
     /**
      * Gets the nTh element of an array or a default value if the index is out of bounds.
      *
-     * @param <T> The type of array elements.
-     * @param array The array to index.
-     * @param index The index.
-     * @param defaultValue The return value of the given index is out of bounds.
-     * @return the nTh element of an array or a default value if the index is out of bounds.
+     * @param <T> the type of array elements
+     * @param array the array to index
+     * @param index the index
+     * @param defaultValue the return value of the given index is out of bounds
+     * @return the nTh element of an array or a default value if the index is out of bounds
      * @since 3.11
      */
     public static <T> T get(final T[] array, final int index, final T defaultValue) {
@@ -2126,9 +2126,9 @@ public static <T> T get(final T[] array, final int index, final T defaultValue)
     /**
      * Gets an array's component type.
      *
-     * @param <T> The array type.
-     * @param array The array.
-     * @return The component type.
+     * @param <T> the array type
+     * @param array the array
+     * @return the component type
      * @since 3.13.0
      */
     public static <T> Class<T> getComponentType(final T[] array) {
@@ -2141,10 +2141,10 @@ public static <T> Class<T> getComponentType(final T[] array) {
      * The <a href="https://docs.oracle.com/javase/specs/jvms/se25/html/jvms-4.html#jvms-4.3">JVM specification</a> limits the number of dimensions to 255.
      * </p>
      *
-     * @param array the array, may be {@code null}.
-     * @return The number of dimensions, 0 if the input is null or not an array. The JVM specification limits the number of dimensions to 255.
-     * @since 3.21.0
+     * @param array the array, may be {@code null}
+     * @return the number of dimensions, 0 if the input is null or not an array. The JVM specification limits the number of dimensions to 255.
      * @see <a href="https://docs.oracle.com/javase/specs/jvms/se25/html/jvms-4.html#jvms-4.3">JVM specification Field Descriptors</a>
+     * @since 3.21.0
      */
     public static int getDimensions(final Object array) {
         int dimensions = 0;
@@ -2173,9 +2173,9 @@ public static int getDimensions(final Object array) {
      * ArrayUtils.getLength(["a", "b", "c"]) = 3
      * </pre>
      *
-     * @param array  the array to retrieve the length from, may be {@code null}.
-     * @return The length of the array, or {@code 0} if the array is {@code null}.
-     * @throws IllegalArgumentException if the object argument is not an array.
+     * @param array  the array to retrieve the length from, may be {@code null}
+     * @return the length of the array, or {@code 0} if the array is {@code null}
+     * @throws IllegalArgumentException if the object argument is not an array
      * @since 2.1
      */
     public static int getLength(final Object array) {
@@ -2188,8 +2188,8 @@ public static int getLength(final Object array) {
      * Multi-dimensional primitive arrays are also handled correctly by this method.
      * </p>
      *
-     * @param array  the array to get a hash code for, {@code null} returns zero.
-     * @return a hash code for the array.
+     * @param array  the array to get a hash code for, {@code null} returns zero
+     * @return a hash code for the array
      */
     public static int hashCode(final Object array) {
         return new HashCodeBuilder().append(array).toHashCode();
@@ -2205,10 +2205,10 @@ static <K> void increment(final Map<K, MutableInt> occurrences, final K boxed) {
      * This method returns an empty BitSet for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final boolean[] array, final boolean valueToFind) {
@@ -2224,10 +2224,10 @@ public static BitSet indexesOf(final boolean[] array, final boolean valueToFind)
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return an empty BitSet ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return a BitSet of all the indices of the value within the array, an empty BitSet if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return a BitSet of all the indices of the value within the array, an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final boolean[] array, final boolean valueToFind, int startIndex) {
@@ -2252,9 +2252,9 @@ public static BitSet indexesOf(final boolean[] array, final boolean valueToFind,
      * This method returns an empty BitSet for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return a BitSet of all the indices of the value within the array, an empty BitSet if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return a BitSet of all the indices of the value within the array, an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final byte[] array, final byte valueToFind) {
@@ -2269,11 +2269,11 @@ public static BitSet indexesOf(final byte[] array, final byte valueToFind) {
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final byte[] array, final byte valueToFind, int startIndex) {
@@ -2296,10 +2296,10 @@ public static BitSet indexesOf(final byte[] array, final byte valueToFind, int s
      *
      * <p>This method returns an empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final char[] array, final char valueToFind) {
@@ -2314,11 +2314,11 @@ public static BitSet indexesOf(final char[] array, final char valueToFind) {
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final char[] array, final char valueToFind, int startIndex) {
@@ -2341,10 +2341,10 @@ public static BitSet indexesOf(final char[] array, final char valueToFind, int s
      *
      * <p>This method returns empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final double[] array, final double valueToFind) {
@@ -2361,11 +2361,11 @@ public static BitSet indexesOf(final double[] array, final double valueToFind) {
      *
      * <p>This method returns an empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param tolerance tolerance of the search.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param tolerance tolerance of the search
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final double[] array, final double valueToFind, final double tolerance) {
@@ -2380,11 +2380,11 @@ public static BitSet indexesOf(final double[] array, final double valueToFind, f
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
      * @return a BitSet of the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final double[] array, final double valueToFind, int startIndex) {
@@ -2415,12 +2415,12 @@ public static BitSet indexesOf(final double[] array, final double valueToFind, i
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
-     * @param tolerance tolerance of the search.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
+     * @param tolerance tolerance of the search
      * @return a BitSet of the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final double[] array, final double valueToFind, int startIndex, final double tolerance) {
@@ -2443,10 +2443,10 @@ public static BitSet indexesOf(final double[] array, final double valueToFind, i
      *
      * <p>This method returns an empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final float[] array, final float valueToFind) {
@@ -2461,11 +2461,11 @@ public static BitSet indexesOf(final float[] array, final float valueToFind) {
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final float[] array, final float valueToFind, int startIndex) {
@@ -2488,10 +2488,10 @@ public static BitSet indexesOf(final float[] array, final float valueToFind, int
      *
      * <p>This method returns an empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final int[] array, final int valueToFind) {
@@ -2506,11 +2506,11 @@ public static BitSet indexesOf(final int[] array, final int valueToFind) {
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final int[] array, final int valueToFind, int startIndex) {
@@ -2533,10 +2533,10 @@ public static BitSet indexesOf(final int[] array, final int valueToFind, int sta
      *
      * <p>This method returns an empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final long[] array, final long valueToFind) {
@@ -2551,11 +2551,11 @@ public static BitSet indexesOf(final long[] array, final long valueToFind) {
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final long[] array, final long valueToFind, int startIndex) {
@@ -2578,10 +2578,10 @@ public static BitSet indexesOf(final long[] array, final long valueToFind, int s
      *
      * <p>This method returns an empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param objectToFind  the object to find, may be {@code null}.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param objectToFind  the object to find, may be {@code null}
      * @return a BitSet of all the indices of the object within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final Object[] array, final Object objectToFind) {
@@ -2596,11 +2596,11 @@ public static BitSet indexesOf(final Object[] array, final Object objectToFind)
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param objectToFind  the object to find, may be {@code null}.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param objectToFind  the object to find, may be {@code null}
+     * @param startIndex  the index to start searching
      * @return a BitSet of all the indices of the object within the array starting at the index,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final Object[] array, final Object objectToFind, int startIndex) {
@@ -2623,10 +2623,10 @@ public static BitSet indexesOf(final Object[] array, final Object objectToFind,
      *
      * <p>This method returns an empty BitSet for a {@code null} input array.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final short[] array, final short valueToFind) {
@@ -2641,11 +2641,11 @@ public static BitSet indexesOf(final short[] array, final short valueToFind) {
      * <p>A negative startIndex is treated as zero. A startIndex larger than the array
      * length will return an empty BitSet.</p>
      *
-     * @param array  the array to search for the object, may be {@code null}.
-     * @param valueToFind  the value to find.
-     * @param startIndex  the index to start searching.
+     * @param array  the array to search for the object, may be {@code null}
+     * @param valueToFind  the value to find
+     * @param startIndex  the index to start searching
      * @return a BitSet of all the indices of the value within the array,
-     *  an empty BitSet if not found or {@code null} array input.
+     *  an empty BitSet if not found or {@code null} array input
      * @since 3.10
      */
     public static BitSet indexesOf(final short[] array, final short valueToFind, int startIndex) {
@@ -2669,9 +2669,9 @@ public static BitSet indexesOf(final short[] array, final short valueToFind, int
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final boolean[] array, final boolean valueToFind) {
         return indexOf(array, valueToFind, 0);
@@ -2686,10 +2686,10 @@ public static int indexOf(final boolean[] array, final boolean valueToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final boolean[] array, final boolean valueToFind, final int startIndex) {
         if (isEmpty(array)) {
@@ -2709,9 +2709,9 @@ public static int indexOf(final boolean[] array, final boolean valueToFind, fina
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final byte[] array, final byte valueToFind) {
         return indexOf(array, valueToFind, 0);
@@ -2726,10 +2726,10 @@ public static int indexOf(final byte[] array, final byte valueToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final byte[] array, final byte valueToFind, final int startIndex) {
         if (isEmpty(array)) {
@@ -2749,9 +2749,9 @@ public static int indexOf(final byte[] array, final byte valueToFind, final int
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      * @since 2.1
      */
     public static int indexOf(final char[] array, final char valueToFind) {
@@ -2767,10 +2767,10 @@ public static int indexOf(final char[] array, final char valueToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      * @since 2.1
      */
     public static int indexOf(final char[] array, final char valueToFind, final int startIndex) {
@@ -2791,9 +2791,9 @@ public static int indexOf(final char[] array, final char valueToFind, final int
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final double[] array, final double valueToFind) {
         return indexOf(array, valueToFind, 0);
@@ -2806,10 +2806,10 @@ public static int indexOf(final double[] array, final double valueToFind) {
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param tolerance   tolerance of the search.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param tolerance   tolerance of the search
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final double[] array, final double valueToFind, final double tolerance) {
         return indexOf(array, valueToFind, 0, tolerance);
@@ -2824,10 +2824,10 @@ public static int indexOf(final double[] array, final double valueToFind, final
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final double[] array, final double valueToFind, final int startIndex) {
         if (Double.isNaN(valueToFind)) {
@@ -2854,11 +2854,11 @@ public static int indexOf(final double[] array, final double valueToFind, final
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @param tolerance   tolerance of the search.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @param tolerance   tolerance of the search
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final double[] array, final double valueToFind, final int startIndex, final double tolerance) {
         if (Double.isNaN(valueToFind)) {
@@ -2883,9 +2883,9 @@ public static int indexOf(final double[] array, final double valueToFind, final
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final float[] array, final float valueToFind) {
         return indexOf(array, valueToFind, 0);
@@ -2900,10 +2900,10 @@ public static int indexOf(final float[] array, final float valueToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final float[] array, final float valueToFind, final int startIndex) {
         if (isEmpty(array)) {
@@ -2925,9 +2925,9 @@ public static int indexOf(final float[] array, final float valueToFind, final in
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final int[] array, final int valueToFind) {
         return indexOf(array, valueToFind, 0);
@@ -2942,10 +2942,10 @@ public static int indexOf(final int[] array, final int valueToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final int[] array, final int valueToFind, final int startIndex) {
         if (isEmpty(array)) {
@@ -2965,9 +2965,9 @@ public static int indexOf(final int[] array, final int valueToFind, final int st
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final long[] array, final long valueToFind) {
         return indexOf(array, valueToFind, 0);
@@ -2982,10 +2982,10 @@ public static int indexOf(final long[] array, final long valueToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final long[] array, final long valueToFind, final int startIndex) {
         if (isEmpty(array)) {
@@ -3005,9 +3005,9 @@ public static int indexOf(final long[] array, final long valueToFind, final int
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array        the array to search for the object, may be {@code null}.
-     * @param objectToFind the object to find, may be {@code null}.
-     * @return the index of the object within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array        the array to search for the object, may be {@code null}
+     * @param objectToFind the object to find, may be {@code null}
+     * @return the index of the object within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final Object[] array, final Object objectToFind) {
         return indexOf(array, objectToFind, 0);
@@ -3022,10 +3022,10 @@ public static int indexOf(final Object[] array, final Object objectToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array        the array to search for the object, may be {@code null}.
-     * @param objectToFind the object to find, may be {@code null}.
-     * @param startIndex   the index to start searching.
-     * @return the index of the object within the array starting at the index, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array        the array to search for the object, may be {@code null}
+     * @param objectToFind the object to find, may be {@code null}
+     * @param startIndex   the index to start searching
+     * @return the index of the object within the array starting at the index, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final Object[] array, final Object objectToFind, int startIndex) {
         if (isEmpty(array)) {
@@ -3055,8 +3055,8 @@ public static int indexOf(final Object[] array, final Object objectToFind, int s
      * </p>
      *
      * @param array       the array to search for the object, may be {@code null}
-     * @param valueToFind the value to find.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param valueToFind the value to find
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final short[] array, final short valueToFind) {
         return indexOf(array, valueToFind, 0);
@@ -3071,10 +3071,10 @@ public static int indexOf(final short[] array, final short valueToFind) {
      * A negative startIndex is treated as zero. A startIndex larger than the array length will return {@link #INDEX_NOT_FOUND} ({@code -1}).
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the index to start searching.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the index to start searching
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int indexOf(final short[] array, final short valueToFind, final int startIndex) {
         if (isEmpty(array)) {
@@ -3090,9 +3090,10 @@ public static int indexOf(final short[] array, final short valueToFind, final in
 
     /**
      * Finds the index of the NaN value in a double array.
-     * @param array the array to search for NaN, may be {@code null}.
-     * @param startIndex the index to start searching.
-     * @return the index of the NaN value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     *
+     * @param array the array to search for NaN, may be {@code null}
+     * @param startIndex the index to start searching
+     * @return the index of the NaN value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     private static int indexOfNaN(final double[] array, final int startIndex) {
         if (isEmpty(array)) {
@@ -3119,11 +3120,11 @@ private static int indexOfNaN(final double[] array, final int startIndex) {
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static boolean[] insert(final int index, final boolean[] array, final boolean... values) {
@@ -3160,11 +3161,11 @@ public static boolean[] insert(final int index, final boolean[] array, final boo
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static byte[] insert(final int index, final byte[] array, final byte... values) {
@@ -3201,11 +3202,11 @@ public static byte[] insert(final int index, final byte[] array, final byte... v
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static char[] insert(final int index, final char[] array, final char... values) {
@@ -3242,11 +3243,11 @@ public static char[] insert(final int index, final char[] array, final char... v
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static double[] insert(final int index, final double[] array, final double... values) {
@@ -3283,11 +3284,11 @@ public static double[] insert(final int index, final double[] array, final doubl
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static float[] insert(final int index, final float[] array, final float... values) {
@@ -3324,11 +3325,11 @@ public static float[] insert(final int index, final float[] array, final float..
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static int[] insert(final int index, final int[] array, final int... values) {
@@ -3365,11 +3366,11 @@ public static int[] insert(final int index, final int[] array, final int... valu
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static long[] insert(final int index, final long[] array, final long... values) {
@@ -3406,11 +3407,11 @@ public static long[] insert(final int index, final long[] array, final long... v
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     public static short[] insert(final int index, final short[] array, final short... values) {
@@ -3447,12 +3448,12 @@ public static short[] insert(final int index, final short[] array, final short..
      * ArrayUtils.insert(index, null, values)    = null
      * </pre>
      *
-     * @param <T>    The type of elements in {@code array} and {@code values}.
-     * @param index  the position within {@code array} to insert the new values.
-     * @param array  the array to insert the values into, may be {@code null}.
-     * @param values the new values to insert, may be {@code null}.
-     * @return The new array or {@code null} if the given array is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}.
+     * @param <T>    the type of elements in {@code array} and {@code values}
+     * @param index  the position within {@code array} to insert the new values
+     * @param array  the array to insert the values into, may be {@code null}
+     * @param values the new values to insert, may be {@code null}
+     * @return the new array or {@code null} if the given array is {@code null}
+     * @throws IndexOutOfBoundsException if {@code array} is provided and either {@code index < 0} or {@code index > array.length}
      * @since 3.6
      */
     @SafeVarargs
@@ -3489,8 +3490,8 @@ public static <T> T[] insert(final int index, final T[] array, final T... values
     /**
      * Checks if an array is empty or {@code null}.
      *
-     * @param array the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array the array to test
+     * @return {@code true} if the array is empty or {@code null}
      */
     private static boolean isArrayEmpty(final Object array) {
         return getLength(array) == 0;
@@ -3505,10 +3506,10 @@ private static boolean isArrayEmpty(final Object array) {
      * ArrayUtils.isArrayIndexValid(["a"], 0)      = true
      * </pre>
      *
-     * @param <T> the component type of the array.
-     * @param array the array to inspect, may be {@code null}.
-     * @param index the index of the array to be inspected.
-     * @return Whether the given index is safely-accessible in the given array.
+     * @param <T> the component type of the array
+     * @param array the array to inspect, may be {@code null}
+     * @param index the index of the array to be inspected
+     * @return whether the given index is safely-accessible in the given array
      * @since 3.8
      */
     public static <T> boolean isArrayIndexValid(final T[] array, final int index) {
@@ -3518,8 +3519,8 @@ public static <T> boolean isArrayIndexValid(final T[] array, final int index) {
     /**
      * Tests whether an array of primitive booleans is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final boolean[] array) {
@@ -3529,8 +3530,8 @@ public static boolean isEmpty(final boolean[] array) {
     /**
      * Tests whether an array of primitive bytes is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final byte[] array) {
@@ -3540,8 +3541,8 @@ public static boolean isEmpty(final byte[] array) {
     /**
      * Tests whether an array of primitive chars is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final char[] array) {
@@ -3551,8 +3552,8 @@ public static boolean isEmpty(final char[] array) {
     /**
      * Tests whether an array of primitive doubles is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final double[] array) {
@@ -3562,8 +3563,8 @@ public static boolean isEmpty(final double[] array) {
     /**
      * Tests whether an array of primitive floats is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final float[] array) {
@@ -3573,8 +3574,8 @@ public static boolean isEmpty(final float[] array) {
     /**
      * Tests whether an array of primitive ints is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final int[] array) {
@@ -3584,8 +3585,8 @@ public static boolean isEmpty(final int[] array) {
     /**
      * Tests whether an array of primitive longs is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final long[] array) {
@@ -3595,8 +3596,8 @@ public static boolean isEmpty(final long[] array) {
     /**
      * Tests whether an array of Objects is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final Object[] array) {
@@ -3606,8 +3607,8 @@ public static boolean isEmpty(final Object[] array) {
     /**
      * Tests whether an array of primitive shorts is empty or {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is empty or {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is empty or {@code null}
      * @since 2.1
      */
     public static boolean isEmpty(final short[] array) {
@@ -3615,18 +3616,18 @@ public static boolean isEmpty(final short[] array) {
     }
 
      /**
-     * Tests whether two arrays have equal content, using equals(), handling multidimensional arrays
-     * correctly.
-     * <p>
-     * Multi-dimensional primitive arrays are also handled correctly by this method.
-     * </p>
-     *
-     * @param array1  the left-hand side array to compare, may be {@code null}.
-     * @param array2  the right-hand side array to compare, may be {@code null}.
-     * @return {@code true} if the arrays are equal.
-     * @deprecated Replaced by {@code java.util.Objects.deepEquals(Object, Object)} and will be
+      * Tests whether two arrays have equal content, using equals(), handling multidimensional arrays
+      * correctly.
+      * <p>
+      * Multi-dimensional primitive arrays are also handled correctly by this method.
+      * </p>
+      *
+      * @param array1  the left-hand side array to compare, may be {@code null}
+      * @param array2  the right-hand side array to compare, may be {@code null}
+      * @return {@code true} if the arrays are equal
+      * @deprecated Replaced by {@code java.util.Objects.deepEquals(Object, Object)} and will be
      * removed from future releases.
-     */
+      */
     @Deprecated
     public static boolean isEquals(final Object array1, final Object array2) {
         return new EqualsBuilder().append(array1, array2).isEquals();
@@ -3635,8 +3636,8 @@ public static boolean isEquals(final Object array1, final Object array2) {
     /**
      * Tests whether an array of primitive booleans is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final boolean[] array) {
@@ -3646,8 +3647,8 @@ public static boolean isNotEmpty(final boolean[] array) {
     /**
      * Tests whether an array of primitive bytes is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final byte[] array) {
@@ -3657,8 +3658,8 @@ public static boolean isNotEmpty(final byte[] array) {
     /**
      * Tests whether an array of primitive chars is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final char[] array) {
@@ -3668,8 +3669,8 @@ public static boolean isNotEmpty(final char[] array) {
     /**
      * Tests whether an array of primitive doubles is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final double[] array) {
@@ -3679,8 +3680,8 @@ public static boolean isNotEmpty(final double[] array) {
     /**
      * Tests whether an array of primitive floats is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final float[] array) {
@@ -3690,8 +3691,8 @@ public static boolean isNotEmpty(final float[] array) {
     /**
      * Tests whether an array of primitive ints is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final int[] array) {
@@ -3701,8 +3702,8 @@ public static boolean isNotEmpty(final int[] array) {
     /**
      * Tests whether an array of primitive longs is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final long[] array) {
@@ -3712,8 +3713,8 @@ public static boolean isNotEmpty(final long[] array) {
     /**
      * Tests whether an array of primitive shorts is not empty and not {@code null}.
      *
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
     public static boolean isNotEmpty(final short[] array) {
@@ -3724,8 +3725,8 @@ public static boolean isNotEmpty(final short[] array) {
      * Tests whether an array of Objects is not empty and not {@code null}.
      *
      * @param <T> the component type of the array
-     * @param array  the array to test.
-     * @return {@code true} if the array is not empty and not {@code null}.
+     * @param array  the array to test
+     * @return {@code true} if the array is not empty and not {@code null}
      * @since 2.5
      */
      public static <T> boolean isNotEmpty(final T[] array) {
@@ -3733,12 +3734,12 @@ public static <T> boolean isNotEmpty(final T[] array) {
      }
 
     /**
-      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
-      *
-      * @param array1 the first array, may be {@code null}.
-      * @param array2 the second array, may be {@code null}.
-      * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
-      */
+     * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
+     *
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
+     */
      public static boolean isSameLength(final boolean[] array1, final boolean[] array2) {
         return getLength(array1) == getLength(array2);
     }
@@ -3746,9 +3747,9 @@ public static boolean isSameLength(final boolean[] array1, final boolean[] array
     /**
      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final byte[] array1, final byte[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3757,9 +3758,9 @@ public static boolean isSameLength(final byte[] array1, final byte[] array2) {
     /**
      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final char[] array1, final char[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3768,9 +3769,9 @@ public static boolean isSameLength(final char[] array1, final char[] array2) {
     /**
      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final double[] array1, final double[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3779,9 +3780,9 @@ public static boolean isSameLength(final double[] array1, final double[] array2)
     /**
      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final float[] array1, final float[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3790,9 +3791,9 @@ public static boolean isSameLength(final float[] array1, final float[] array2) {
     /**
      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final int[] array1, final int[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3801,9 +3802,9 @@ public static boolean isSameLength(final int[] array1, final int[] array2) {
     /**
      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final long[] array1, final long[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3815,9 +3816,9 @@ public static boolean isSameLength(final long[] array1, final long[] array2) {
      * Any multi-dimensional aspects of the arrays are ignored.
      * </p>
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      * @since 3.11
      */
     public static boolean isSameLength(final Object array1, final Object array2) {
@@ -3830,9 +3831,9 @@ public static boolean isSameLength(final Object array1, final Object array2) {
      * Any multi-dimensional aspects of the arrays are ignored.
      * </p>
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final Object[] array1, final Object[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3841,9 +3842,9 @@ public static boolean isSameLength(final Object[] array1, final Object[] array2)
     /**
      * Tests whether two arrays are the same length, treating {@code null} arrays as length {@code 0}.
      *
-     * @param array1 the first array, may be {@code null}.
-     * @param array2 the second array, may be {@code null}.
-     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array.
+     * @param array1 the first array, may be {@code null}
+     * @param array2 the second array, may be {@code null}
+     * @return {@code true} if length of arrays matches, treating {@code null} as an empty array
      */
     public static boolean isSameLength(final short[] array1, final short[] array2) {
         return getLength(array1) == getLength(array2);
@@ -3852,10 +3853,10 @@ public static boolean isSameLength(final short[] array1, final short[] array2) {
     /**
      * Tests whether two arrays are the same type taking into account multidimensional arrays.
      *
-     * @param array1 the first array, must not be {@code null}.
-     * @param array2 the second array, must not be {@code null}.
-     * @return {@code true} if type of arrays matches.
-     * @throws IllegalArgumentException if either array is {@code null}.
+     * @param array1 the first array, must not be {@code null}
+     * @param array2 the second array, must not be {@code null}
+     * @return {@code true} if type of arrays matches
+     * @throws IllegalArgumentException if either array is {@code null}
      */
     public static boolean isSameType(final Object array1, final Object array2) {
         if (array1 == null || array2 == null) {
@@ -3867,8 +3868,8 @@ public static boolean isSameType(final Object array1, final Object array2) {
     /**
      * Tests whether whether the provided array is sorted according to natural ordering ({@code false} before {@code true}).
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final boolean[] array) {
@@ -3890,8 +3891,8 @@ public static boolean isSorted(final boolean[] array) {
     /**
      * Tests whether the provided array is sorted according to natural ordering.
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final byte[] array) {
@@ -3913,8 +3914,8 @@ public static boolean isSorted(final byte[] array) {
     /**
      * Tests whether the provided array is sorted according to natural ordering.
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final char[] array) {
@@ -3936,8 +3937,8 @@ public static boolean isSorted(final char[] array) {
     /**
      * Tests whether the provided array is sorted according to natural ordering.
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final double[] array) {
@@ -3959,8 +3960,8 @@ public static boolean isSorted(final double[] array) {
     /**
      * Tests whether the provided array is sorted according to natural ordering.
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final float[] array) {
@@ -3982,8 +3983,8 @@ public static boolean isSorted(final float[] array) {
     /**
      * Tests whether the provided array is sorted according to natural ordering.
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final int[] array) {
@@ -4005,8 +4006,8 @@ public static boolean isSorted(final int[] array) {
     /**
      * Tests whether the provided array is sorted according to natural ordering.
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final long[] array) {
@@ -4028,8 +4029,8 @@ public static boolean isSorted(final long[] array) {
     /**
      * Tests whether the provided array is sorted according to natural ordering.
      *
-     * @param array the array to check.
-     * @return whether the array is sorted according to natural ordering.
+     * @param array the array to check
+     * @return whether the array is sorted according to natural ordering
      * @since 3.4
      */
     public static boolean isSorted(final short[] array) {
@@ -4052,9 +4053,9 @@ public static boolean isSorted(final short[] array) {
      * Tests whether the provided array is sorted according to the class's
      * {@code compareTo} method.
      *
-     * @param array the array to check.
-     * @param <T> the datatype of the array to check, it must implement {@link Comparable}.
-     * @return whether the array is sorted.
+     * @param array the array to check
+     * @param <T> the datatype of the array to check, it must implement {@link Comparable}
+     * @return whether the array is sorted
      * @since 3.4
      */
     public static <T extends Comparable<? super T>> boolean isSorted(final T[] array) {
@@ -4064,11 +4065,11 @@ public static <T extends Comparable<? super T>> boolean isSorted(final T[] array
     /**
      * Tests whether the provided array is sorted according to the provided {@link Comparator}.
      *
-     * @param array the array to check.
-     * @param comparator the {@link Comparator} to compare over.
-     * @param <T> the datatype of the array.
-     * @return whether the array is sorted.
-     * @throws NullPointerException if {@code comparator} is {@code null}.
+     * @param array the array to check
+     * @param comparator the {@link Comparator} to compare over
+     * @param <T> the datatype of the array
+     * @return whether the array is sorted
+     * @throws NullPointerException if {@code comparator} is {@code null}
      * @since 3.4
      */
     public static <T> boolean isSorted(final T[] array, final Comparator<T> comparator) {
@@ -4094,9 +4095,9 @@ public static <T> boolean isSorted(final T[] array, final Comparator<T> comparat
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) if {@code null} array input.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final boolean[] array, final boolean valueToFind) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
@@ -4111,10 +4112,10 @@ public static int lastIndexOf(final boolean[] array, final boolean valueToFind)
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final boolean[] array, final boolean valueToFind, int startIndex) {
         if (isEmpty(array) || startIndex < 0) {
@@ -4137,9 +4138,9 @@ public static int lastIndexOf(final boolean[] array, final boolean valueToFind,
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final byte[] array, final byte valueToFind) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
@@ -4154,10 +4155,10 @@ public static int lastIndexOf(final byte[] array, final byte valueToFind) {
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final byte[] array, final byte valueToFind, int startIndex) {
         if (array == null || startIndex < 0) {
@@ -4180,9 +4181,9 @@ public static int lastIndexOf(final byte[] array, final byte valueToFind, int st
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      * @since 2.1
      */
     public static int lastIndexOf(final char[] array, final char valueToFind) {
@@ -4198,10 +4199,10 @@ public static int lastIndexOf(final char[] array, final char valueToFind) {
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      * @since 2.1
      */
     public static int lastIndexOf(final char[] array, final char valueToFind, int startIndex) {
@@ -4225,9 +4226,9 @@ public static int lastIndexOf(final char[] array, final char valueToFind, int st
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final double[] array, final double valueToFind) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
@@ -4240,10 +4241,10 @@ public static int lastIndexOf(final double[] array, final double valueToFind) {
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to search for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param tolerance   tolerance of the search.
-     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to search for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param tolerance   tolerance of the search
+     * @return the index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final double[] array, final double valueToFind, final double tolerance) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE, tolerance);
@@ -4258,10 +4259,10 @@ public static int lastIndexOf(final double[] array, final double valueToFind, fi
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final double[] array, final double valueToFind, int startIndex) {
         if (isEmpty(array) || startIndex < 0) {
@@ -4288,11 +4289,11 @@ public static int lastIndexOf(final double[] array, final double valueToFind, in
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @param tolerance   search for value within plus/minus this amount.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @param tolerance   search for value within plus/minus this amount
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final double[] array, final double valueToFind, int startIndex, final double tolerance) {
         if (isEmpty(array) || startIndex < 0) {
@@ -4317,9 +4318,9 @@ public static int lastIndexOf(final double[] array, final double valueToFind, in
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final float[] array, final float valueToFind) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
@@ -4334,10 +4335,10 @@ public static int lastIndexOf(final float[] array, final float valueToFind) {
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final float[] array, final float valueToFind, int startIndex) {
         if (isEmpty(array) || startIndex < 0) {
@@ -4360,9 +4361,9 @@ public static int lastIndexOf(final float[] array, final float valueToFind, int
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final int[] array, final int valueToFind) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
@@ -4377,10 +4378,10 @@ public static int lastIndexOf(final int[] array, final int valueToFind) {
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final int[] array, final int valueToFind, int startIndex) {
         if (array == null || startIndex < 0) {
@@ -4403,9 +4404,9 @@ public static int lastIndexOf(final int[] array, final int valueToFind, int star
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final long[] array, final long valueToFind) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
@@ -4420,10 +4421,10 @@ public static int lastIndexOf(final long[] array, final long valueToFind) {
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final long[] array, final long valueToFind, int startIndex) {
         if (array == null || startIndex < 0) {
@@ -4446,9 +4447,9 @@ public static int lastIndexOf(final long[] array, final long valueToFind, int st
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array        the array to traverse backwards looking for the object, may be {@code null}.
-     * @param objectToFind the object to find, may be {@code null}.
-     * @return the last index of the object within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array        the array to traverse backwards looking for the object, may be {@code null}
+     * @param objectToFind the object to find, may be {@code null}
+     * @return the last index of the object within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final Object[] array, final Object objectToFind) {
         return lastIndexOf(array, objectToFind, Integer.MAX_VALUE);
@@ -4463,10 +4464,10 @@ public static int lastIndexOf(final Object[] array, final Object objectToFind) {
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array        the array to traverse for looking for the object, may be {@code null}.
-     * @param objectToFind the object to find, may be {@code null}.
-     * @param startIndex   the start index to traverse backwards from.
-     * @return the last index of the object within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array        the array to traverse for looking for the object, may be {@code null}
+     * @param objectToFind the object to find, may be {@code null}
+     * @param startIndex   the start index to traverse backwards from
+     * @return the last index of the object within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final Object[] array, final Object objectToFind, int startIndex) {
         if (array == null || startIndex < 0) {
@@ -4497,9 +4498,9 @@ public static int lastIndexOf(final Object[] array, final Object objectToFind, i
      * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
      * </p>
      *
-     * @param array       the array to traverse backwards looking for the object, may be {@code null}.
-     * @param valueToFind the object to find.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse backwards looking for the object, may be {@code null}
+     * @param valueToFind the object to find
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final short[] array, final short valueToFind) {
         return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
@@ -4514,10 +4515,10 @@ public static int lastIndexOf(final short[] array, final short valueToFind) {
      * A negative startIndex will return {@link #INDEX_NOT_FOUND} ({@code -1}). A startIndex larger than the array length will search from the end of the array.
      * </p>
      *
-     * @param array       the array to traverse for looking for the object, may be {@code null}.
-     * @param valueToFind the value to find.
-     * @param startIndex  the start index to traverse backwards from.
-     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input.
+     * @param array       the array to traverse for looking for the object, may be {@code null}
+     * @param valueToFind the value to find
+     * @param startIndex  the start index to traverse backwards from
+     * @return the last index of the value within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input
      */
     public static int lastIndexOf(final short[] array, final short valueToFind, int startIndex) {
         if (array == null || startIndex < 0) {
@@ -4537,14 +4538,14 @@ public static int lastIndexOf(final short[] array, final short valueToFind, int
     /**
      * Maps elements from an array into elements of a new array of a given type, while mapping old elements to new elements.
      *
-     * @param <T>           The input array type.
-     * @param <R>           The output array type.
-     * @param <E>           The type of exceptions thrown when the mapper function fails.
-     * @param array         The input array.
-     * @param componentType the component type of the result array.
-     * @param mapper        a non-interfering, stateless function to apply to each element.
-     * @return a new array.
-     * @throws E Thrown when the mapper function fails.
+     * @param <T>           the input array type
+     * @param <R>           the output array type
+     * @param <E>           the type of exceptions thrown when the mapper function fails
+     * @param array         the input array
+     * @param componentType the component type of the result array
+     * @param mapper        a non-interfering, stateless function to apply to each element
+     * @return a new array
+     * @throws E thrown when the mapper function fails
      */
     private static <T, R, E extends Throwable> R[] map(final T[] array, final Class<R> componentType, final FailableFunction<? super T, ? extends R, E> mapper)
             throws E {
@@ -4558,11 +4559,11 @@ private static int max0(final int other) {
     /**
      * Delegates to {@link Array#newInstance(Class,int)} using generics.
      *
-     * @param <T> The array type.
-     * @param componentType The array class.
+     * @param <T> the array type
+     * @param componentType the array class
      * @param length the array length
-     * @return The new array.
-     * @throws NullPointerException if the specified {@code componentType} parameter is null.
+     * @return the new array
+     * @throws NullPointerException if the specified {@code componentType} parameter is null
      * @since 3.13.0
      */
     @SuppressWarnings("unchecked") // OK, because array and values are of type T
@@ -4581,10 +4582,10 @@ public static <T> T[] newInstance(final Class<T> componentType, final int length
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param <T> The array type.
+     * @param <T> the array type
      * @param array  the array to check for {@code null} or empty
-     * @param defaultArray A default array, usually empty.
-     * @return the same array, or defaultArray if {@code null} or empty input.
+     * @param defaultArray a default array, usually empty
+     * @return the same array, or defaultArray if {@code null} or empty input
      * @since 3.15.0
      */
     public static <T> T[] nullTo(final T[] array, final T[] defaultArray) {
@@ -4602,8 +4603,8 @@ public static <T> T[] nullTo(final T[] array, final T[] defaultArray) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static boolean[] nullToEmpty(final boolean[] array) {
@@ -4621,8 +4622,8 @@ public static boolean[] nullToEmpty(final boolean[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Boolean[] nullToEmpty(final Boolean[] array) {
@@ -4640,8 +4641,8 @@ public static Boolean[] nullToEmpty(final Boolean[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static byte[] nullToEmpty(final byte[] array) {
@@ -4659,8 +4660,8 @@ public static byte[] nullToEmpty(final byte[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Byte[] nullToEmpty(final Byte[] array) {
@@ -4678,8 +4679,8 @@ public static Byte[] nullToEmpty(final Byte[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static char[] nullToEmpty(final char[] array) {
@@ -4697,8 +4698,8 @@ public static char[] nullToEmpty(final char[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Character[] nullToEmpty(final Character[] array) {
@@ -4716,8 +4717,8 @@ public static Character[] nullToEmpty(final Character[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 3.2
      */
     public static Class<?>[] nullToEmpty(final Class<?>[] array) {
@@ -4735,8 +4736,8 @@ public static Class<?>[] nullToEmpty(final Class<?>[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static double[] nullToEmpty(final double[] array) {
@@ -4754,8 +4755,8 @@ public static double[] nullToEmpty(final double[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Double[] nullToEmpty(final Double[] array) {
@@ -4773,8 +4774,8 @@ public static Double[] nullToEmpty(final Double[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static float[] nullToEmpty(final float[] array) {
@@ -4792,8 +4793,8 @@ public static float[] nullToEmpty(final float[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Float[] nullToEmpty(final Float[] array) {
@@ -4811,8 +4812,8 @@ public static Float[] nullToEmpty(final Float[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static int[] nullToEmpty(final int[] array) {
@@ -4830,8 +4831,8 @@ public static int[] nullToEmpty(final int[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Integer[] nullToEmpty(final Integer[] array) {
@@ -4849,8 +4850,8 @@ public static Integer[] nullToEmpty(final Integer[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static long[] nullToEmpty(final long[] array) {
@@ -4868,8 +4869,8 @@ public static long[] nullToEmpty(final long[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Long[] nullToEmpty(final Long[] array) {
@@ -4887,8 +4888,8 @@ public static Long[] nullToEmpty(final Long[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Object[] nullToEmpty(final Object[] array) {
@@ -4906,8 +4907,8 @@ public static Object[] nullToEmpty(final Object[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static short[] nullToEmpty(final short[] array) {
@@ -4925,8 +4926,8 @@ public static short[] nullToEmpty(final short[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static Short[] nullToEmpty(final Short[] array) {
@@ -4944,8 +4945,8 @@ public static Short[] nullToEmpty(final Short[] array) {
      * the empty {@code public static} references in this class.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @return the same array, {@code public static} empty array if {@code null} or empty input.
+     * @param array  the array to check for {@code null} or empty
+     * @return the same array, {@code public static} empty array if {@code null} or empty input
      * @since 2.5
      */
     public static String[] nullToEmpty(final String[] array) {
@@ -4959,11 +4960,11 @@ public static String[] nullToEmpty(final String[] array) {
      * This method returns an empty array for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to check for {@code null} or empty.
-     * @param type   the class representation of the desired array.
-     * @param <T>  the class type.
-     * @return the same array, {@code public static} empty array if {@code null}.
-     * @throws IllegalArgumentException if the type argument is null.
+     * @param array  the array to check for {@code null} or empty
+     * @param type   the class representation of the desired array
+     * @param <T>  the class type
+     * @return the same array, {@code public static} empty array if {@code null}
+     * @throws IllegalArgumentException if the type argument is null
      * @since 3.5
      */
     public static <T> T[] nullToEmpty(final T[] array, final Class<T[]> type) {
@@ -4979,7 +4980,7 @@ public static <T> T[] nullToEmpty(final T[] array, final Class<T[]> type) {
     /**
      * Gets the {@link ThreadLocalRandom} for {@code shuffle} methods that don't take a {@link Random} argument.
      *
-     * @return the current ThreadLocalRandom.
+     * @return the current ThreadLocalRandom
      */
     private static ThreadLocalRandom random() {
         return ThreadLocalRandom.current();
@@ -5003,10 +5004,10 @@ private static ThreadLocalRandom random() {
      * ArrayUtils.remove([true, true, false], 1) = [true, false]
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static boolean[] remove(final boolean[] array, final int index) {
@@ -5031,10 +5032,10 @@ public static boolean[] remove(final boolean[] array, final int index) {
      * ArrayUtils.remove([1, 0, 1], 1)    = [1, 1]
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static byte[] remove(final byte[] array, final int index) {
@@ -5059,10 +5060,10 @@ public static byte[] remove(final byte[] array, final int index) {
      * ArrayUtils.remove(['a', 'b', 'c'], 1) = ['a', 'c']
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static char[] remove(final char[] array, final int index) {
@@ -5087,10 +5088,10 @@ public static char[] remove(final char[] array, final int index) {
      * ArrayUtils.remove([2.5, 6.0, 3.8], 1) = [2.5, 3.8]
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static double[] remove(final double[] array, final int index) {
@@ -5115,10 +5116,10 @@ public static double[] remove(final double[] array, final int index) {
      * ArrayUtils.remove([2.5, 6.0, 3.8], 1) = [2.5, 3.8]
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static float[] remove(final float[] array, final int index) {
@@ -5143,10 +5144,10 @@ public static float[] remove(final float[] array, final int index) {
      * ArrayUtils.remove([2, 6, 3], 1)   = [2, 3]
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static int[] remove(final int[] array, final int index) {
@@ -5171,10 +5172,10 @@ public static int[] remove(final int[] array, final int index) {
      * ArrayUtils.remove([2, 6, 3], 1)   = [2, 3]
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static long[] remove(final long[] array, final int index) {
@@ -5192,10 +5193,10 @@ public static long[] remove(final long[] array, final int index) {
      * If the input array is {@code null}, an IndexOutOfBoundsException will be thrown, because in that case no valid index can be specified.
      * </p>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     private static Object remove(final Object array, final int index) {
@@ -5229,10 +5230,10 @@ private static Object remove(final Object array, final int index) {
      * ArrayUtils.remove([2, 6, 3], 1)   = [2, 3]
      * </pre>
      *
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     public static short[] remove(final short[] array, final int index) {
@@ -5257,11 +5258,11 @@ public static short[] remove(final short[] array, final int index) {
      * ArrayUtils.remove(["a", "b", "c"], 1) = ["a", "c"]
      * </pre>
      *
-     * @param <T>   the component type of the array.
-     * @param array the array to remove the element from, may not be {@code null}.
-     * @param index the position of the element to be removed.
-     * @return A new array containing the existing elements except the element at the specified position.
-     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param <T>   the component type of the array
+     * @param array the array to remove the element from, may not be {@code null}
+     * @param index the position of the element to be removed
+     * @return a new array containing the existing elements except the element at the specified position
+     * @throws IndexOutOfBoundsException if the index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 2.1
      */
     @SuppressWarnings("unchecked") // remove() always creates an array of the same type as its input
@@ -5284,10 +5285,10 @@ public static <T> T[] remove(final T[] array, final int index) {
      * ArrayUtils.removeAll([true, false, true], 1, 2) = [true]
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static boolean[] removeAll(final boolean[] array, final int... indices) {
@@ -5313,10 +5314,10 @@ public static boolean[] removeAll(final boolean[] array, final int... indices) {
      * ArrayUtils.removeAll([2, 6, 3], 0, 1, 2) = []
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static byte[] removeAll(final byte[] array, final int... indices) {
@@ -5342,10 +5343,10 @@ public static byte[] removeAll(final byte[] array, final int... indices) {
      * ArrayUtils.removeAll([2, 6, 3], 0, 1, 2) = []
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static char[] removeAll(final char[] array, final int... indices) {
@@ -5371,10 +5372,10 @@ public static char[] removeAll(final char[] array, final int... indices) {
      * ArrayUtils.removeAll([2, 6, 3], 0, 1, 2) = []
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static double[] removeAll(final double[] array, final int... indices) {
@@ -5400,10 +5401,10 @@ public static double[] removeAll(final double[] array, final int... indices) {
      * ArrayUtils.removeAll([2, 6, 3], 0, 1, 2) = []
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static float[] removeAll(final float[] array, final int... indices) {
@@ -5429,10 +5430,10 @@ public static float[] removeAll(final float[] array, final int... indices) {
      * ArrayUtils.removeAll([2, 6, 3], 0, 1, 2) = []
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static int[] removeAll(final int[] array, final int... indices) {
@@ -5458,10 +5459,10 @@ public static int[] removeAll(final int[] array, final int... indices) {
      * ArrayUtils.removeAll([2, 6, 3], 0, 1, 2) = []
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static long[] removeAll(final long[] array, final int... indices) {
@@ -5540,10 +5541,10 @@ static Object removeAll(final Object array, final int... indices) {
      * ArrayUtils.removeAll([2, 6, 3], 0, 1, 2) = []
      * </pre>
      *
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     public static short[] removeAll(final short[] array, final int... indices) {
@@ -5565,11 +5566,11 @@ public static short[] removeAll(final short[] array, final int... indices) {
      * ArrayUtils.removeAll(["a", "b", "c"], 1, 2) = ["a"]
      * </pre>
      *
-     * @param <T>     the component type of the array.
-     * @param array   the array to remove the element from, may not be {@code null}.
-     * @param indices the positions of the elements to be removed.
-     * @return A new array containing the existing elements except those at the specified positions.
-     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}.
+     * @param <T>     the component type of the array
+     * @param array   the array to remove the element from, may not be {@code null}
+     * @param indices the positions of the elements to be removed
+     * @return a new array containing the existing elements except those at the specified positions
+     * @throws IndexOutOfBoundsException if any index is out of range (index &lt; 0 || index &gt;= array.length), or if the array is {@code null}
      * @since 3.0.1
      */
     @SuppressWarnings("unchecked") // removeAll() always creates an array of the same type as its input
@@ -5585,9 +5586,9 @@ public static <T> T[] removeAll(final T[] array, final int... indices) {
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(boolean[], boolean)}.
      */
@@ -5604,9 +5605,9 @@ public static boolean[] removeAllOccurences(final boolean[] array, final boolean
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(byte[], byte)}.
      */
@@ -5623,9 +5624,9 @@ public static byte[] removeAllOccurences(final byte[] array, final byte element)
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(char[], char)}.
      */
@@ -5642,9 +5643,9 @@ public static char[] removeAllOccurences(final char[] array, final char element)
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(double[], double)}.
      */
@@ -5661,9 +5662,9 @@ public static double[] removeAllOccurences(final double[] array, final double el
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(float[], float)}.
      */
@@ -5680,9 +5681,9 @@ public static float[] removeAllOccurences(final float[] array, final float eleme
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(int[], int)}.
      */
@@ -5699,9 +5700,9 @@ public static int[] removeAllOccurences(final int[] array, final int element) {
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(long[], long)}.
      */
@@ -5718,9 +5719,9 @@ public static long[] removeAllOccurences(final long[] array, final long element)
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(short[], short)}.
      */
@@ -5737,10 +5738,10 @@ public static short[] removeAllOccurences(final short[] array, final short eleme
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param <T> the type of object in the array, may be {@code null}.
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove, may be {@code null}.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param <T> the type of object in the array, may be {@code null}
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove, may be {@code null}
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.5
      * @deprecated Use {@link #removeAllOccurrences(Object[], Object)}.
      */
@@ -5757,9 +5758,9 @@ public static <T> T[] removeAllOccurences(final T[] array, final T element) {
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static boolean[] removeAllOccurrences(final boolean[] array, final boolean element) {
@@ -5774,9 +5775,9 @@ public static boolean[] removeAllOccurrences(final boolean[] array, final boolea
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static byte[] removeAllOccurrences(final byte[] array, final byte element) {
@@ -5791,9 +5792,9 @@ public static byte[] removeAllOccurrences(final byte[] array, final byte element
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static char[] removeAllOccurrences(final char[] array, final char element) {
@@ -5808,9 +5809,9 @@ public static char[] removeAllOccurrences(final char[] array, final char element
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static double[] removeAllOccurrences(final double[] array, final double element) {
@@ -5825,9 +5826,9 @@ public static double[] removeAllOccurrences(final double[] array, final double e
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static float[] removeAllOccurrences(final float[] array, final float element) {
@@ -5842,9 +5843,9 @@ public static float[] removeAllOccurrences(final float[] array, final float elem
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static int[] removeAllOccurrences(final int[] array, final int element) {
@@ -5859,9 +5860,9 @@ public static int[] removeAllOccurrences(final int[] array, final int element) {
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static long[] removeAllOccurrences(final long[] array, final long element) {
@@ -5876,9 +5877,9 @@ public static long[] removeAllOccurrences(final long[] array, final long element
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static short[] removeAllOccurrences(final short[] array, final short element) {
@@ -5893,10 +5894,10 @@ public static short[] removeAllOccurrences(final short[] array, final short elem
      * {@code null} will be returned if the input array is {@code null}.
      * </p>
      *
-     * @param <T> the type of object in the array, may be {@code null}.
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param element the element to remove, may be {@code null}.
-     * @return A new array containing the existing elements except the occurrences of the specified element.
+     * @param <T> the type of object in the array, may be {@code null}
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param element the element to remove, may be {@code null}
+     * @return a new array containing the existing elements except the occurrences of the specified element
      * @since 3.10
      */
     public static <T> T[] removeAllOccurrences(final T[] array, final T element) {
@@ -5906,9 +5907,9 @@ public static <T> T[] removeAllOccurrences(final T[] array, final T element) {
     /**
      * Removes multiple array elements specified by indices.
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param indices to remove.
-     * @return new array of same type minus elements specified by the set bits in {@code indices}.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param indices to remove
+     * @return new array of same type minus elements specified by the set bits in {@code indices}
      */
     // package protected for access by unit tests
     static Object removeAt(final Object array, final BitSet indices) {
@@ -5962,10 +5963,10 @@ static Object removeAt(final Object array, final BitSet indices) {
      * ArrayUtils.removeElement([true, false, true], true) = [false, true]
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static boolean[] removeElement(final boolean[] array, final boolean element) {
@@ -5992,10 +5993,10 @@ public static boolean[] removeElement(final boolean[] array, final boolean eleme
      * ArrayUtils.removeElement([1, 0, 1], 1)   = [0, 1]
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static byte[] removeElement(final byte[] array, final byte element) {
@@ -6022,10 +6023,10 @@ public static byte[] removeElement(final byte[] array, final byte element) {
      * ArrayUtils.removeElement(['a', 'b', 'a'], 'a') = ['b', 'a']
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static char[] removeElement(final char[] array, final char element) {
@@ -6052,10 +6053,10 @@ public static char[] removeElement(final char[] array, final char element) {
      * ArrayUtils.removeElement([1.1, 2.3, 1.1], 1.1) = [2.3, 1.1]
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static double[] removeElement(final double[] array, final double element) {
@@ -6082,10 +6083,10 @@ public static double[] removeElement(final double[] array, final double element)
      * ArrayUtils.removeElement([1.1, 2.3, 1.1], 1.1) = [2.3, 1.1]
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static float[] removeElement(final float[] array, final float element) {
@@ -6112,10 +6113,10 @@ public static float[] removeElement(final float[] array, final float element) {
      * ArrayUtils.removeElement([1, 3, 1], 1) = [3, 1]
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static int[] removeElement(final int[] array, final int element) {
@@ -6142,10 +6143,10 @@ public static int[] removeElement(final int[] array, final int element) {
      * ArrayUtils.removeElement([1, 3, 1], 1) = [3, 1]
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static long[] removeElement(final long[] array, final long element) {
@@ -6172,10 +6173,10 @@ public static long[] removeElement(final long[] array, final long element) {
      * ArrayUtils.removeElement([1, 3, 1], 1) = [3, 1]
      * </pre>
      *
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static short[] removeElement(final short[] array, final short element) {
@@ -6203,10 +6204,10 @@ public static short[] removeElement(final short[] array, final short element) {
      * </pre>
      *
      * @param <T> the component type of the array
-     * @param array the input array, may be {@code null}.
-     * @param element  the element to be removed, may be {@code null}.
-     * @return A new array containing the existing elements except the first
-     *         occurrence of the specified element.
+     * @param array the input array, may be {@code null}
+     * @param element  the element to be removed, may be {@code null}
+     * @return a new array containing the existing elements except the first
+     *         occurrence of the specified element
      * @since 2.1
      */
     public static <T> T[] removeElement(final T[] array, final Object element) {
@@ -6235,10 +6236,10 @@ public static <T> T[] removeElement(final T[] array, final Object element) {
      * ArrayUtils.removeElements([true, false, true], true, true) = [false]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static boolean[] removeElements(final boolean[] array, final boolean... values) {
@@ -6284,10 +6285,10 @@ public static boolean[] removeElements(final boolean[] array, final boolean... v
      * ArrayUtils.removeElements([1, 3, 1], 1, 1) = [3]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static byte[] removeElements(final byte[] array, final byte... values) {
@@ -6333,10 +6334,10 @@ public static byte[] removeElements(final byte[] array, final byte... values) {
      * ArrayUtils.removeElements([1, 3, 1], 1, 1) = [3]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static char[] removeElements(final char[] array, final char... values) {
@@ -6382,10 +6383,10 @@ public static char[] removeElements(final char[] array, final char... values) {
      * ArrayUtils.removeElements([1, 3, 1], 1, 1) = [3]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static double[] removeElements(final double[] array, final double... values) {
@@ -6431,10 +6432,10 @@ public static double[] removeElements(final double[] array, final double... valu
      * ArrayUtils.removeElements([1, 3, 1], 1, 1) = [3]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static float[] removeElements(final float[] array, final float... values) {
@@ -6480,10 +6481,10 @@ public static float[] removeElements(final float[] array, final float... values)
      * ArrayUtils.removeElements([1, 3, 1], 1, 1) = [3]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static int[] removeElements(final int[] array, final int... values) {
@@ -6529,10 +6530,10 @@ public static int[] removeElements(final int[] array, final int... values) {
      * ArrayUtils.removeElements([1, 3, 1], 1, 1) = [3]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static long[] removeElements(final long[] array, final long... values) {
@@ -6578,10 +6579,10 @@ public static long[] removeElements(final long[] array, final long... values) {
      * ArrayUtils.removeElements([1, 3, 1], 1, 1) = [3]
      * </pre>
      *
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     public static short[] removeElements(final short[] array, final short... values) {
@@ -6628,10 +6629,10 @@ public static short[] removeElements(final short[] array, final short... values)
      * </pre>
      *
      * @param <T> the component type of the array
-     * @param array the input array, will not be modified, and may be {@code null}.
-     * @param values  the values to be removed.
-     * @return A new array containing the existing elements except the
-     *         earliest-encountered occurrences of the specified elements.
+     * @param array the input array, will not be modified, and may be {@code null}
+     * @param values  the values to be removed
+     * @return a new array containing the existing elements except the
+     *         earliest-encountered occurrences of the specified elements
      * @since 3.0.1
      */
     @SafeVarargs
@@ -6665,7 +6666,7 @@ public static <T> T[] removeElements(final T[] array, final T... values) {
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final boolean[] array) {
         if (array != null) {
@@ -6680,7 +6681,7 @@ public static void reverse(final boolean[] array) {
      * </p>
      *
      * @param array
-     *            the array to reverse, may be {@code null}.
+     *            the array to reverse, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -6711,7 +6712,7 @@ public static void reverse(final boolean[] array, final int startIndexInclusive,
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final byte[] array) {
         if (array != null) {
@@ -6725,7 +6726,7 @@ public static void reverse(final byte[] array) {
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array               the array to reverse, may be {@code null}.
+     * @param array               the array to reverse, may be {@code null}
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no change.
      * @param endIndexExclusive   elements up to endIndex-1 are reversed in the array. Undervalue (&lt; start index) results in no change. Overvalue
      *                            (&gt;array.length) is demoted to array length.
@@ -6753,7 +6754,7 @@ public static void reverse(final byte[] array, final int startIndexInclusive, fi
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final char[] array) {
         if (array != null) {
@@ -6767,7 +6768,7 @@ public static void reverse(final char[] array) {
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array               the array to reverse, may be {@code null}.
+     * @param array               the array to reverse, may be {@code null}
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no change.
      * @param endIndexExclusive   elements up to endIndex-1 are reversed in the array. Undervalue (&lt; start index) results in no change. Overvalue
      *                            (&gt;array.length) is demoted to array length.
@@ -6795,7 +6796,7 @@ public static void reverse(final char[] array, final int startIndexInclusive, fi
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final double[] array) {
         if (array != null) {
@@ -6809,7 +6810,7 @@ public static void reverse(final double[] array) {
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array               the array to reverse, may be {@code null}.
+     * @param array               the array to reverse, may be {@code null}
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no change.
      * @param endIndexExclusive   elements up to endIndex-1 are reversed in the array. Undervalue (&lt; start index) results in no change. Overvalue
      *                            (&gt;array.length) is demoted to array length.
@@ -6837,7 +6838,7 @@ public static void reverse(final double[] array, final int startIndexInclusive,
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final float[] array) {
         if (array != null) {
@@ -6851,7 +6852,7 @@ public static void reverse(final float[] array) {
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array               the array to reverse, may be {@code null}.
+     * @param array               the array to reverse, may be {@code null}
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no change.
      * @param endIndexExclusive   elements up to endIndex-1 are reversed in the array. Undervalue (&lt; start index) results in no change. Overvalue
      *                            (&gt;array.length) is demoted to array length.
@@ -6879,7 +6880,7 @@ public static void reverse(final float[] array, final int startIndexInclusive, f
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final int[] array) {
         if (array != null) {
@@ -6894,7 +6895,7 @@ public static void reverse(final int[] array) {
      * </p>
      *
      * @param array
-     *            the array to reverse, may be {@code null}.
+     *            the array to reverse, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -6925,7 +6926,7 @@ public static void reverse(final int[] array, final int startIndexInclusive, fin
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final long[] array) {
         if (array != null) {
@@ -6940,7 +6941,7 @@ public static void reverse(final long[] array) {
      * </p>
      *
      * @param array
-     *            the array to reverse, may be {@code null}.
+     *            the array to reverse, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -6974,7 +6975,7 @@ public static void reverse(final long[] array, final int startIndexInclusive, fi
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final Object[] array) {
         if (array != null) {
@@ -6989,7 +6990,7 @@ public static void reverse(final Object[] array) {
      * </p>
      *
      * @param array
-     *            the array to reverse, may be {@code null}.
+     *            the array to reverse, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Under value (&lt;0) is promoted to 0, over value (&gt;array.length) results in no
      *            change.
@@ -7020,7 +7021,7 @@ public static void reverse(final Object[] array, final int startIndexInclusive,
      * This method does nothing for a {@code null} input array.
      * </p>
      *
-     * @param array  the array to reverse, may be {@code null}.
+     * @param array the array to reverse, may be {@code null}
      */
     public static void reverse(final short[] array) {
         if (array != null) {
@@ -7035,7 +7036,7 @@ public static void reverse(final short[] array) {
      * </p>
      *
      * @param array
-     *            the array to reverse, may be {@code null}.
+     *            the array to reverse, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7067,9 +7068,9 @@ public static void reverse(final short[] array, final int startIndexInclusive, f
      * state.
      * </p>
      *
-     * @param <T> type of elements of the array, may be {@code null}.
-     * @param array array to be initialized, may be {@code null}.
-     * @param generator a function accepting an index and producing the desired value for that position.
+     * @param <T> type of elements of the array, may be {@code null}
+     * @param array array to be initialized, may be {@code null}
+     * @param generator a function accepting an index and producing the desired value for that position
      * @return the input array
      * @since 3.13.0
      */
@@ -7087,9 +7088,9 @@ public static <T> T[] setAll(final T[] array, final IntFunction<? extends T> gen
      * state.
      * </p>
      *
-     * @param <T> type of elements of the array, may be {@code null}.
-     * @param array array to be initialized, may be {@code null}.
-     * @param generator a function accepting an index and producing the desired value for that position.
+     * @param <T> type of elements of the array, may be {@code null}
+     * @param array array to be initialized, may be {@code null}
+     * @param generator a function accepting an index and producing the desired value for that position
      * @return the input array
      * @since 3.13.0
      */
@@ -7108,7 +7109,7 @@ public static <T> T[] setAll(final T[] array, final Supplier<? extends T> genera
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7127,7 +7128,7 @@ public static void shift(final boolean[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7178,7 +7179,7 @@ public static void shift(final boolean[] array, int startIndexInclusive, int end
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7197,7 +7198,7 @@ public static void shift(final byte[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7248,7 +7249,7 @@ public static void shift(final byte[] array, int startIndexInclusive, int endInd
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7267,7 +7268,7 @@ public static void shift(final char[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7318,7 +7319,7 @@ public static void shift(final char[] array, int startIndexInclusive, int endInd
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7337,7 +7338,7 @@ public static void shift(final double[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7388,7 +7389,7 @@ public static void shift(final double[] array, int startIndexInclusive, int endI
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7407,7 +7408,7 @@ public static void shift(final float[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7458,7 +7459,7 @@ public static void shift(final float[] array, int startIndexInclusive, int endIn
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7477,7 +7478,7 @@ public static void shift(final int[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7528,7 +7529,7 @@ public static void shift(final int[] array, int startIndexInclusive, int endInde
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7547,7 +7548,7 @@ public static void shift(final long[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7598,7 +7599,7 @@ public static void shift(final long[] array, int startIndexInclusive, int endInd
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7617,7 +7618,7 @@ public static void shift(final Object[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7668,7 +7669,7 @@ public static void shift(final Object[] array, int startIndexInclusive, int endI
      * <p>There is no special handling for multi-dimensional arrays. This method
      * does nothing for {@code null} or empty input arrays.</p>
      *
-     * @param array  the array to shift, may be {@code null}.
+     * @param array  the array to shift, may be {@code null}
      * @param offset
      *          The number of positions to rotate the elements.  If the offset is larger than the number of elements to
      *          rotate, than the effective offset is modulo the number of elements to rotate.
@@ -7687,7 +7688,7 @@ public static void shift(final short[] array, final int offset) {
      * does nothing for {@code null} or empty input arrays.</p>
      *
      * @param array
-     *            the array to shift, may be {@code null}.
+     *            the array to shift, may be {@code null}
      * @param startIndexInclusive
      *            the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in no
      *            change.
@@ -7743,7 +7744,7 @@ public static void shift(final short[] array, int startIndexInclusive, int endIn
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7755,8 +7756,8 @@ public static void shuffle(final boolean[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7779,7 +7780,7 @@ public static void shuffle(final boolean[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7791,8 +7792,8 @@ public static void shuffle(final byte[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7815,7 +7816,7 @@ public static void shuffle(final byte[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7827,8 +7828,8 @@ public static void shuffle(final char[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7851,7 +7852,7 @@ public static void shuffle(final char[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7863,8 +7864,8 @@ public static void shuffle(final double[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7887,7 +7888,7 @@ public static void shuffle(final double[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7899,8 +7900,8 @@ public static void shuffle(final float[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7923,7 +7924,7 @@ public static void shuffle(final float[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7935,8 +7936,8 @@ public static void shuffle(final int[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7959,7 +7960,7 @@ public static void shuffle(final int[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7971,8 +7972,8 @@ public static void shuffle(final long[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -7995,7 +7996,7 @@ public static void shuffle(final long[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -8007,8 +8008,8 @@ public static void shuffle(final Object[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -8031,7 +8032,7 @@ public static void shuffle(final Object[] array, final Random random) {
      * with a {@link SecureRandom} argument.
      * </p>
      *
-     * @param array the array to shuffle.
+     * @param array the array to shuffle
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -8043,8 +8044,8 @@ public static void shuffle(final short[] array) {
      * Shuffles randomly the elements of the specified array using the <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle
      * algorithm</a>.
      *
-     * @param array  the array to shuffle, no-op if {@code null}.
-     * @param random the source of randomness used to permute the elements, no-op if {@code null}.
+     * @param array  the array to shuffle, no-op if {@code null}
+     * @param random the source of randomness used to permute the elements, no-op if {@code null}
      * @see <a href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle">Fisher-Yates shuffle algorithm</a>
      * @since 3.6
      */
@@ -8062,9 +8063,9 @@ public static void shuffle(final short[] array, final Random random) {
      * If both arrays are null, the method returns true. The method return false when one array is null and the other not.
      * </p>
      *
-     * @param data     The data to search, maybe larger than the expected data.
-     * @param expected The expected data to find.
-     * @return whether a match was found.
+     * @param data     the data to search, maybe larger than the expected data
+     * @param expected the expected data to find
+     * @return whether a match was found
      * @since 3.18.0
      */
     public static boolean startsWith(final byte[] data, final byte[] expected) {
@@ -8097,13 +8098,13 @@ public static boolean startsWith(final byte[] data, final byte[] expected) {
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(boolean[], int, int)
+     * @since 2.1
      */
     public static boolean[] subarray(final boolean[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8124,13 +8125,13 @@ public static boolean[] subarray(final boolean[] array, int startIndexInclusive,
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(byte[], int, int)
+     * @since 2.1
      */
     public static byte[] subarray(final byte[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8151,13 +8152,13 @@ public static byte[] subarray(final byte[] array, int startIndexInclusive, int e
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(char[], int, int)
+     * @since 2.1
      */
     public static char[] subarray(final char[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8178,13 +8179,13 @@ public static char[] subarray(final char[] array, int startIndexInclusive, int e
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(double[], int, int)
+     * @since 2.1
      */
     public static double[] subarray(final double[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8205,13 +8206,13 @@ public static double[] subarray(final double[] array, int startIndexInclusive, i
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(float[], int, int)
+     * @since 2.1
      */
     public static float[] subarray(final float[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8232,13 +8233,13 @@ public static float[] subarray(final float[] array, int startIndexInclusive, int
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(int[], int, int)
+     * @since 2.1
      */
     public static int[] subarray(final int[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8259,13 +8260,13 @@ public static int[] subarray(final int[] array, int startIndexInclusive, int end
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(long[], int, int)
+     * @since 2.1
      */
     public static long[] subarray(final long[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8286,13 +8287,13 @@ public static long[] subarray(final long[] array, int startIndexInclusive, int e
      * The start index is inclusive, the end index exclusive. Null array input produces null output.
      * </p>
      *
-     * @param array               the input array.
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(short[], int, int)
+     * @since 2.1
      */
     public static short[] subarray(final short[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8322,14 +8323,14 @@ public static short[] subarray(final short[] array, int startIndexInclusive, int
      * Date[] someDates = (Date[]) ArrayUtils.subarray(allDates, 2, 5);
      * </pre>
      *
-     * @param <T>                 the component type of the array.
-     * @param array               the input array.
+     * @param <T>                 the component type of the array
+     * @param array               the input array
      * @param startIndexInclusive the starting index. Undervalue (&lt;0) is promoted to 0, overvalue (&gt;array.length) results in an empty array.
      * @param endIndexExclusive   elements up to endIndex-1 are present in the returned subarray. Undervalue (&lt; startIndex) produces empty array, overvalue
      *                            (&gt;array.length) is demoted to array length.
-     * @return a new array containing the elements between the start and end indices.
-     * @since 2.1
+     * @return a new array containing the elements between the start and end indices
      * @see Arrays#copyOfRange(Object[], int, int)
+     * @since 2.1
      */
     public static <T> T[] subarray(final T[] array, int startIndexInclusive, int endIndexExclusive) {
         if (array == null) {
@@ -8361,9 +8362,9 @@ public static <T> T[] subarray(final T[] array, int startIndexInclusive, int end
      *     <li>ArrayUtils.swap([1, 2, 3], -1, 1) -&gt; [2, 1, 3]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final boolean[] array, final int offset1, final int offset2) {
@@ -8388,10 +8389,10 @@ public static void swap(final boolean[] array, final int offset1, final int offs
      *     <li>ArrayUtils.swap([true, false, true, false], 0, 3, 3) -&gt; [false, false, true, true]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final boolean[] array, int offset1, int offset2, int len) {
@@ -8424,9 +8425,9 @@ public static void swap(final boolean[] array, int offset1, int offset2, int len
      *     <li>ArrayUtils.swap([1, 2, 3], -1, 1) -&gt; [2, 1, 3]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final byte[] array, final int offset1, final int offset2) {
@@ -8451,10 +8452,10 @@ public static void swap(final byte[] array, final int offset1, final int offset2
      *     <li>ArrayUtils.swap([1, 2, 3, 4], 0, 3, 3) -&gt; [4, 2, 3, 1]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final byte[] array, int offset1, int offset2, int len) {
@@ -8487,9 +8488,9 @@ public static void swap(final byte[] array, int offset1, int offset2, int len) {
      *     <li>ArrayUtils.swap([1, 2, 3], -1, 1) -&gt; [2, 1, 3]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final char[] array, final int offset1, final int offset2) {
@@ -8514,10 +8515,10 @@ public static void swap(final char[] array, final int offset1, final int offset2
      *     <li>ArrayUtils.swap([1, 2, 3, 4], 0, 3, 3) -&gt; [4, 2, 3, 1]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final char[] array, int offset1, int offset2, int len) {
@@ -8550,9 +8551,9 @@ public static void swap(final char[] array, int offset1, int offset2, int len) {
      *     <li>ArrayUtils.swap([1, 2, 3], -1, 1) -&gt; [2, 1, 3]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final double[] array, final int offset1, final int offset2) {
@@ -8577,10 +8578,10 @@ public static void swap(final double[] array, final int offset1, final int offse
      *     <li>ArrayUtils.swap([1, 2, 3, 4], 0, 3, 3) -&gt; [4, 2, 3, 1]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final double[] array,  int offset1, int offset2, int len) {
@@ -8613,9 +8614,9 @@ public static void swap(final double[] array,  int offset1, int offset2, int len
      *     <li>ArrayUtils.swap([1, 2, 3], -1, 1) -&gt; [2, 1, 3]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final float[] array, final int offset1, final int offset2) {
@@ -8640,10 +8641,10 @@ public static void swap(final float[] array, final int offset1, final int offset
      *     <li>ArrayUtils.swap([1, 2, 3, 4], 0, 3, 3) -&gt; [4, 2, 3, 1]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final float[] array, int offset1, int offset2, int len) {
@@ -8677,9 +8678,9 @@ public static void swap(final float[] array, int offset1, int offset2, int len)
      *     <li>ArrayUtils.swap([1, 2, 3], -1, 1) -&gt; [2, 1, 3]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final int[] array, final int offset1, final int offset2) {
@@ -8704,10 +8705,10 @@ public static void swap(final int[] array, final int offset1, final int offset2)
      *     <li>ArrayUtils.swap([1, 2, 3, 4], 0, 3, 3) -&gt; [4, 2, 3, 1]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final int[] array,  int offset1, int offset2, int len) {
@@ -8740,9 +8741,9 @@ public static void swap(final int[] array,  int offset1, int offset2, int len) {
      *     <li>ArrayUtils.swap([true, false, true], -1, 1) -&gt; [false, true, true]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final long[] array, final int offset1, final int offset2) {
@@ -8767,10 +8768,10 @@ public static void swap(final long[] array, final int offset1, final int offset2
      *     <li>ArrayUtils.swap([1, 2, 3, 4], 0, 3, 3) -&gt; [4, 2, 3, 1]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final long[] array,  int offset1, int offset2, int len) {
@@ -8803,9 +8804,9 @@ public static void swap(final long[] array,  int offset1, int offset2, int len)
      *     <li>ArrayUtils.swap(["1", "2", "3"], -1, 1) -&gt; ["2", "1", "3"]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final Object[] array, final int offset1, final int offset2) {
@@ -8830,10 +8831,10 @@ public static void swap(final Object[] array, final int offset1, final int offse
      *     <li>ArrayUtils.swap(["1", "2", "3", "4"], 0, 3, 3) -&gt; ["4", "2", "3", "1"]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final Object[] array,  int offset1, int offset2, int len) {
@@ -8866,9 +8867,9 @@ public static void swap(final Object[] array,  int offset1, int offset2, int len
      *     <li>ArrayUtils.swap([1, 2, 3], -1, 1) -&gt; [2, 1, 3]</li>
      * </ul>
      *
-     * @param array  the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element to swap.
-     * @param offset2 the index of the second element to swap.
+     * @param array  the array to swap, may be {@code null}
+     * @param offset1 the index of the first element to swap
+     * @param offset2 the index of the second element to swap
      * @since 3.5
      */
     public static void swap(final short[] array, final int offset1, final int offset2) {
@@ -8893,10 +8894,10 @@ public static void swap(final short[] array, final int offset1, final int offset
      *     <li>ArrayUtils.swap([1, 2, 3, 4], 0, 3, 3) -&gt; [4, 2, 3, 1]</li>
      * </ul>
      *
-     * @param array the array to swap, may be {@code null}.
-     * @param offset1 the index of the first element in the series to swap.
-     * @param offset2 the index of the second element in the series to swap.
-     * @param len the number of elements to swap starting with the given indices.
+     * @param array the array to swap, may be {@code null}
+     * @param offset1 the index of the first element in the series to swap
+     * @param offset2 the index of the second element in the series to swap
+     * @param len the number of elements to swap starting with the given indices
      * @since 3.5
      */
     public static void swap(final short[] array, int offset1, int offset2, int len) {
@@ -8922,12 +8923,12 @@ public static void swap(final short[] array, int offset1, int offset2, int len)
      * The Java language does not allow an array to be created from a generic type:
      * </p>
      * <pre>
-    public static &lt;T&gt; T[] createAnArray(int size) {
-        return new T[size]; // compiler error here
-    }
-    public static &lt;T&gt; T[] createAnArray(int size) {
-        return (T[]) new Object[size]; // ClassCastException at runtime
-    }
+     * public static &lt;T&gt; T[] createAnArray(int size) {
+     * return new T[size]; // compiler error here
+     * }
+     * public static &lt;T&gt; T[] createAnArray(int size) {
+     * return (T[]) new Object[size]; // ClassCastException at runtime
+     * }
      * </pre>
      * <p>
      * Therefore new arrays of generic types can be created with this method.
@@ -8950,9 +8951,9 @@ public static void swap(final short[] array, int offset1, int offset2, int len)
      * {@code new Number[] {Integer.valueOf(42), Double.valueOf(Math.PI)}}.
      * </p>
      *
-     * @param  <T>   the array's element type.
-     * @param  items  the varargs array items, null allowed.
-     * @return the array, not null unless a null array is passed in.
+     * @param <T>   the array's element type
+     * @param items  the varargs array items, null allowed
+     * @return the array, not null unless a null array is passed in
      * @since 3.0
      */
     public static <T> T[] toArray(@SuppressWarnings("unchecked") final T... items) {
@@ -8975,10 +8976,10 @@ public static <T> T[] toArray(@SuppressWarnings("unchecked") final T... items) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array an array whose elements are either a {@link java.util.Map.Entry} or an Array containing at least two elements, may be {@code null}.
-     * @return a {@link Map} that was created from the array.
-     * @throws IllegalArgumentException if one element of this Array is itself an Array containing less than two elements.
-     * @throws IllegalArgumentException if the array contains elements other than {@link java.util.Map.Entry} and an Array.
+     * @param array an array whose elements are either a {@link java.util.Map.Entry} or an Array containing at least two elements, may be {@code null}
+     * @return a {@link Map} that was created from the array
+     * @throws IllegalArgumentException if one element of this Array is itself an Array containing less than two elements
+     * @throws IllegalArgumentException if the array contains elements other than {@link java.util.Map.Entry} and an Array
      */
     public static Map<Object, Object> toMap(final Object[] array) {
         if (array == null) {
@@ -9012,8 +9013,8 @@ public static Map<Object, Object> toMap(final Object[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array  a {@code boolean} array.
-     * @return a {@link Boolean} array, {@code null} if null array input.
+     * @param array  a {@code boolean} array
+     * @return a {@link Boolean} array, {@code null} if null array input
      */
     public static Boolean[] toObject(final boolean[] array) {
         if (array == null) {
@@ -9030,8 +9031,8 @@ public static Boolean[] toObject(final boolean[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array  a {@code byte} array.
-     * @return a {@link Byte} array, {@code null} if null array input.
+     * @param array  a {@code byte} array
+     * @return a {@link Byte} array, {@code null} if null array input
      */
     public static Byte[] toObject(final byte[] array) {
         if (array == null) {
@@ -9048,8 +9049,8 @@ public static Byte[] toObject(final byte[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array a {@code char} array.
-     * @return a {@link Character} array, {@code null} if null array input.
+     * @param array a {@code char} array
+     * @return a {@link Character} array, {@code null} if null array input
      */
     public static Character[] toObject(final char[] array) {
         if (array == null) {
@@ -9066,8 +9067,8 @@ public static Character[] toObject(final char[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array  a {@code double} array.
-     * @return a {@link Double} array, {@code null} if null array input.
+     * @param array  a {@code double} array
+     * @return a {@link Double} array, {@code null} if null array input
      */
     public static Double[] toObject(final double[] array) {
         if (array == null) {
@@ -9084,8 +9085,8 @@ public static Double[] toObject(final double[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array  a {@code float} array.
-     * @return a {@link Float} array, {@code null} if null array input.
+     * @param array  a {@code float} array
+     * @return a {@link Float} array, {@code null} if null array input
      */
     public static Float[] toObject(final float[] array) {
         if (array == null) {
@@ -9102,8 +9103,8 @@ public static Float[] toObject(final float[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array  an {@code int} array.
-     * @return an {@link Integer} array, {@code null} if null array input.
+     * @param array  an {@code int} array
+     * @return an {@link Integer} array, {@code null} if null array input
      */
     public static Integer[] toObject(final int[] array) {
         if (array == null) {
@@ -9120,8 +9121,8 @@ public static Integer[] toObject(final int[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array  a {@code long} array.
-     * @return a {@link Long} array, {@code null} if null array input.
+     * @param array  a {@code long} array
+     * @return a {@link Long} array, {@code null} if null array input
      */
     public static Long[] toObject(final long[] array) {
         if (array == null) {
@@ -9138,8 +9139,8 @@ public static Long[] toObject(final long[] array) {
      *
      * <p>This method returns {@code null} for a {@code null} input array.</p>
      *
-     * @param array  a {@code short} array.
-     * @return a {@link Short} array, {@code null} if null array input.
+     * @param array  a {@code short} array
+     * @return a {@link Short} array, {@code null} if null array input
      */
     public static Short[] toObject(final short[] array) {
         if (array == null) {
@@ -9160,8 +9161,8 @@ public static Short[] toObject(final short[] array) {
      * Null array elements map to false, like {@code Boolean.parseBoolean(null)} and its callers return false.
      * </p>
      *
-     * @param array a {@link Boolean} array, may be {@code null}.
-     * @return a {@code boolean} array, {@code null} if null array input.
+     * @param array a {@link Boolean} array, may be {@code null}
+     * @return a {@code boolean} array, {@code null} if null array input
      */
     public static boolean[] toPrimitive(final Boolean[] array) {
         return toPrimitive(array, false);
@@ -9173,9 +9174,9 @@ public static boolean[] toPrimitive(final Boolean[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Boolean} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return a {@code boolean} array, {@code null} if null array input.
+     * @param array  a {@link Boolean} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return a {@code boolean} array, {@code null} if null array input
      */
     public static boolean[] toPrimitive(final Boolean[] array, final boolean valueForNull) {
         if (array == null) {
@@ -9198,9 +9199,9 @@ public static boolean[] toPrimitive(final Boolean[] array, final boolean valueFo
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Byte} array, may be {@code null}.
-     * @return a {@code byte} array, {@code null} if null array input.
-     * @throws NullPointerException if an array element is {@code null}.
+     * @param array  a {@link Byte} array, may be {@code null}
+     * @return a {@code byte} array, {@code null} if null array input
+     * @throws NullPointerException if an array element is {@code null}
      */
     public static byte[] toPrimitive(final Byte[] array) {
         if (array == null) {
@@ -9222,9 +9223,9 @@ public static byte[] toPrimitive(final Byte[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Byte} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return a {@code byte} array, {@code null} if null array input.
+     * @param array  a {@link Byte} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return a {@code byte} array, {@code null} if null array input
      */
     public static byte[] toPrimitive(final Byte[] array, final byte valueForNull) {
         if (array == null) {
@@ -9247,9 +9248,9 @@ public static byte[] toPrimitive(final Byte[] array, final byte valueForNull) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Character} array, may be {@code null}.
-     * @return a {@code char} array, {@code null} if null array input.
-     * @throws NullPointerException if an array element is {@code null}.
+     * @param array  a {@link Character} array, may be {@code null}
+     * @return a {@code char} array, {@code null} if null array input
+     * @throws NullPointerException if an array element is {@code null}
      */
     public static char[] toPrimitive(final Character[] array) {
         if (array == null) {
@@ -9271,9 +9272,9 @@ public static char[] toPrimitive(final Character[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Character} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return a {@code char} array, {@code null} if null array input.
+     * @param array  a {@link Character} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return a {@code char} array, {@code null} if null array input
      */
     public static char[] toPrimitive(final Character[] array, final char valueForNull) {
         if (array == null) {
@@ -9296,9 +9297,9 @@ public static char[] toPrimitive(final Character[] array, final char valueForNul
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Double} array, may be {@code null}.
-     * @return a {@code double} array, {@code null} if null array input.
-     * @throws NullPointerException if an array element is {@code null}.
+     * @param array  a {@link Double} array, may be {@code null}
+     * @return a {@code double} array, {@code null} if null array input
+     * @throws NullPointerException if an array element is {@code null}
      */
     public static double[] toPrimitive(final Double[] array) {
         if (array == null) {
@@ -9320,9 +9321,9 @@ public static double[] toPrimitive(final Double[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Double} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return a {@code double} array, {@code null} if null array input.
+     * @param array  a {@link Double} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return a {@code double} array, {@code null} if null array input
      */
     public static double[] toPrimitive(final Double[] array, final double valueForNull) {
         if (array == null) {
@@ -9345,9 +9346,9 @@ public static double[] toPrimitive(final Double[] array, final double valueForNu
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Float} array, may be {@code null}.
-     * @return a {@code float} array, {@code null} if null array input.
-     * @throws NullPointerException if an array element is {@code null}.
+     * @param array  a {@link Float} array, may be {@code null}
+     * @return a {@code float} array, {@code null} if null array input
+     * @throws NullPointerException if an array element is {@code null}
      */
     public static float[] toPrimitive(final Float[] array) {
         if (array == null) {
@@ -9369,9 +9370,9 @@ public static float[] toPrimitive(final Float[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Float} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return a {@code float} array, {@code null} if null array input.
+     * @param array  a {@link Float} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return a {@code float} array, {@code null} if null array input
      */
     public static float[] toPrimitive(final Float[] array, final float valueForNull) {
         if (array == null) {
@@ -9394,9 +9395,9 @@ public static float[] toPrimitive(final Float[] array, final float valueForNull)
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Integer} array, may be {@code null}.
-     * @return an {@code int} array, {@code null} if null array input.
-     * @throws NullPointerException if an array element is {@code null}.
+     * @param array  a {@link Integer} array, may be {@code null}
+     * @return an {@code int} array, {@code null} if null array input
+     * @throws NullPointerException if an array element is {@code null}
      */
     public static int[] toPrimitive(final Integer[] array) {
         if (array == null) {
@@ -9418,9 +9419,9 @@ public static int[] toPrimitive(final Integer[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Integer} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return an {@code int} array, {@code null} if null array input.
+     * @param array  a {@link Integer} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return an {@code int} array, {@code null} if null array input
      */
     public static int[] toPrimitive(final Integer[] array, final int valueForNull) {
         if (array == null) {
@@ -9443,9 +9444,9 @@ public static int[] toPrimitive(final Integer[] array, final int valueForNull) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Long} array, may be {@code null}.
-     * @return a {@code long} array, {@code null} if null array input.
-     * @throws NullPointerException if an array element is {@code null}.
+     * @param array  a {@link Long} array, may be {@code null}
+     * @return a {@code long} array, {@code null} if null array input
+     * @throws NullPointerException if an array element is {@code null}
      */
     public static long[] toPrimitive(final Long[] array) {
         if (array == null) {
@@ -9467,9 +9468,9 @@ public static long[] toPrimitive(final Long[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Long} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return a {@code long} array, {@code null} if null array input.
+     * @param array  a {@link Long} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return a {@code long} array, {@code null} if null array input
      */
     public static long[] toPrimitive(final Long[] array, final long valueForNull) {
         if (array == null) {
@@ -9492,8 +9493,8 @@ public static long[] toPrimitive(final Long[] array, final long valueForNull) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  an array of wrapper object.
-     * @return an array of the corresponding primitive type, or the original array.
+     * @param array  an array of wrapper object
+     * @return an array of the corresponding primitive type, or the original array
      * @since 3.5
      */
     public static Object toPrimitive(final Object array) {
@@ -9535,9 +9536,9 @@ public static Object toPrimitive(final Object array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Short} array, may be {@code null}.
-     * @return a {@code byte} array, {@code null} if null array input.
-     * @throws NullPointerException if an array element is {@code null}.
+     * @param array  a {@link Short} array, may be {@code null}
+     * @return a {@code byte} array, {@code null} if null array input
+     * @throws NullPointerException if an array element is {@code null}
      */
     public static short[] toPrimitive(final Short[] array) {
         if (array == null) {
@@ -9559,9 +9560,9 @@ public static short[] toPrimitive(final Short[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array  a {@link Short} array, may be {@code null}.
-     * @param valueForNull  the value to insert if {@code null} found.
-     * @return a {@code byte} array, {@code null} if null array input.
+     * @param array  a {@link Short} array, may be {@code null}
+     * @param valueForNull  the value to insert if {@code null} found
+     * @return a {@code byte} array, {@code null} if null array input
      */
     public static short[] toPrimitive(final Short[] array, final short valueForNull) {
         if (array == null) {
@@ -9588,8 +9589,8 @@ public static short[] toPrimitive(final Short[] array, final short valueForNull)
      * The format is that of Java source code, for example {@code {a,b}}.
      * </p>
      *
-     * @param array  the array to get a toString for, may be {@code null}.
-     * @return a String representation of the array, '{}' if null array input.
+     * @param array  the array to get a toString for, may be {@code null}
+     * @return a String representation of the array, '{}' if null array input
      */
     public static String toString(final Object array) {
         return toString(array, "{}");
@@ -9605,9 +9606,9 @@ public static String toString(final Object array) {
      * The format is that of Java source code, for example {@code {a,b}}.
      * </p>
      *
-     * @param array  the array to get a toString for, may be {@code null}.
-     * @param stringIfNull  the String to return if the array is {@code null}.
-     * @return a String representation of the array.
+     * @param array  the array to get a toString for, may be {@code null}
+     * @param stringIfNull  the String to return if the array is {@code null}
+     * @return a String representation of the array
      */
     public static String toString(final Object array, final String stringIfNull) {
         return array != null ? new ToStringBuilder(array, ToStringStyle.SIMPLE_STYLE).append(array).toString() : stringIfNull;
@@ -9619,8 +9620,8 @@ public static String toString(final Object array, final String stringIfNull) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array the {@code Object[]} to be processed, may be {@code null}.
-     * @return {@code String[]} of the same size as the source with its element's string representation, {@code null} if null array input.
+     * @param array the {@code Object[]} to be processed, may be {@code null}
+     * @return {@code String[]} of the same size as the source with its element's string representation, {@code null} if null array input
      * @since 3.6
      */
     public static String[] toStringArray(final Object[] array) {
@@ -9633,9 +9634,9 @@ public static String[] toStringArray(final Object[] array) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array                the Object[] to be processed, may be {@code null}.
-     * @param valueForNullElements the value to insert if {@code null} is found.
-     * @return a {@link String} array, {@code null} if null array input.
+     * @param array                the Object[] to be processed, may be {@code null}
+     * @param valueForNullElements the value to insert if {@code null} is found
+     * @return a {@link String} array, {@code null} if null array input
      * @since 3.6
      */
     public static String[] toStringArray(final Object[] array, final String valueForNullElements) {
diff --git a/src/main/java/org/apache/commons/lang3/BitField.java b/src/main/java/org/apache/commons/lang3/BitField.java
index d8412021884..d073597346c 100644
--- a/src/main/java/org/apache/commons/lang3/BitField.java
+++ b/src/main/java/org/apache/commons/lang3/BitField.java
@@ -100,8 +100,8 @@ public BitField(final long mask) {
     /**
      * Clears the bits.
      *
-     * @param holder the int data containing the bits we're interested in.
-     * @return the value of holder with the specified bits cleared (set to {@code 0}).
+     * @param holder the int data containing the bits we're interested in
+     * @return the value of holder with the specified bits cleared (set to {@code 0})
      */
     public int clear(final int holder) {
         return (int) (holder & ~mask);
@@ -110,8 +110,8 @@ public int clear(final int holder) {
     /**
      * Clears the bits.
      *
-     * @param holder the long data containing the bits we're interested in.
-     * @return the value of holder with the specified bits cleared (set to {@code 0}).
+     * @param holder the long data containing the bits we're interested in
+     * @return the value of holder with the specified bits cleared (set to {@code 0})
      * @since 3.21.0
      */
     public long clear(final long holder) {
@@ -121,8 +121,8 @@ public long clear(final long holder) {
     /**
      * Clears the bits.
      *
-     * @param holder the byte data containing the bits we're interested in.
-     * @return the value of holder with the specified bits cleared (set to {@code 0}).
+     * @param holder the byte data containing the bits we're interested in
+     * @return the value of holder with the specified bits cleared (set to {@code 0})
      */
     public byte clearByte(final byte holder) {
         return (byte) clear(holder);
@@ -131,8 +131,8 @@ public byte clearByte(final byte holder) {
     /**
      * Clears the bits.
      *
-     * @param holder the short data containing the bits we're interested in.
-     * @return the value of holder with the specified bits cleared (set to {@code 0}).
+     * @param holder the short data containing the bits we're interested in
+     * @return the value of holder with the specified bits cleared (set to {@code 0})
      */
     public short clearShort(final short holder) {
         return (short) clear(holder);
@@ -141,8 +141,8 @@ public short clearShort(final short holder) {
     /**
      * Gets the value for the specified BitField, unshifted.
      *
-     * @param holder the int data containing the bits we're interested in.
-     * @return the selected bits.
+     * @param holder the int data containing the bits we're interested in
+     * @return the selected bits
      */
     public int getRawValue(final int holder) {
         return (int) (holder & mask);
@@ -151,8 +151,8 @@ public int getRawValue(final int holder) {
     /**
      * Gets the value for the specified BitField, unshifted.
      *
-     * @param holder the long data containing the bits we're interested in.
-     * @return the selected bits.
+     * @param holder the long data containing the bits we're interested in
+     * @return the selected bits
      * @since 3.21.0
      */
     public long getRawValue(final long holder) {
@@ -162,8 +162,8 @@ public long getRawValue(final long holder) {
     /**
      * Obtains the value for the specified BitField, unshifted.
      *
-     * @param holder the short data containing the bits we're interested in.
-     * @return the selected bits.
+     * @param holder the short data containing the bits we're interested in
+     * @return the selected bits
      */
     public short getShortRawValue(final short holder) {
         return (short) getRawValue(holder);
@@ -176,8 +176,8 @@ public short getShortRawValue(final short holder) {
      * so shifted left so many bits).
      * </p>
      *
-     * @param holder the short data containing the bits we're interested in.
-     * @return the selected bits, shifted right appropriately.
+     * @param holder the short data containing the bits we're interested in
+     * @return the selected bits, shifted right appropriately
      * @see #setShortValue(short,short)
      */
     public short getShortValue(final short holder) {
@@ -191,8 +191,8 @@ public short getShortValue(final short holder) {
      * so shifted left so many bits).
      * </p>
      *
-     * @param holder the int data containing the bits we're interested in.
-     * @return the selected bits, shifted right appropriately.
+     * @param holder the int data containing the bits we're interested in
+     * @return the selected bits, shifted right appropriately
      * @see #setValue(int,int)
      */
     public int getValue(final int holder) {
@@ -206,8 +206,8 @@ public int getValue(final int holder) {
      * so shifted left so many bits).
      * </p>
      *
-     * @param holder the long data containing the bits we're interested in.
-     * @return the selected bits, shifted right appropriately.
+     * @param holder the long data containing the bits we're interested in
+     * @return the selected bits, shifted right appropriately
      * @see #setValue(long,long)
      * @since 3.21.0
      */
@@ -221,8 +221,8 @@ public long getValue(final long holder) {
      * This is a stricter test than {@link #isSet(int)}, in that all of the bits in a multi-bit set must be set for this method to return {@code true}.
      * </p>
      *
-     * @param holder the int data containing the bits we're interested in.
-     * @return {@code true} if all of the bits are set, else {@code false}.
+     * @param holder the int data containing the bits we're interested in
+     * @return {@code true} if all of the bits are set, else {@code false}
      */
     public boolean isAllSet(final int holder) {
         return (holder & mask) == mask;
@@ -234,8 +234,8 @@ public boolean isAllSet(final int holder) {
      * This is a stricter test than {@link #isSet(long)}, in that all of the bits in a multi-bit set must be set for this method to return {@code true}.
      * </p>
      *
-     * @param holder the long data containing the bits we're interested in.
-     * @return {@code true} if all of the bits are set, else {@code false}.
+     * @param holder the long data containing the bits we're interested in
+     * @return {@code true} if all of the bits are set, else {@code false}
      * @since 3.21.0
      */
     public boolean isAllSet(final long holder) {
@@ -274,8 +274,8 @@ public boolean isSet(final long holder) {
     /**
      * Sets the bits.
      *
-     * @param holder the int data containing the bits we're interested in.
-     * @return the value of holder with the specified bits set to {@code 1}.
+     * @param holder the int data containing the bits we're interested in
+     * @return the value of holder with the specified bits set to {@code 1}
      */
     public int set(final int holder) {
         return (int) (holder | mask);
@@ -284,8 +284,8 @@ public int set(final int holder) {
     /**
      * Sets the bits.
      *
-     * @param holder the long data containing the bits we're interested in.
-     * @return the value of holder with the specified bits set to {@code 1}.
+     * @param holder the long data containing the bits we're interested in
+     * @return the value of holder with the specified bits set to {@code 1}
      * @since 3.21.0
      */
     public long set(final long holder) {
@@ -295,9 +295,9 @@ public long set(final long holder) {
     /**
      * Sets a boolean BitField.
      *
-     * @param holder the int data containing the bits we're interested in.
-     * @param flag   indicating whether to set or clear the bits.
-     * @return the value of holder with the specified bits set or cleared.
+     * @param holder the int data containing the bits we're interested in
+     * @param flag   indicating whether to set or clear the bits
+     * @return the value of holder with the specified bits set or cleared
      */
     public int setBoolean(final int holder, final boolean flag) {
         return flag ? set(holder) : clear(holder);
@@ -306,9 +306,9 @@ public int setBoolean(final int holder, final boolean flag) {
     /**
      * Sets a boolean BitField.
      *
-     * @param holder the long data containing the bits we're interested in.
-     * @param flag   indicating whether to set or clear the bits.
-     * @return the value of holder with the specified bits set or cleared.
+     * @param holder the long data containing the bits we're interested in
+     * @param flag   indicating whether to set or clear the bits
+     * @return the value of holder with the specified bits set or cleared
      * @since 3.21.0
      */
     public long setBoolean(final long holder, final boolean flag) {
@@ -328,9 +328,9 @@ public byte setByte(final byte holder) {
     /**
      * Sets a boolean BitField.
      *
-     * @param holder the byte data containing the bits we're interested in.
-     * @param flag   indicating whether to set or clear the bits.
-     * @return the value of holder with the specified bits set or cleared.
+     * @param holder the byte data containing the bits we're interested in
+     * @param flag   indicating whether to set or clear the bits
+     * @return the value of holder with the specified bits set or cleared
      */
     public byte setByteBoolean(final byte holder, final boolean flag) {
         return flag ? setByte(holder) : clearByte(holder);
@@ -339,8 +339,8 @@ public byte setByteBoolean(final byte holder, final boolean flag) {
     /**
      * Sets the bits.
      *
-     * @param holder the short data containing the bits we're interested in.
-     * @return the value of holder with the specified bits set to {@code 1}.
+     * @param holder the short data containing the bits we're interested in
+     * @return the value of holder with the specified bits set to {@code 1}
      */
     public short setShort(final short holder) {
         return (short) set(holder);
@@ -349,9 +349,9 @@ public short setShort(final short holder) {
     /**
      * Sets a boolean BitField.
      *
-     * @param holder the short data containing the bits we're interested in.
-     * @param flag   indicating whether to set or clear the bits.
-     * @return the value of holder with the specified bits set or cleared.
+     * @param holder the short data containing the bits we're interested in
+     * @param flag   indicating whether to set or clear the bits
+     * @return the value of holder with the specified bits set or cleared
      */
     public short setShortBoolean(final short holder, final boolean flag) {
         return flag ? setShort(holder) : clearShort(holder);
@@ -372,9 +372,9 @@ public short setShortValue(final short holder, final short value) {
     /**
      * Sets the bits with new values.
      *
-     * @param holder the int data containing the bits we're interested in.
-     * @param value  the new value for the specified bits.
-     * @return the value of holder with the bits from the value parameter replacing the old bits.
+     * @param holder the int data containing the bits we're interested in
+     * @param value  the new value for the specified bits
+     * @return the value of holder with the bits from the value parameter replacing the old bits
      * @see #getValue(int)
      */
     public int setValue(final int holder, final int value) {
@@ -384,9 +384,9 @@ public int setValue(final int holder, final int value) {
     /**
      * Sets the bits with new values.
      *
-     * @param holder the long data containing the bits we're interested in.
-     * @param value  the new value for the specified bits.
-     * @return the value of holder with the bits from the value parameter replacing the old bits.
+     * @param holder the long data containing the bits we're interested in
+     * @param value  the new value for the specified bits
+     * @return the value of holder with the bits from the value parameter replacing the old bits
      * @see #getValue(long)
      * @since 3.21.0
      */
diff --git a/src/main/java/org/apache/commons/lang3/BooleanUtils.java b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
index 7cb0c3e9285..b81e6b80572 100644
--- a/src/main/java/org/apache/commons/lang3/BooleanUtils.java
+++ b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
@@ -94,8 +94,8 @@ public class BooleanUtils {
      * @param array  an array of {@code boolean}s
      * @return the result of the logical 'and' operation. That is {@code false}
      * if any of the parameters is {@code false} and {@code true} otherwise.
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      * @since 3.0.1
      */
     public static boolean and(final boolean... array) {
@@ -126,8 +126,8 @@ public static boolean and(final boolean... array) {
      * @param array  an array of {@link Boolean}s
      * @return the result of the logical 'and' operation. That is {@code false}
      * if any of the parameters is {@code false} and {@code true} otherwise.
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      * @since 3.0.1
      */
     public static Boolean and(final Boolean... array) {
@@ -138,7 +138,7 @@ public static Boolean and(final Boolean... array) {
     /**
      * Returns a new array of possible values (like an enum would).
      *
-     * @return a new array of possible values (like an enum would).
+     * @return a new array of possible values (like an enum would)
      * @since 3.12.0
      */
     public static Boolean[] booleanValues() {
@@ -165,7 +165,7 @@ public static int compare(final boolean x, final boolean y) {
     /**
      * Performs the given action for each Boolean {@link BooleanUtils#values()}.
      *
-     * @param action The action to be performed for each element
+     * @param action the action to be performed for each element
      * @since 3.13.0
      */
     public static void forEach(final Consumer<Boolean> action) {
@@ -279,8 +279,8 @@ public static Boolean negate(final Boolean bool) {
      *
      * @param array  an array of {@code boolean}s
      * @return the result of the one-hot operations
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      */
     public static boolean oneHot(final boolean... array) {
         ObjectUtils.requireNonEmpty(array, "array");
@@ -310,8 +310,8 @@ public static boolean oneHot(final boolean... array) {
      *
      * @param array  an array of {@code boolean}s
      * @return the result of the one-hot operations
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      */
     public static Boolean oneHot(final Boolean... array) {
         return Boolean.valueOf(oneHot(ArrayUtils.toPrimitive(array)));
@@ -330,9 +330,9 @@ public static Boolean oneHot(final Boolean... array) {
      * </pre>
      *
      * @param array  an array of {@code boolean}s
-     * @return {@code true} if any of the arguments is {@code true}, and it returns {@code false} otherwise.
+     * @return {@code true} if any of the arguments is {@code true}, and it returns {@code false} otherwise
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      * @since 3.0.1
      */
     public static boolean or(final boolean... array) {
@@ -363,9 +363,9 @@ public static boolean or(final boolean... array) {
      * </p>
      *
      * @param array  an array of {@link Boolean}s
-     * @return {@code true} if any of the arguments is {@code true}, and it returns {@code false} otherwise.
+     * @return {@code true} if any of the arguments is {@code true}, and it returns {@code false} otherwise
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      * @since 3.0.1
      */
     public static Boolean or(final Boolean... array) {
@@ -376,7 +376,7 @@ public static Boolean or(final Boolean... array) {
     /**
      * Returns a new array of possible values (like an enum would).
      *
-     * @return a new array of possible values (like an enum would).
+     * @return a new array of possible values (like an enum would)
      * @since 3.12.0
      */
     public static boolean[] primitiveValues() {
@@ -660,7 +660,7 @@ public static Boolean toBooleanObject(final Integer value) {
      *
      * <p>The checks are done first for the {@code trueValue}, then for the {@code falseValue} and
      * finally for the {@code nullValue}.</p>
-     **
+     * *
      * <pre>
      *   BooleanUtils.toBooleanObject(Integer.valueOf(0), Integer.valueOf(0), Integer.valueOf(2), Integer.valueOf(3)) = Boolean.TRUE
      *   BooleanUtils.toBooleanObject(Integer.valueOf(0), Integer.valueOf(0), Integer.valueOf(0), Integer.valueOf(3)) = Boolean.TRUE
@@ -1147,7 +1147,7 @@ public static String toStringYesNo(final Boolean bool) {
     /**
      * Returns an unmodifiable list of Booleans {@code [false, true]}.
      *
-     * @return an unmodifiable list of Booleans {@code [false, true]}.
+     * @return an unmodifiable list of Booleans {@code [false, true]}
      * @since 3.13.0
      */
     public static List<Boolean> values() {
@@ -1172,9 +1172,9 @@ public static List<Boolean> values() {
      * </pre>
      *
      * @param array  an array of {@code boolean}s
-     * @return true if the number of true values in the array is odd; otherwise returns false.
+     * @return true if the number of true values in the array is odd; otherwise returns false
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      */
     public static boolean xor(final boolean... array) {
         ObjectUtils.requireNonEmpty(array, "array");
@@ -1203,8 +1203,8 @@ public static boolean xor(final boolean... array) {
      *
      * @param array  an array of {@link Boolean}s
      * @return the result of the xor operations
+     * @throws IllegalArgumentException if {@code array} is empty
      * @throws NullPointerException if {@code array} is {@code null}
-     * @throws IllegalArgumentException if {@code array} is empty.
      */
     public static Boolean xor(final Boolean... array) {
         ObjectUtils.requireNonEmpty(array, "array");
diff --git a/src/main/java/org/apache/commons/lang3/CachedRandomBits.java b/src/main/java/org/apache/commons/lang3/CachedRandomBits.java
index 62904c34627..19fedd85b88 100644
--- a/src/main/java/org/apache/commons/lang3/CachedRandomBits.java
+++ b/src/main/java/org/apache/commons/lang3/CachedRandomBits.java
@@ -46,13 +46,13 @@ final class CachedRandomBits {
      */
     private static final int MAX_CACHE_SIZE = Integer.MAX_VALUE >> 3;
 
-    /** Maximum number of bits that can be generated (size of an int) */
+    /** Maximum number of bits that can be generated (size of an int). */
     private static final int MAX_BITS = 32;
 
-    /** Mask to extract the bit offset within a byte (0-7) */
+    /** Mask to extract the bit offset within a byte (0-7). */
     private static final int BIT_INDEX_MASK = 0x7;
 
-    /** Number of bits in a byte */
+    /** Number of bits in a byte. */
     private static final int BITS_PER_BYTE = 8;
     private final Random random;
     private final byte[] cache;
diff --git a/src/main/java/org/apache/commons/lang3/CharRange.java b/src/main/java/org/apache/commons/lang3/CharRange.java
index a43ade931d9..2ee67054bd0 100644
--- a/src/main/java/org/apache/commons/lang3/CharRange.java
+++ b/src/main/java/org/apache/commons/lang3/CharRange.java
@@ -29,7 +29,7 @@
  * <p>#ThreadSafe#</p>
  *
  * @since 1.0
- * @since 3.20.1 {@code serialVersionUID} changed from {@code 8270183163158333422L} to {@code 2L}.
+ * @since 3.20.1 {@code serialVersionUID} changed from {@code 8270183163158333422L} to {@code 2L}
  */
 // TODO: This is no longer public and will be removed later as CharSet is moved
 // to depend on Range.
@@ -41,7 +41,7 @@ final class CharRange implements Iterable<Character>, Serializable {
      */
     private static final class CharacterIterator implements Iterator<Character> {
 
-        /** The current character */
+        /** The current character. */
         private char current;
 
         private final CharRange range;
@@ -50,7 +50,7 @@ private static final class CharacterIterator implements Iterator<Character> {
         /**
          * Constructs a new iterator for the character range.
          *
-         * @param r The character range.
+         * @param r the character range
          */
         private CharacterIterator(final CharRange r) {
             range = r;
@@ -75,7 +75,7 @@ private CharacterIterator(final CharRange r) {
         /**
          * Tests whether this iterator reached the end character.
          *
-         * @return {@code true} if the iterator has yet to reach the character date.
+         * @return {@code true} if the iterator has yet to reach the character date
          */
         @Override
         public boolean hasNext() {
@@ -85,7 +85,7 @@ public boolean hasNext() {
         /**
          * Returns the next character in the iteration.
          *
-         * @return {@link Character} for the next character.
+         * @return {@link Character} for the next character
          */
         @Override
         public Character next() {
@@ -123,7 +123,7 @@ private void prepareNext() {
         /**
          * Always throws UnsupportedOperationException.
          *
-         * @throws UnsupportedOperationException Always thrown.
+         * @throws UnsupportedOperationException always thrown
          * @see java.util.Iterator#remove()
          */
         @Override
@@ -136,7 +136,7 @@ public void remove() {
      * Required for serialization support. Lang version 2.0.
      *
      * @see java.io.Serializable
-     * @since 3.20.1 {@code serialVersionUID} changed from {@code 8270183163158333422L} to {@value}.
+     * @since 3.20.1 {@code serialVersionUID} changed from {@code 8270183163158333422L} to {@value}
      */
     private static final long serialVersionUID = 2L;
 
@@ -146,8 +146,8 @@ public void remove() {
     /**
      * Constructs a {@link CharRange} over a single character.
      *
-     * @param ch  only character in this range.
-     * @return the new CharRange object.
+     * @param ch  only character in this range
+     * @return the new CharRange object
      * @since 2.5
      */
     public static CharRange is(final char ch) {
@@ -160,9 +160,9 @@ public static CharRange is(final char ch) {
      * <p>If start and end are in the wrong order, they are reversed.
      * Thus {@code a-e} is the same as {@code e-a}.</p>
      *
-     * @param start  first character, inclusive, in this range.
-     * @param end  last character, inclusive, in this range.
-     * @return the new CharRange object.
+     * @param start  first character, inclusive, in this range
+     * @param end  last character, inclusive, in this range
+     * @return the new CharRange object
      * @since 2.5
      */
     public static CharRange isIn(final char start, final char end) {
@@ -175,8 +175,8 @@ public static CharRange isIn(final char start, final char end) {
      * <p>A negated range includes everything except that defined by the
      * single character.</p>
      *
-     * @param ch  only character in this range.
-     * @return the new CharRange object.
+     * @param ch  only character in this range
+     * @return the new CharRange object
      * @since 2.5
      */
     public static CharRange isNot(final char ch) {
@@ -192,9 +192,9 @@ public static CharRange isNot(final char ch) {
      * <p>If start and end are in the wrong order, they are reversed.
      * Thus {@code a-e} is the same as {@code e-a}.</p>
      *
-     * @param start  first character, inclusive, in this range.
-     * @param end  last character, inclusive, in this range.
-     * @return the new CharRange object.
+     * @param start  first character, inclusive, in this range
+     * @param end  last character, inclusive, in this range
+     * @return the new CharRange object
      * @since 2.5
      */
     public static CharRange isNotIn(final char start, final char end) {
@@ -223,9 +223,9 @@ public static CharRange isNotIn(final char start, final char end) {
      * <p>If start and end are in the wrong order, they are reversed.
      * Thus {@code a-e} is the same as {@code e-a}.</p>
      *
-     * @param start  first character, inclusive, in this range.
-     * @param end  last character, inclusive, in this range.
-     * @param negated  true to express everything except the range.
+     * @param start  first character, inclusive, in this range
+     * @param end  last character, inclusive, in this range
+     * @param negated  true to express everything except the range
      */
     private CharRange(char start, char end, final boolean negated) {
         if (start > end) {
@@ -242,8 +242,8 @@ private CharRange(char start, char end, final boolean negated) {
     /**
      * Is the character specified contained in this range.
      *
-     * @param ch  the character to check.
-     * @return {@code true} if this range contains the input character.
+     * @param ch  the character to check
+     * @return {@code true} if this range contains the input character
      */
     public boolean contains(final char ch) {
         return (ch >= start && ch <= end) != negated;
@@ -253,9 +253,9 @@ public boolean contains(final char ch) {
      * Are all the characters of the passed in range contained in
      * this range.
      *
-     * @param range  the range to check against.
-     * @return {@code true} if this range entirely contains the input range.
-     * @throws NullPointerException if {@code null} input.
+     * @param range  the range to check against
+     * @return {@code true} if this range entirely contains the input range
+     * @throws NullPointerException if {@code null} input
      */
     public boolean contains(final CharRange range) {
         Objects.requireNonNull(range, "range");
@@ -275,8 +275,8 @@ public boolean contains(final CharRange range) {
      * Compares two CharRange objects, returning true if they represent
      * exactly the same range of characters defined in the same way.
      *
-     * @param obj  the object to compare to.
-     * @return true if equal.
+     * @param obj  the object to compare to
+     * @return true if equal
      */
     @Override
     public boolean equals(final Object obj) {
@@ -293,7 +293,7 @@ public boolean equals(final Object obj) {
     /**
      * Gets the end character for this character range.
      *
-     * @return the end char (inclusive).
+     * @return the end char (inclusive)
      */
     public char getEnd() {
         return this.end;
@@ -302,7 +302,7 @@ public char getEnd() {
     /**
      * Gets the start character for this character range.
      *
-     * @return the start char (inclusive).
+     * @return the start char (inclusive)
      */
     public char getStart() {
         return this.start;
@@ -311,7 +311,7 @@ public char getStart() {
     /**
      * Gets a hashCode compatible with the equals method.
      *
-     * @return a suitable hashCode.
+     * @return a suitable hashCode
      */
     @Override
     public int hashCode() {
@@ -324,7 +324,7 @@ public int hashCode() {
      * <p>A negated range includes everything except that defined by the
      * start and end characters.</p>
      *
-     * @return {@code true} if negated.
+     * @return {@code true} if negated
      */
     public boolean isNegated() {
         return negated;
@@ -346,7 +346,7 @@ public Iterator<Character> iterator() {
     /**
      * Gets a string representation of the character range.
      *
-     * @return string representation of this range.
+     * @return string representation of this range
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
index a3e274ca905..387f656f06a 100644
--- a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
@@ -41,10 +41,10 @@ private static boolean checkLaterThan1(final CharSequence cs, final CharSequence
     /**
      * Used by the indexOf(CharSequence methods) as a green implementation of indexOf.
      *
-     * @param cs         the {@link CharSequence} to be processed.
-     * @param searchChar the {@link CharSequence} to be searched for.
-     * @param start      the start index.
-     * @return the index where the search sequence was found, or {@code -1} if there is no such occurrence.
+     * @param cs         the {@link CharSequence} to be processed
+     * @param searchChar the {@link CharSequence} to be searched for
+     * @param start      the start index
+     * @return the index where the search sequence was found, or {@code -1} if there is no such occurrence
      */
     static int indexOf(final CharSequence cs, final CharSequence searchChar, final int start) {
         if (cs == null || searchChar == null) {
@@ -101,11 +101,11 @@ static int indexOf(final CharSequence cs, final CharSequence searchChar, final i
      * All indices are specified in {@code char} values (Unicode code units).
      * </p>
      *
-     * @param cs         the {@link CharSequence} to be processed, not null.
-     * @param searchChar the char to be searched for.
-     * @param start      the start index, negative starts at the string start.
-     * @return the index where the search char was found, -1 if not found.
-     * @since 3.6 updated to behave more like {@link String}.
+     * @param cs         the {@link CharSequence} to be processed, not null
+     * @param searchChar the char to be searched for
+     * @param start      the start index, negative starts at the string start
+     * @return the index where the search char was found, -1 if not found
+     * @since 3.6 updated to behave more like {@link String}
      */
     static int indexOf(final CharSequence cs, final int searchChar, int start) {
         if (cs instanceof String) {
@@ -138,12 +138,12 @@ static int indexOf(final CharSequence cs, final int searchChar, int start) {
     }
 
     /**
-     * Used by the lastIndexOf(CharSequence methods) as a green implementation of lastIndexOf
+     * Used by the lastIndexOf(CharSequence methods) as a green implementation of lastIndexOf.
      *
-     * @param cs the {@link CharSequence} to be processed.
-     * @param searchChar the {@link CharSequence} to find.
-     * @param start the start index.
-     * @return the index where the search sequence was found.
+     * @param cs the {@link CharSequence} to be processed
+     * @param searchChar the {@link CharSequence} to find
+     * @param start the start index
+     * @return the index where the search sequence was found
      */
     static int lastIndexOf(final CharSequence cs, final CharSequence searchChar, int start) {
         if (searchChar == null || cs == null) {
@@ -236,11 +236,11 @@ static int lastIndexOf(final CharSequence cs, final CharSequence searchChar, int
      * All indices are specified in {@code char} values (Unicode code units).
      * </p>
      *
-     * @param cs         the {@link CharSequence} to be processed.
-     * @param searchChar the char to be searched for.
-     * @param start      the start index, negative returns -1, beyond length starts at end.
-     * @return the index where the search char was found, -1 if not found.
-     * @since 3.6 updated to behave more like {@link String}.
+     * @param cs         the {@link CharSequence} to be processed
+     * @param searchChar the char to be searched for
+     * @param start      the start index, negative returns -1, beyond length starts at end
+     * @return the index where the search char was found, -1 if not found
+     * @since 3.6 updated to behave more like {@link String}
      */
     static int lastIndexOf(final CharSequence cs, final int searchChar, int start) {
         if (cs instanceof String) {
@@ -283,13 +283,13 @@ static int lastIndexOf(final CharSequence cs, final int searchChar, int start) {
     /**
      * Tests if two string regions are equal.
      *
-     * @param cs the {@link CharSequence} to be processed.
-     * @param ignoreCase whether or not to be case-insensitive.
-     * @param thisStart the index to start on the {@code cs} CharSequence.
-     * @param substring the {@link CharSequence} to be looked for.
-     * @param start the index to start on the {@code substring} CharSequence.
-     * @param length character length of the region.
-     * @return whether the region matched.
+     * @param cs the {@link CharSequence} to be processed
+     * @param ignoreCase whether or not to be case-insensitive
+     * @param thisStart the index to start on the {@code cs} CharSequence
+     * @param substring the {@link CharSequence} to be looked for
+     * @param start the index to start on the {@code substring} CharSequence
+     * @param length character length of the region
+     * @return whether the region matched
      * @see String#regionMatches(boolean, int, String, int, int)
      */
     static boolean regionMatches(final CharSequence cs, final boolean ignoreCase, final int thisStart, final CharSequence substring, final int start,
@@ -339,11 +339,11 @@ static boolean regionMatches(final CharSequence cs, final boolean ignoreCase, fi
      * The length (in {@code char}) of the returned sequence is {@code length() - start},
      * so if {@code start == end} then an empty sequence is returned.</p>
      *
-     * @param cs  the specified subsequence, null returns null.
-     * @param start  the start index, inclusive, valid.
-     * @return a new subsequence, may be null.
+     * @param cs  the specified subsequence, null returns null
+     * @param start  the start index, inclusive, valid
+     * @return a new subsequence, may be null
      * @throws IndexOutOfBoundsException if {@code start} is negative or if
-     *  {@code start} is greater than {@code length()}.
+     *  {@code start} is greater than {@code length()}
      */
     public static CharSequence subSequence(final CharSequence cs, final int start) {
         return cs == null ? null : cs.subSequence(start, cs.length());
@@ -352,8 +352,8 @@ public static CharSequence subSequence(final CharSequence cs, final int start) {
     /**
      * Converts the given CharSequence to a char[].
      *
-     * @param source the {@link CharSequence} to be processed.
-     * @return the resulting char array, never null.
+     * @param source the {@link CharSequence} to be processed
+     * @return the resulting char array, never null
      * @since 3.11
      */
     public static char[] toCharArray(final CharSequence source) {
diff --git a/src/main/java/org/apache/commons/lang3/CharSet.java b/src/main/java/org/apache/commons/lang3/CharSet.java
index a97a54d567e..b8530ab124e 100644
--- a/src/main/java/org/apache/commons/lang3/CharSet.java
+++ b/src/main/java/org/apache/commons/lang3/CharSet.java
@@ -79,7 +79,7 @@ public class CharSet implements Serializable {
 
     /**
      * A Map of the common cases used in the factory.
-     * Subclasses can add more common patterns if desired
+     * Subclasses can add more common patterns if desired.
      *
      * @since 2.0
      */
@@ -152,7 +152,7 @@ public class CharSet implements Serializable {
      *
      * <p>All CharSet objects returned by this method will be immutable.</p>
      *
-     * @param setStrs  Strings to merge into the set, may be null
+     * @param setStrs  strings to merge into the set, may be null
      * @return a CharSet instance
      * @since 2.4
      */
@@ -176,7 +176,7 @@ public static CharSet getInstance(final String... setStrs) {
      * Constructs a new CharSet using the set syntax.
      * Each string is merged in with the set.
      *
-     * @param set  Strings to merge into the initial set
+     * @param set  strings to merge into the initial set
      * @throws NullPointerException if set is {@code null}
      */
     protected CharSet(final String... set) {
@@ -186,7 +186,7 @@ protected CharSet(final String... set) {
     /**
      * Add a set definition string to the {@link CharSet}.
      *
-     * @param str  set definition string
+     * @param str set definition string
      */
     protected void add(final String str) {
         if (str == null) {
diff --git a/src/main/java/org/apache/commons/lang3/CharSetUtils.java b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
index d8dd4aa2124..166048e339e 100644
--- a/src/main/java/org/apache/commons/lang3/CharSetUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
@@ -45,10 +45,10 @@ public class CharSetUtils {
      * CharSetUtils.containsAny("hello", "a-d") = false
      * </pre>
      *
-     * @see CharSet#getInstance(String...) for set-syntax.
-     * @param str  String to look for characters in, may be null
-     * @param set  String[] set of characters to identify, may be null
+     * @param str  string to look for characters in, may be null
+     * @param set  string[] set of characters to identify, may be null
      * @return whether or not the characters in the set are in the primary string
+     * @see CharSet#getInstance(String...) for set-syntax
      * @since 3.2
      */
     public static boolean containsAny(final String str, final String... set) {
@@ -77,10 +77,10 @@ public static boolean containsAny(final String str, final String... set) {
      * CharSetUtils.count("hello", "a-e") = 1
      * </pre>
      *
-     * @see CharSet#getInstance(String...) for set-syntax.
-     * @param str  String to count characters in, may be null
-     * @param set  String[] set of characters to count, may be null
+     * @param str  string to count characters in, may be null
+     * @param set  string[] set of characters to count, may be null
      * @return the character count, zero if null string input
+     * @see CharSet#getInstance(String...) for set-syntax
      */
     public static int count(final String str, final String... set) {
         if (isEmpty(str, set)) {
@@ -100,7 +100,7 @@ public static int count(final String str, final String... set) {
      * Determines whether or not all the Strings in an array are
      * empty or not.
      *
-     * @param strings String[] whose elements are being checked for emptiness
+     * @param strings string[] whose elements are being checked for emptiness
      * @return whether or not the String is empty
      */
     private static boolean deepEmpty(final String[] strings) {
@@ -120,10 +120,10 @@ private static boolean deepEmpty(final String[] strings) {
      * CharSetUtils.delete("hello", "le")  = "ho"
      * </pre>
      *
-     * @see CharSet#getInstance(String...) for set-syntax.
-     * @param str  String to delete characters from, may be null
-     * @param set  String[] set of characters to delete, may be null
+     * @param str  string to delete characters from, may be null
+     * @param set  string[] set of characters to delete, may be null
      * @return the modified String, {@code null} if null string input
+     * @see CharSet#getInstance(String...) for set-syntax
      */
     public static String delete(final String str, final String... set) {
         if (isEmpty(str, set)) {
@@ -149,10 +149,10 @@ private static boolean isEmpty(final String str, final String... set) {
      * CharSetUtils.keep("hello", "le")  = "ell"
      * </pre>
      *
-     * @see CharSet#getInstance(String...) for set-syntax.
-     * @param str  String to keep characters from, may be null
-     * @param set  String[] set of characters to keep, may be null
+     * @param str  string to keep characters from, may be null
+     * @param set  string[] set of characters to keep, may be null
      * @return the modified String, {@code null} if null string input
+     * @see CharSet#getInstance(String...) for set-syntax
      * @since 2.0
      */
     public static String keep(final String str, final String... set) {
@@ -168,8 +168,8 @@ public static String keep(final String str, final String... set) {
     /**
      * Implements delete and keep.
      *
-     * @param str String to modify characters within
-     * @param set String[] set of characters to modify
+     * @param str string to modify characters within
+     * @param set string[] set of characters to modify
      * @param expect whether to evaluate on match, or non-match
      * @return the modified String, not null
      */
@@ -198,10 +198,10 @@ private static String modify(final String str, final String[] set, final boolean
      * CharSetUtils.squeeze("hello", "a-e") = "hello"
      * </pre>
      *
-     * @see CharSet#getInstance(String...) for set-syntax.
      * @param str  the string to squeeze, may be null
      * @param set  the character set to use for manipulation, may be null
      * @return the modified String, {@code null} if null string input
+     * @see CharSet#getInstance(String...) for set-syntax
      */
     public static String squeeze(final String str, final String... set) {
         if (isEmpty(str, set)) {
diff --git a/src/main/java/org/apache/commons/lang3/CharUtils.java b/src/main/java/org/apache/commons/lang3/CharUtils.java
index fda1bf6184e..e8d4f8896b0 100644
--- a/src/main/java/org/apache/commons/lang3/CharUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharUtils.java
@@ -245,8 +245,8 @@ public static boolean isAsciiPrintable(final char ch) {
      *   CharUtils.isHex('&copy;') = false
      * </pre>
      *
-     * @param ch  the character to test.
-     * @return true if character is a hexadecimal character.
+     * @param ch  the character to test
+     * @return true if character is a hexadecimal character
      * @since 3.18.0
      */
     public static boolean isHex(final char ch) {
@@ -311,8 +311,8 @@ public static char toChar(final Character ch, final char defaultValue) {
      *
      * @param str  the character to convert
      * @return the char value of the first letter of the String
-     * @throws NullPointerException if the string is null
      * @throws IllegalArgumentException if the String is empty
+     * @throws NullPointerException if the string is null
      */
     public static char toChar(final String str) {
         Validate.notEmpty(str, "The String must not be empty");
@@ -342,7 +342,7 @@ public static char toChar(final String str, final char defaultValue) {
      * Delegates to {@link Character#valueOf(char)}.
      *
      * @param c the character to convert
-     * @return a {@code Character} representing {@code c}.
+     * @return a {@code Character} representing {@code c}
      * @deprecated Use {@link Character#valueOf(char)}.
      */
     @Deprecated
@@ -426,8 +426,8 @@ public static int toIntValue(final char ch, final int defaultValue) {
      *
      * @param ch  the character to convert, not null
      * @return the int value of the character
-     * @throws NullPointerException if the Character is null
      * @throws IllegalArgumentException if the Character is not ASCII numeric
+     * @throws NullPointerException if the Character is null
      */
     public static int toIntValue(final Character ch) {
         return toIntValue(toChar(ch));
diff --git a/src/main/java/org/apache/commons/lang3/Charsets.java b/src/main/java/org/apache/commons/lang3/Charsets.java
index 4db73473f20..37dc13c19fd 100644
--- a/src/main/java/org/apache/commons/lang3/Charsets.java
+++ b/src/main/java/org/apache/commons/lang3/Charsets.java
@@ -37,8 +37,8 @@ final class Charsets {
     /**
      * Returns the given {@code charset} or the default Charset if {@code charset} is null.
      *
-     * @param charset a Charset or null.
-     * @return the given {@code charset} or the default Charset if {@code charset} is null.
+     * @param charset a Charset or null
+     * @return the given {@code charset} or the default Charset if {@code charset} is null
      */
     static Charset toCharset(final Charset charset) {
         return charset == null ? Charset.defaultCharset() : charset;
@@ -47,9 +47,9 @@ static Charset toCharset(final Charset charset) {
     /**
      * Returns the given {@code charset} or the default Charset if {@code charset} is null.
      *
-     * @param charsetName a Charset or null.
-     * @return the given {@code charset} or the default Charset if {@code charset} is null.
-     * @throws UnsupportedCharsetException If no support for the named charset is available in this instance of the Java
+     * @param charsetName a Charset or null
+     * @return the given {@code charset} or the default Charset if {@code charset} is null
+     * @throws UnsupportedCharsetException if no support for the named charset is available in this instance of the Java
      *                                     virtual machine
      */
     static Charset toCharset(final String charsetName) {
@@ -59,8 +59,8 @@ static Charset toCharset(final String charsetName) {
     /**
      * Returns the given {@code charset} or the default Charset if {@code charset} is null.
      *
-     * @param charsetName a Charset or null.
-     * @return the given {@code charset} or the default Charset if {@code charset} is null.
+     * @param charsetName a Charset or null
+     * @return the given {@code charset} or the default Charset if {@code charset} is null
      */
     static String toCharsetName(final String charsetName) {
         return charsetName == null ? Charset.defaultCharset().name() : charsetName;
diff --git a/src/main/java/org/apache/commons/lang3/ClassLoaderUtils.java b/src/main/java/org/apache/commons/lang3/ClassLoaderUtils.java
index 9e53fef0866..e2ad1a1ea6d 100644
--- a/src/main/java/org/apache/commons/lang3/ClassLoaderUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassLoaderUtils.java
@@ -34,7 +34,7 @@ public class ClassLoaderUtils {
     /**
      * Gets the system class loader's URLs, if any.
      *
-     * @return the system class loader's URLs, if any.
+     * @return the system class loader's URLs, if any
      * @since 3.13.0
      */
     public static URL[] getSystemURLs() {
@@ -44,7 +44,7 @@ public static URL[] getSystemURLs() {
     /**
      * Gets the current thread's context class loader's URLs, if any.
      *
-     * @return the current thread's context class loader's URLs, if any.
+     * @return the current thread's context class loader's URLs, if any
      * @since 3.13.0
      */
     public static URL[] getThreadURLs() {
@@ -58,8 +58,8 @@ private static URL[] getURLs(final ClassLoader cl) {
     /**
      * Converts the given class loader to a String calling {@link #toString(URLClassLoader)}.
      *
-     * @param classLoader to URLClassLoader to convert.
-     * @return the formatted string.
+     * @param classLoader to URLClassLoader to convert
+     * @return the formatted string
      */
     public static String toString(final ClassLoader classLoader) {
         if (classLoader instanceof URLClassLoader) {
@@ -71,8 +71,8 @@ public static String toString(final ClassLoader classLoader) {
     /**
      * Converts the given URLClassLoader to a String in the format {@code "URLClassLoader.toString() + [URL1, URL2, ...]"}.
      *
-     * @param classLoader to URLClassLoader to convert.
-     * @return the formatted string.
+     * @param classLoader to URLClassLoader to convert
+     * @return the formatted string
      */
     public static String toString(final URLClassLoader classLoader) {
         return classLoader != null ? classLoader + Arrays.toString(classLoader.getURLs()) : "null";
diff --git a/src/main/java/org/apache/commons/lang3/ClassPathUtils.java b/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
index db7fbf385db..be50f8465ba 100644
--- a/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
@@ -33,9 +33,9 @@ public class ClassPathUtils {
     /**
      * Converts a package name to a Java path ('/').
      *
-     * @param path the source path.
-     * @return a package name.
-     * @throws NullPointerException if {@code path} is null.
+     * @param path the source path
+     * @return a package name
+     * @throws NullPointerException if {@code path} is null
      * @since 3.13.0
      */
     public static String packageToPath(final String path) {
@@ -45,9 +45,9 @@ public static String packageToPath(final String path) {
     /**
      * Converts a Java path ('/') to a package name.
      *
-     * @param path the source path.
-     * @return a package name.
-     * @throws NullPointerException if {@code path} is null.
+     * @param path the source path
+     * @return a package name
+     * @throws NullPointerException if {@code path} is null
      * @since 3.13.0
      */
     public static String pathToPackage(final String path) {
@@ -65,10 +65,10 @@ public static String pathToPackage(final String path) {
      * ClassPathUtils.toFullyQualifiedName(StringUtils.class, "StringUtils.properties") = "org.apache.commons.lang3.StringUtils.properties"
      * </pre>
      *
-     * @param context      The context for constructing the name.
-     * @param resourceName the resource name to construct the fully qualified name for.
-     * @return the fully qualified name of the resource with name {@code resourceName}.
-     * @throws NullPointerException if either {@code context} or {@code resourceName} is null.
+     * @param context      the context for constructing the name
+     * @param resourceName the resource name to construct the fully qualified name for
+     * @return the fully qualified name of the resource with name {@code resourceName}
+     * @throws NullPointerException if either {@code context} or {@code resourceName} is null
      */
     public static String toFullyQualifiedName(final Class<?> context, final String resourceName) {
         Objects.requireNonNull(context, "context");
@@ -87,10 +87,10 @@ public static String toFullyQualifiedName(final Class<?> context, final String r
      * ClassPathUtils.toFullyQualifiedName(StringUtils.class.getPackage(), "StringUtils.properties") = "org.apache.commons.lang3.StringUtils.properties"
      * </pre>
      *
-     * @param context      The context for constructing the name.
-     * @param resourceName the resource name to construct the fully qualified name for.
-     * @return the fully qualified name of the resource with name {@code resourceName}.
-     * @throws NullPointerException if either {@code context} or {@code resourceName} is null.
+     * @param context      the context for constructing the name
+     * @param resourceName the resource name to construct the fully qualified name for
+     * @return the fully qualified name of the resource with name {@code resourceName}
+     * @throws NullPointerException if either {@code context} or {@code resourceName} is null
      */
     public static String toFullyQualifiedName(final Package context, final String resourceName) {
         Objects.requireNonNull(context, "context");
@@ -109,10 +109,10 @@ public static String toFullyQualifiedName(final Package context, final String re
      * ClassPathUtils.toFullyQualifiedPath(StringUtils.class, "StringUtils.properties") = "org/apache/commons/lang3/StringUtils.properties"
      * </pre>
      *
-     * @param context      The context for constructing the path.
-     * @param resourceName the resource name to construct the fully qualified path for.
-     * @return the fully qualified path of the resource with name {@code resourceName}.
-     * @throws NullPointerException if either {@code context} or {@code resourceName} is null.
+     * @param context      the context for constructing the path
+     * @param resourceName the resource name to construct the fully qualified path for
+     * @return the fully qualified path of the resource with name {@code resourceName}
+     * @throws NullPointerException if either {@code context} or {@code resourceName} is null
      */
     public static String toFullyQualifiedPath(final Class<?> context, final String resourceName) {
         Objects.requireNonNull(context, "context");
@@ -131,10 +131,10 @@ public static String toFullyQualifiedPath(final Class<?> context, final String r
      * ClassPathUtils.toFullyQualifiedPath(StringUtils.class.getPackage(), "StringUtils.properties") = "org/apache/commons/lang3/StringUtils.properties"
      * </pre>
      *
-     * @param context      The context for constructing the path.
-     * @param resourceName the resource name to construct the fully qualified path for.
-     * @return the fully qualified path of the resource with name {@code resourceName}.
-     * @throws NullPointerException if either {@code context} or {@code resourceName} is null.
+     * @param context      the context for constructing the path
+     * @param resourceName the resource name to construct the fully qualified path for
+     * @return the fully qualified path of the resource with name {@code resourceName}
+     * @throws NullPointerException if either {@code context} or {@code resourceName} is null
      */
     public static String toFullyQualifiedPath(final Package context, final String resourceName) {
         Objects.requireNonNull(context, "context");
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index 3032caee6d0..46a33bccf45 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -186,7 +186,7 @@ public enum Interfaces {
     /**
      * Gets the class comparator, comparing by class name.
      *
-     * @return the class comparator.
+     * @return the class comparator
      * @since 3.13.0
      */
     public static Comparator<Class<?>> comparator() {
@@ -200,9 +200,9 @@ public static Comparator<Class<?>> comparator() {
      * A new {@link List} is returned. {@code null} objects will be copied into the returned list as {@code null}.
      * </p>
      *
-     * @param classes the classes to change.
-     * @return a {@link List} of class names corresponding to the Class objects, {@code null} if null input.
-     * @throws ClassCastException if {@code classes} contains a non-{@link Class} entry.
+     * @param classes the classes to change
+     * @return a {@link List} of class names corresponding to the Class objects, {@code null} if null input
+     * @throws ClassCastException if {@code classes} contains a non-{@link Class} entry
      */
     public static List<String> convertClassesToClassNames(final List<Class<?>> classes) {
         return classes == null ? null : classes.stream().map(e -> getName(e, null)).collect(Collectors.toList());
@@ -216,9 +216,9 @@ public static List<String> convertClassesToClassNames(final List<Class<?>> class
      * class name in the {@link List} is {@code null}, {@code null} is stored in the output {@link List}.
      * </p>
      *
-     * @param classNames the classNames to change.
-     * @return a {@link List} of Class objects corresponding to the class names, {@code null} if null input.
-     * @throws ClassCastException if classNames contains a non String entry.
+     * @param classNames the classNames to change
+     * @return a {@link List} of Class objects corresponding to the class names, {@code null} if null input
+     * @throws ClassCastException if classNames contains a non String entry
      */
     public static List<Class<?>> convertClassNamesToClasses(final List<String> classNames) {
         if (classNames == null) {
@@ -238,10 +238,10 @@ public static List<Class<?>> convertClassNamesToClasses(final List<String> class
     /**
      * Gets the abbreviated name of a {@link Class}.
      *
-     * @param cls the class to get the abbreviated name for, may be {@code null}.
-     * @param lengthHint the desired length of the abbreviated name.
-     * @return the abbreviated name or an empty string.
-     * @throws IllegalArgumentException if len &lt;= 0.
+     * @param cls the class to get the abbreviated name for, may be {@code null}
+     * @param lengthHint the desired length of the abbreviated name
+     * @return the abbreviated name or an empty string
+     * @throws IllegalArgumentException if len &lt;= 0
      * @see #getAbbreviatedName(String, int)
      * @since 3.4
      */
@@ -318,11 +318,11 @@ public static String getAbbreviatedName(final Class<?> cls, final int lengthHint
      * </tr>
      * </table>
      *
-     * @param className the className to get the abbreviated name for, may be {@code null}.
-     * @param lengthHint the desired length of the abbreviated name.
+     * @param className the className to get the abbreviated name for, may be {@code null}
+     * @param lengthHint the desired length of the abbreviated name
      * @return the abbreviated name or an empty string if the specified class name is {@code null} or empty string. The
      *         abbreviated name may be longer than the desired length if it cannot be abbreviated to the desired length.
-     * @throws IllegalArgumentException if {@code len <= 0}.
+     * @throws IllegalArgumentException if {@code len <= 0}
      * @since 3.4
      */
     public static String getAbbreviatedName(final String className, final int lengthHint) {
@@ -367,8 +367,8 @@ public static String getAbbreviatedName(final String className, final int length
      * maintained.
      * </p>
      *
-     * @param cls the class to look up, may be {@code null}.
-     * @return the {@link List} of interfaces in order, {@code null} if null input.
+     * @param cls the class to look up, may be {@code null}
+     * @return the {@link List} of interfaces in order, {@code null} if null input
      */
     public static List<Class<?>> getAllInterfaces(final Class<?> cls) {
         if (cls == null) {
@@ -382,8 +382,8 @@ public static List<Class<?>> getAllInterfaces(final Class<?> cls) {
     /**
      * Gets the interfaces for the specified class.
      *
-     * @param cls the class to look up, may be {@code null}.
-     * @param interfacesFound the {@link Set} of interfaces for the class.
+     * @param cls the class to look up, may be {@code null}
+     * @param interfacesFound the {@link Set} of interfaces for the class
      */
     private static void getAllInterfaces(Class<?> cls, final Set<Class<?>> interfacesFound) {
         while (cls != null) {
@@ -404,8 +404,8 @@ private static void getAllInterfaces(Class<?> cls, final Set<Class<?>> interface
      * <li>The last entry is {@link Object}'s class.</li>
      * </ol>
      *
-     * @param cls the class to look up, may be {@code null}.
-     * @return the {@link List} of superclasses in order going up from this one {@code null} if null input.
+     * @param cls the class to look up, may be {@code null}
+     * @return the {@link List} of superclasses in order going up from this one {@code null} if null input
      */
     public static List<Class<?>> getAllSuperclasses(final Class<?> cls) {
         if (cls == null) {
@@ -423,10 +423,10 @@ public static List<Class<?>> getAllSuperclasses(final Class<?> cls) {
     /**
      * Gets the canonical class name for a {@link Class}.
      *
-     * @param cls the class for which to get the canonical class name; may be null.
-     * @return the canonical name of the class, or the empty String.
-     * @since 3.7
+     * @param cls the class for which to get the canonical class name; may be null
+     * @return the canonical name of the class, or the empty String
      * @see Class#getCanonicalName()
+     * @since 3.7
      */
     public static String getCanonicalName(final Class<?> cls) {
         return getCanonicalName(cls, StringUtils.EMPTY);
@@ -435,11 +435,11 @@ public static String getCanonicalName(final Class<?> cls) {
     /**
      * Gets the canonical name for a {@link Class}.
      *
-     * @param cls the class for which to get the canonical class name; may be null.
-     * @param valueIfNull the return value if null.
-     * @return the canonical name of the class, or {@code valueIfNull}.
-     * @since 3.7
+     * @param cls the class for which to get the canonical class name; may be null
+     * @param valueIfNull the return value if null
+     * @return the canonical name of the class, or {@code valueIfNull}
      * @see Class#getCanonicalName()
+     * @since 3.7
      */
     public static String getCanonicalName(final Class<?> cls, final String valueIfNull) {
         if (cls == null) {
@@ -452,10 +452,10 @@ public static String getCanonicalName(final Class<?> cls, final String valueIfNu
     /**
      * Gets the canonical name for an {@link Object}.
      *
-     * @param object the object for which to get the canonical class name; may be null.
-     * @return the canonical name of the object, or the empty String.
-     * @since 3.7
+     * @param object the object for which to get the canonical class name; may be null
+     * @return the canonical name of the object, or the empty String
      * @see Class#getCanonicalName()
+     * @since 3.7
      */
     public static String getCanonicalName(final Object object) {
         return getCanonicalName(object, StringUtils.EMPTY);
@@ -464,11 +464,11 @@ public static String getCanonicalName(final Object object) {
     /**
      * Gets the canonical name for an {@link Object}.
      *
-     * @param object the object for which to get the canonical class name; may be null.
-     * @param valueIfNull the return value if null.
-     * @return the canonical name of the object or {@code valueIfNull}.
-     * @since 3.7
+     * @param object the object for which to get the canonical class name; may be null
+     * @param valueIfNull the return value if null
+     * @return the canonical name of the object or {@code valueIfNull}
      * @see Class#getCanonicalName()
+     * @since 3.7
      */
     public static String getCanonicalName(final Object object, final String valueIfNull) {
         if (object == null) {
@@ -495,9 +495,9 @@ public static String getCanonicalName(final Object object, final String valueIfN
      * </ul>
      * </p>
      *
-     * @param name the name of class.
-     * @return canonical form of class name.
-     * @throws IllegalArgumentException if the class name is invalid.
+     * @param name the name of class
+     * @return canonical form of class name
+     * @throws IllegalArgumentException if the class name is invalid
      */
     private static String getCanonicalName(final String name) {
         String className = StringUtils.deleteWhitespace(name);
@@ -550,13 +550,13 @@ private static String getCanonicalName(final String name) {
      * been collapsed.
      * </p>
      *
-     * @param classLoader the class loader to use to load the class.
-     * @param className the class name.
-     * @return the class represented by {@code className} using the {@code classLoader}.
-     * @throws NullPointerException if the className is null.
-     * @throws ClassNotFoundException if the class is not found.
-     * @throws IllegalArgumentException Thrown if the class name represents an array with more dimensions than the JVM supports, 255.
-     * @throws IllegalArgumentException Thrown if the class name length is greater than 65,535.
+     * @param classLoader the class loader to use to load the class
+     * @param className the class name
+     * @return the class represented by {@code className} using the {@code classLoader}
+     * @throws ClassNotFoundException if the class is not found
+     * @throws IllegalArgumentException thrown if the class name represents an array with more dimensions than the JVM supports, 255
+     * @throws IllegalArgumentException thrown if the class name length is greater than 65,535
+     * @throws NullPointerException if the className is null
      * @see Class#forName(String, boolean, ClassLoader)
      * @see <a href="https://docs.oracle.com/javase/specs/jvms/se25/html/jvms-4.html#jvms-4.4.1">JVM: Array dimension limits in JVM Specification CONSTANT_Class_info</a>
      * @see <a href="https://docs.oracle.com/javase/specs/jls/se25/html/jls-6.html#jls-6.7">JLS: Fully Qualified Names and Canonical Names</a>
@@ -575,14 +575,14 @@ public static Class<?> getClass(final ClassLoader classLoader, final String clas
      * been collapsed.
      * </p>
      *
-     * @param classLoader the class loader to use to load the class.
-     * @param className the class name.
-     * @param initialize whether the class must be initialized.
-     * @return the class represented by {@code className} using the {@code classLoader}.
-     * @throws NullPointerException if the className is null.
-     * @throws ClassNotFoundException if the class is not found.
-     * @throws IllegalArgumentException Thrown if the class name represents an array with more dimensions than the JVM supports, 255.
-     * @throws IllegalArgumentException Thrown if the class name length is greater than 65,535.
+     * @param classLoader the class loader to use to load the class
+     * @param className the class name
+     * @param initialize whether the class must be initialized
+     * @return the class represented by {@code className} using the {@code classLoader}
+     * @throws ClassNotFoundException if the class is not found
+     * @throws IllegalArgumentException thrown if the class name represents an array with more dimensions than the JVM supports, 255
+     * @throws IllegalArgumentException thrown if the class name length is greater than 65,535
+     * @throws NullPointerException if the className is null
      * @see Class#forName(String, boolean, ClassLoader)
      * @see <a href="https://docs.oracle.com/javase/specs/jvms/se25/html/jvms-4.html#jvms-4.4.1">JVM: Array dimension limits in JVM Specification CONSTANT_Class_info</a>
      * @see <a href="https://docs.oracle.com/javase/specs/jls/se25/html/jls-6.html#jls-6.7">JLS: Fully Qualified Names and Canonical Names</a>
@@ -617,10 +617,10 @@ public static Class<?> getClass(final ClassLoader classLoader, final String clas
      *
      * @param className the class name
      * @return the class represented by {@code className} using the current thread's context class loader
-     * @throws NullPointerException if the className is null
      * @throws ClassNotFoundException if the class is not found
-     * @throws IllegalArgumentException Thrown if the class name represents an array with more dimensions than the JVM supports, 255.
-     * @throws IllegalArgumentException Thrown if the class name length is greater than 65,535.
+     * @throws IllegalArgumentException thrown if the class name represents an array with more dimensions than the JVM supports, 255
+     * @throws IllegalArgumentException thrown if the class name length is greater than 65,535
+     * @throws NullPointerException if the className is null
      * @see Class#forName(String, boolean, ClassLoader)
      * @see <a href="https://docs.oracle.com/javase/specs/jvms/se25/html/jvms-4.html#jvms-4.4.1">JVM: Array dimension limits in JVM Specification CONSTANT_Class_info</a>
      * @see <a href="https://docs.oracle.com/javase/specs/jls/se25/html/jls-6.html#jls-6.7">JLS: Fully Qualified Names and Canonical Names</a>
@@ -639,13 +639,13 @@ public static Class<?> getClass(final String className) throws ClassNotFoundExce
      * been collapsed.
      * </p>
      *
-     * @param className the class name.
-     * @param initialize whether the class must be initialized.
-     * @return the class represented by {@code className} using the current thread's context class loader.
-     * @throws NullPointerException if the className is null.
-     * @throws ClassNotFoundException if the class is not found.
-     * @throws IllegalArgumentException Thrown if the class name represents an array with more dimensions than the JVM supports, 255.
-     * @throws IllegalArgumentException Thrown if the class name length is greater than 65,535.
+     * @param className the class name
+     * @param initialize whether the class must be initialized
+     * @return the class represented by {@code className} using the current thread's context class loader
+     * @throws ClassNotFoundException if the class is not found
+     * @throws IllegalArgumentException thrown if the class name represents an array with more dimensions than the JVM supports, 255
+     * @throws IllegalArgumentException thrown if the class name length is greater than 65,535
+     * @throws NullPointerException if the className is null
      * @see Class#forName(String, boolean, ClassLoader)
      * @see <a href="https://docs.oracle.com/javase/specs/jvms/se25/html/jvms-4.html#jvms-4.4.1">JVM: Array dimension limits in JVM Specification CONSTANT_Class_info</a>
      * @see <a href="https://docs.oracle.com/javase/specs/jls/se25/html/jls-6.html#jls-6.7">JLS: Fully Qualified Names and Canonical Names</a>
@@ -660,9 +660,9 @@ public static Class<?> getClass(final String className, final boolean initialize
     /**
      * Delegates to {@link Class#getComponentType()} using generics.
      *
-     * @param <T> The array class type.
-     * @param cls A class or null.
-     * @return The array component type or null.
+     * @param <T> the array class type
+     * @param cls a class or null
+     * @return the array component type or null
      * @see Class#getComponentType()
      * @since 3.13.0
      */
@@ -674,10 +674,10 @@ public static <T> Class<T> getComponentType(final Class<T[]> cls) {
     /**
      * Null-safe version of {@code cls.getName()}
      *
-     * @param cls the class for which to get the class name; may be null.
-     * @return the class name or the empty string in case the argument is {@code null}.
-     * @since 3.7
+     * @param cls the class for which to get the class name; may be null
+     * @return the class name or the empty string in case the argument is {@code null}
      * @see Class#getSimpleName()
+     * @since 3.7
      */
     public static String getName(final Class<?> cls) {
         return getName(cls, StringUtils.EMPTY);
@@ -686,11 +686,11 @@ public static String getName(final Class<?> cls) {
     /**
      * Null-safe version of {@code cls.getName()}
      *
-     * @param cls the class for which to get the class name; may be null.
-     * @param valueIfNull the return value if the argument {@code cls} is {@code null}.
+     * @param cls the class for which to get the class name; may be null
+     * @param valueIfNull the return value if the argument {@code cls} is {@code null}
      * @return the class name or {@code valueIfNull}
-     * @since 3.7
      * @see Class#getName()
+     * @since 3.7
      */
     public static String getName(final Class<?> cls, final String valueIfNull) {
         return getName(cls, valueIfNull, false);
@@ -703,10 +703,10 @@ static String getName(final Class<?> cls, final String valueIfNull, final boolea
     /**
      * Null-safe version of {@code object.getClass().getName()}
      *
-     * @param object the object for which to get the class name; may be null.
-     * @return the class name or the empty String.
-     * @since 3.7
+     * @param object the object for which to get the class name; may be null
+     * @return the class name or the empty String
      * @see Class#getSimpleName()
+     * @since 3.7
      */
     public static String getName(final Object object) {
         return getName(object, StringUtils.EMPTY);
@@ -715,11 +715,11 @@ public static String getName(final Object object) {
     /**
      * Null-safe version of {@code object.getClass().getSimpleName()}
      *
-     * @param object the object for which to get the class name; may be null.
-     * @param valueIfNull the value to return if {@code object} is {@code null}.
-     * @return the class name or {@code valueIfNull}.
-     * @since 3.0
+     * @param object the object for which to get the class name; may be null
+     * @param valueIfNull the value to return if {@code object} is {@code null}
+     * @return the class name or {@code valueIfNull}
      * @see Class#getName()
+     * @since 3.0
      */
     public static String getName(final Object object, final String valueIfNull) {
         return object == null ? valueIfNull : object.getClass().getName();
@@ -728,8 +728,8 @@ public static String getName(final Object object, final String valueIfNull) {
     /**
      * Gets the package name from the canonical name of a {@link Class}.
      *
-     * @param cls the class to get the package name for, may be {@code null}.
-     * @return the package name or an empty string.
+     * @param cls the class to get the package name for, may be {@code null}
+     * @return the package name or an empty string
      * @since 2.4
      */
     public static String getPackageCanonicalName(final Class<?> cls) {
@@ -742,9 +742,9 @@ public static String getPackageCanonicalName(final Class<?> cls) {
     /**
      * Gets the package name from the class name of an {@link Object}.
      *
-     * @param object the class to get the package name for, may be null.
-     * @param valueIfNull the value to return if null.
-     * @return the package name of the object, or the null value.
+     * @param object the class to get the package name for, may be null
+     * @param valueIfNull the value to return if null
+     * @return the package name of the object, or the null value
      * @since 2.4
      */
     public static String getPackageCanonicalName(final Object object, final String valueIfNull) {
@@ -764,8 +764,8 @@ public static String getPackageCanonicalName(final Object object, final String v
      * If the class is in the default package, return an empty string.
      * </p>
      *
-     * @param name the name to get the package name for, may be {@code null}.
-     * @return the package name or an empty string.
+     * @param name the name to get the package name for, may be {@code null}
+     * @return the package name or an empty string
      * @since 2.4
      */
     public static String getPackageCanonicalName(final String name) {
@@ -775,7 +775,7 @@ public static String getPackageCanonicalName(final String name) {
     /**
      * Gets the package name of a {@link Class}.
      *
-     * @param cls the class to get the package name for, may be {@code null}.
+     * @param cls the class to get the package name for, may be {@code null}
      * @return the package name or an empty string
      */
     public static String getPackageName(final Class<?> cls) {
@@ -788,9 +788,9 @@ public static String getPackageName(final Class<?> cls) {
     /**
      * Gets the package name of an {@link Object}.
      *
-     * @param object the class to get the package name for, may be null.
-     * @param valueIfNull the value to return if null.
-     * @return the package name of the object, or the null value.
+     * @param object the class to get the package name for, may be null
+     * @param valueIfNull the value to return if null
+     * @return the package name of the object, or the null value
      */
     public static String getPackageName(final Object object, final String valueIfNull) {
         if (object == null) {
@@ -809,8 +809,8 @@ public static String getPackageName(final Object object, final String valueIfNul
      * If the class is unpackaged, return an empty string.
      * </p>
      *
-     * @param className the className to get the package name for, may be {@code null}.
-     * @return the package name or an empty string.
+     * @param className the className to get the package name for, may be {@code null}
+     * @return the package name or an empty string
      */
     public static String getPackageName(String className) {
         if (StringUtils.isEmpty(className)) {
@@ -836,8 +836,8 @@ public static String getPackageName(String className) {
     /**
      * Gets the primitive class for the given class name, for example "byte".
      *
-     * @param className the primitive class for the given class name.
-     * @return the primitive class.
+     * @param className the primitive class for the given class name
+     * @return the primitive class
      */
     static Class<?> getPrimitiveClass(final String className) {
         return NAME_PRIMITIVE_MAP.get(className);
@@ -854,14 +854,14 @@ static Class<?> getPrimitiveClass(final String className) {
      *  Object result = method.invoke(set, new Object[]);}
      * </pre>
      *
-     * @param cls the class to check, not null.
-     * @param methodName the name of the method.
-     * @param parameterTypes the list of parameters.
-     * @return the method.
-     * @throws NullPointerException if the class is null.
-     * @throws SecurityException if a security violation occurred.
+     * @param cls the class to check, not null
+     * @param methodName the name of the method
+     * @param parameterTypes the list of parameters
+     * @return the method
      * @throws NoSuchMethodException if the method is not found in the given class or if the method doesn't conform with the
-     *         requirements.
+     *         requirements
+     * @throws NullPointerException if the class is null
+     * @throws SecurityException if a security violation occurred
      */
     public static Method getPublicMethod(final Class<?> cls, final String methodName, final Class<?>... parameterTypes) throws NoSuchMethodException {
         final Method declaredMethod = cls.getMethod(methodName, parameterTypes);
@@ -890,10 +890,10 @@ public static Method getPublicMethod(final Class<?> cls, final String methodName
     /**
      * Gets the canonical name minus the package name from a {@link Class}.
      *
-     * @param cls the class for which to get the short canonical class name; may be null.
-     * @return the canonical name without the package name or an empty string.
-     * @since 2.4
+     * @param cls the class for which to get the short canonical class name; may be null
+     * @return the canonical name without the package name or an empty string
      * @see Class#getCanonicalName()
+     * @since 2.4
      */
     public static String getShortCanonicalName(final Class<?> cls) {
         return cls == null ? StringUtils.EMPTY : getShortCanonicalName(cls.getCanonicalName());
@@ -902,11 +902,11 @@ public static String getShortCanonicalName(final Class<?> cls) {
     /**
      * Gets the canonical name minus the package name for an {@link Object}.
      *
-     * @param object the class to get the short name for, may be null.
-     * @param valueIfNull the value to return if null.
-     * @return the canonical name of the object without the package name, or the null value.
-     * @since 2.4
+     * @param object the class to get the short name for, may be null
+     * @param valueIfNull the value to return if null
+     * @return the canonical name of the object without the package name, or the null value
      * @see Class#getCanonicalName()
+     * @since 2.4
      */
     public static String getShortCanonicalName(final Object object, final String valueIfNull) {
         return object == null ? valueIfNull : getShortCanonicalName(object.getClass());
@@ -1002,8 +1002,8 @@ public static String getShortCanonicalName(final Object object, final String val
      * </tr>
      * </table>
      *
-     * @param canonicalName the class name to get the short name for.
-     * @return the canonical name of the class without the package name or an empty string.
+     * @param canonicalName the class name to get the short name for
+     * @return the canonical name of the class without the package name or an empty string
      * @since 2.4
      */
     public static String getShortCanonicalName(final String canonicalName) {
@@ -1013,7 +1013,7 @@ public static String getShortCanonicalName(final String canonicalName) {
     /**
      * Gets the class name minus the package name from a {@link Class}.
      *
-     * @param cls the class to get the short name for.
+     * @param cls the class to get the short name for
      * @return the class name without the package name or an empty string. If the class is an inner class then the returned
      *         value will contain the outer class or classes separated with {@code .} (dot) character.
      */
@@ -1046,10 +1046,10 @@ public static String getShortClassName(final Class<?> cls) {
     /**
      * Gets the class name of the {@code object} without the package name or names.
      *
-     * @param object the class to get the short name for, may be {@code null}.
-     * @param valueIfNull the value to return if the object is {@code null}.
+     * @param object the class to get the short name for, may be {@code null}
+     * @param valueIfNull the value to return if the object is {@code null}
      * @return the class name of the object without the package name, or {@code valueIfNull} if the argument {@code object}
-     *         is {@code null}.
+     *         is {@code null}
      */
     public static String getShortClassName(final Object object, final String valueIfNull) {
         if (object == null) {
@@ -1120,10 +1120,10 @@ public static String getShortClassName(String className) {
     /**
      * Null-safe version of {@code cls.getSimpleName()}
      *
-     * @param cls the class for which to get the simple name; may be null.
-     * @return the simple class name or the empty string in case the argument is {@code null}.
-     * @since 3.0
+     * @param cls the class for which to get the simple name; may be null
+     * @return the simple class name or the empty string in case the argument is {@code null}
      * @see Class#getSimpleName()
+     * @since 3.0
      */
     public static String getSimpleName(final Class<?> cls) {
         return getSimpleName(cls, StringUtils.EMPTY);
@@ -1132,11 +1132,11 @@ public static String getSimpleName(final Class<?> cls) {
     /**
      * Null-safe version of {@code cls.getSimpleName()}
      *
-     * @param cls the class for which to get the simple name; may be null.
-     * @param valueIfNull the value to return if null.
-     * @return the simple class name or {@code valueIfNull} if the argument {@code cls} is {@code null}.
-     * @since 3.0
+     * @param cls the class for which to get the simple name; may be null
+     * @param valueIfNull the value to return if null
+     * @return the simple class name or {@code valueIfNull} if the argument {@code cls} is {@code null}
      * @see Class#getSimpleName()
+     * @since 3.0
      */
     public static String getSimpleName(final Class<?> cls, final String valueIfNull) {
         return cls == null ? valueIfNull : cls.getSimpleName();
@@ -1153,10 +1153,10 @@ public static String getSimpleName(final Class<?> cls, final String valueIfNull)
      * in that case.
      * </p>
      *
-     * @param object the object for which to get the simple class name; may be null.
-     * @return the simple class name or the empty string in case the argument is {@code null}.
-     * @since 3.7
+     * @param object the object for which to get the simple class name; may be null
+     * @return the simple class name or the empty string in case the argument is {@code null}
      * @see Class#getSimpleName()
+     * @since 3.7
      */
     public static String getSimpleName(final Object object) {
         return getSimpleName(object, StringUtils.EMPTY);
@@ -1165,11 +1165,11 @@ public static String getSimpleName(final Object object) {
     /**
      * Null-safe version of {@code object.getClass().getSimpleName()}
      *
-     * @param object the object for which to get the simple class name; may be null.
-     * @param valueIfNull the value to return if {@code object} is {@code null}.
-     * @return the simple class name or {@code valueIfNull} if the argument {@code object} is {@code null}.
-     * @since 3.0
+     * @param object the object for which to get the simple class name; may be null
+     * @param valueIfNull the value to return if {@code object} is {@code null}
+     * @return the simple class name or {@code valueIfNull} if the argument {@code object} is {@code null}
      * @see Class#getSimpleName()
+     * @since 3.0
      */
     public static String getSimpleName(final Object object, final String valueIfNull) {
         return object == null ? valueIfNull : object.getClass().getSimpleName();
@@ -1179,8 +1179,8 @@ public static String getSimpleName(final Object object, final String valueIfNull
      * Gets an {@link Iterable} that can iterate over a class hierarchy in ascending (subclass to superclass) order,
      * excluding interfaces.
      *
-     * @param type the type to get the class hierarchy from.
-     * @return Iterable an Iterable over the class hierarchy of the given class.
+     * @param type the type to get the class hierarchy from
+     * @return iterable an Iterable over the class hierarchy of the given class
      * @since 3.2
      */
     public static Iterable<Class<?>> hierarchy(final Class<?> type) {
@@ -1190,9 +1190,9 @@ public static Iterable<Class<?>> hierarchy(final Class<?> type) {
     /**
      * Gets an {@link Iterable} that can iterate over a class hierarchy in ascending (subclass to superclass) order.
      *
-     * @param type the type to get the class hierarchy from.
-     * @param interfacesBehavior switch indicating whether to include or exclude interfaces.
-     * @return Iterable an Iterable over the class hierarchy of the given class.
+     * @param type the type to get the class hierarchy from
+     * @param interfacesBehavior switch indicating whether to include or exclude interfaces
+     * @return iterable an Iterable over the class hierarchy of the given class
      * @since 3.2
      */
     public static Iterable<Class<?>> hierarchy(final Class<?> type, final Interfaces interfacesBehavior) {
@@ -1295,9 +1295,9 @@ private void walkInterfaces(final Set<Class<?>> addTo, final Class<?> c) {
      * VMs running Java versions &gt; 1.5.
      * </p>
      *
-     * @param cls the Class to check, may be null.
-     * @param toClass the Class to try to assign into, returns false if null.
-     * @return {@code true} if assignment possible.
+     * @param cls the Class to check, may be null
+     * @param toClass the Class to try to assign into, returns false if null
+     * @return {@code true} if assignment possible
      */
     public static boolean isAssignable(final Class<?> cls, final Class<?> toClass) {
         return isAssignable(cls, toClass, true);
@@ -1328,10 +1328,10 @@ public static boolean isAssignable(final Class<?> cls, final Class<?> toClass) {
      * Specification</a></em>, sections 5.1.1, 5.1.2 and 5.1.4 for details.
      * </p>
      *
-     * @param cls the Class to check, may be null.
-     * @param toClass the Class to try to assign into, returns false if null.
-     * @param autoboxing whether to use implicit autoboxing/unboxing between primitives and wrappers.
-     * @return {@code true} if assignment possible.
+     * @param cls the Class to check, may be null
+     * @param toClass the Class to try to assign into, returns false if null
+     * @param autoboxing whether to use implicit autoboxing/unboxing between primitives and wrappers
+     * @return {@code true} if assignment possible
      */
     public static boolean isAssignable(Class<?> cls, final Class<?> toClass, final boolean autoboxing) {
         if (toClass == null) {
@@ -1428,9 +1428,9 @@ public static boolean isAssignable(Class<?> cls, final Class<?> toClass, final b
      * VMs running Java versions &gt; 1.5.
      * </p>
      *
-     * @param classArray the array of Classes to check, may be {@code null}.
-     * @param toClassArray the array of Classes to try to assign into, may be {@code null}.
-     * @return {@code true} if assignment possible.
+     * @param classArray the array of Classes to check, may be {@code null}
+     * @param toClassArray the array of Classes to try to assign into, may be {@code null}
+     * @return {@code true} if assignment possible
      */
     public static boolean isAssignable(final Class<?>[] classArray, final Class<?>... toClassArray) {
         return isAssignable(classArray, toClassArray, true);
@@ -1489,8 +1489,8 @@ public static boolean isAssignable(Class<?>[] classArray, Class<?>[] toClassArra
     /**
      * Tests whether the specified class an inner class or static nested class.
      *
-     * @param cls the class to check, may be null.
-     * @return {@code true} if the class is an inner or static nested class, false if not or {@code null}.
+     * @param cls the class to check, may be null
+     * @return {@code true} if the class is an inner or static nested class, false if not or {@code null}
      */
     public static boolean isInnerClass(final Class<?> cls) {
         return cls != null && cls.getEnclosingClass() != null;
@@ -1500,9 +1500,9 @@ public static boolean isInnerClass(final Class<?> cls) {
      * Tests whether the given {@code type} is a primitive or primitive wrapper ({@link Boolean}, {@link Byte},
      * {@link Character}, {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
      *
-     * @param type The class to query or null.
+     * @param type the class to query or null
      * @return true if the given {@code type} is a primitive or primitive wrapper ({@link Boolean}, {@link Byte},
-     *         {@link Character}, {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
+     *         {@link Character}, {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float})
      * @since 3.1
      */
     public static boolean isPrimitiveOrWrapper(final Class<?> type) {
@@ -1513,9 +1513,9 @@ public static boolean isPrimitiveOrWrapper(final Class<?> type) {
      * Tests whether the given {@code type} is a primitive wrapper ({@link Boolean}, {@link Byte}, {@link Character},
      * {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
      *
-     * @param type The class to query or null.
+     * @param type the class to query or null
      * @return true if the given {@code type} is a primitive wrapper ({@link Boolean}, {@link Byte}, {@link Character},
-     *         {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
+     *         {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float})
      * @since 3.1
      */
     public static boolean isPrimitiveWrapper(final Class<?> type) {
@@ -1525,8 +1525,8 @@ public static boolean isPrimitiveWrapper(final Class<?> type) {
     /**
      * Tests whether a {@link Class} is public.
      *
-     * @param cls Class to test.
-     * @return {@code true} if {@code cls} is public.
+     * @param cls class to test
+     * @return {@code true} if {@code cls} is public
      * @since 3.13.0
      */
     public static boolean isPublic(final Class<?> cls) {
@@ -1536,7 +1536,7 @@ public static boolean isPublic(final Class<?> cls) {
     /**
      * Converts the specified array of primitive Class objects to an array of its corresponding wrapper Class objects.
      *
-     * @param classes the class array to convert, may be null or empty.
+     * @param classes the class array to convert, may be null or empty
      * @return an array which contains for each given class, the wrapper class or the original class if class is not a primitive. {@code null} if null input.
      *         Empty array if an empty array passed in.
      * @since 2.1
@@ -1558,7 +1558,7 @@ public static Class<?>[] primitivesToWrappers(final Class<?>... classes) {
      * NOTE: From v2.2, this method handles {@code Void.TYPE}, returning {@code Void.TYPE}.
      * </p>
      *
-     * @param cls the class to convert, may be null.
+     * @param cls the class to convert, may be null
      * @return the wrapper class for {@code cls} or {@code cls} if {@code cls} is not a primitive. {@code null} if null input.
      * @since 2.1
      */
@@ -1574,8 +1574,8 @@ public static Class<?> primitiveToWrapper(final Class<?> cls) {
      * This method returns {@code null} for a {@code null} input array.
      * </p>
      *
-     * @param array an {@link Object} array.
-     * @return a {@link Class} array, {@code null} if null array input.
+     * @param array an {@link Object} array
+     * @return a {@link Class} array, {@code null} if null array input
      * @since 2.4
      */
     public static Class<?>[] toClass(final Object... array) {
@@ -1595,11 +1595,11 @@ public static Class<?>[] toClass(final Object... array) {
      * been collapsed.
      * </p>
      *
-     * @param className the class name.
-     * @return the converted name.
-     * @throws NullPointerException     if the className is null.
-     * @throws IllegalArgumentException Thrown if the class name represents an array with more dimensions than the JVM supports, 255.
-     * @throws IllegalArgumentException Thrown if the class name length is greater than 65,535.
+     * @param className the class name
+     * @return the converted name
+     * @throws IllegalArgumentException thrown if the class name represents an array with more dimensions than the JVM supports, 255
+     * @throws IllegalArgumentException thrown if the class name length is greater than 65,535
+     * @throws NullPointerException     if the className is null
      * @see <a href="https://docs.oracle.com/javase/specs/jvms/se25/html/jvms-4.html#jvms-4.4.1">JVM: Array dimension limits in JVM Specification
      *      CONSTANT_Class_info</a>
      * @see <a href="https://docs.oracle.com/javase/specs/jls/se25/html/jls-6.html#jls-6.7">JLS: Fully Qualified Names and Canonical Names</a>
@@ -1666,12 +1666,12 @@ private static String toCleanName(final String className) {
      * </p>
      *
      * @param runAheadTarget the target index (where the characters were copied to) pointing after the last character copied
-     *        when the current part was copied.
+     *        when the current part was copied
      * @param source the source index (where the characters were copied from) pointing after the last character copied when
-     *        the current part was copied.
-     * @param originalLength the original length of the class full name, which is abbreviated.
-     * @param desiredLength the desired length of the abbreviated class name.
-     * @return {@code true} if it can be kept in its original length; {@code false} if the current part has to be abbreviated.
+     *        the current part was copied
+     * @param originalLength the original length of the class full name, which is abbreviated
+     * @param desiredLength the desired length of the abbreviated class name
+     * @return {@code true} if it can be kept in its original length; {@code false} if the current part has to be abbreviated
      */
     private static boolean useFull(final int runAheadTarget, final int source, final int originalLength, final int desiredLength) {
         return source >= originalLength || runAheadTarget + originalLength - source <= desiredLength;
@@ -1684,7 +1684,7 @@ private static boolean useFull(final int runAheadTarget, final int source, final
      * This method invokes {@code wrapperToPrimitive()} for each element of the passed in array.
      * </p>
      *
-     * @param classes the class array to convert, may be null or empty.
+     * @param classes the class array to convert, may be null or empty
      * @return an array which contains for each given class, the primitive class or <strong>null</strong> if the original class is not a wrapper class.
      *         {@code null} if null input. Empty array if an empty array passed in.
      * @see #wrapperToPrimitive(Class)
@@ -1709,8 +1709,8 @@ public static Class<?>[] wrappersToPrimitives(final Class<?>... classes) {
      * classes, or if the parameter is <strong>null</strong>, the return value is <strong>null</strong>.
      * </p>
      *
-     * @param cls the class to convert, may be <strong>null</strong>.
-     * @return the corresponding primitive type if {@code cls} is a wrapper class, <strong>null</strong> otherwise.
+     * @param cls the class to convert, may be <strong>null</strong>
+     * @return the corresponding primitive type if {@code cls} is a wrapper class, <strong>null</strong> otherwise
      * @see #primitiveToWrapper(Class)
      * @since 2.4
      */
diff --git a/src/main/java/org/apache/commons/lang3/Conversion.java b/src/main/java/org/apache/commons/lang3/Conversion.java
index 2b858a05997..4237c714d72 100644
--- a/src/main/java/org/apache/commons/lang3/Conversion.java
+++ b/src/main/java/org/apache/commons/lang3/Conversion.java
@@ -85,10 +85,10 @@ public class Conversion {
      * (1, 0, 0, 0) is converted as follow: '8' (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0) is converted to '4'.
      * </p>
      *
-     * @param src the binary to convert.
-     * @return a hexadecimal digit representing the selected bits.
-     * @throws IllegalArgumentException if {@code src} is empty.
-     * @throws NullPointerException     if {@code src} is {@code null}.
+     * @param src the binary to convert
+     * @return a hexadecimal digit representing the selected bits
+     * @throws IllegalArgumentException if {@code src} is empty
+     * @throws NullPointerException     if {@code src} is {@code null}
      */
     public static char binaryBeMsb0ToHexDigit(final boolean[] src) {
         return binaryBeMsb0ToHexDigit(src, 0);
@@ -101,12 +101,12 @@ public static char binaryBeMsb0ToHexDigit(final boolean[] src) {
      * (1, 0, 0, 0) with srcPos = 0 is converted as follow: '8' (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0) with srcPos = 2 is converted to '5'.
      * </p>
      *
-     * @param src    the binary to convert.
-     * @param srcPos the position of the LSB to start the conversion.
-     * @return a hexadecimal digit representing the selected bits.
-     * @throws IllegalArgumentException  if {@code src} is empty.
-     * @throws NullPointerException      if {@code src} is {@code null}.
-     * @throws IndexOutOfBoundsException if {@code srcPos} is outside the array.
+     * @param src    the binary to convert
+     * @param srcPos the position of the LSB to start the conversion
+     * @return a hexadecimal digit representing the selected bits
+     * @throws IllegalArgumentException  if {@code src} is empty
+     * @throws IndexOutOfBoundsException if {@code srcPos} is outside the array
+     * @throws NullPointerException      if {@code src} is {@code null}
      */
     public static char binaryBeMsb0ToHexDigit(final boolean[] src, final int srcPos) {
         // JDK 9: Objects.checkIndex(int index, int length)
@@ -146,15 +146,15 @@ public static char binaryBeMsb0ToHexDigit(final boolean[] src, final int srcPos)
     /**
      * Converts binary (represented as boolean array) into a byte using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the binary to convert.
-     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion.
-     * @param dstInit initial value of the destination byte.
-     * @param dstPos  the position of the LSB, in bits, in the result byte.
-     * @param nBools  the number of booleans to convert.
-     * @return a byte containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 8}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}.
+     * @param src     the binary to convert
+     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion
+     * @param dstInit initial value of the destination byte
+     * @param dstPos  the position of the LSB, in bits, in the result byte
+     * @param nBools  the number of booleans to convert
+     * @return a byte containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}
+     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 8}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static byte binaryToByte(final boolean[] src, final int srcPos, final byte dstInit, final int dstPos, final int nBools) {
         if (src.length == 0 && srcPos == 0 || 0 == nBools) {
@@ -180,10 +180,10 @@ public static byte binaryToByte(final boolean[] src, final int srcPos, final byt
      * (1, 0, 0, 0) is converted as follow: '1'.
      * </p>
      *
-     * @param src the binary to convert.
-     * @return a hexadecimal digit representing the selected bits.
-     * @throws IllegalArgumentException if {@code src} is empty.
-     * @throws NullPointerException     if {@code src} is {@code null}.
+     * @param src the binary to convert
+     * @return a hexadecimal digit representing the selected bits
+     * @throws IllegalArgumentException if {@code src} is empty
+     * @throws NullPointerException     if {@code src} is {@code null}
      */
     public static char binaryToHexDigit(final boolean[] src) {
         return binaryToHexDigit(src, 0);
@@ -196,11 +196,11 @@ public static char binaryToHexDigit(final boolean[] src) {
      * (1, 0, 0, 0) is converted as follow: '1'.
      * </p>
      *
-     * @param src    the binary to convert.
-     * @param srcPos the position of the LSB to start the conversion.
-     * @return a hexadecimal digit representing the selected bits.
-     * @throws IllegalArgumentException if {@code src} is empty.
-     * @throws NullPointerException     if {@code src} is {@code null}.
+     * @param src    the binary to convert
+     * @param srcPos the position of the LSB to start the conversion
+     * @return a hexadecimal digit representing the selected bits
+     * @throws IllegalArgumentException if {@code src} is empty
+     * @throws NullPointerException     if {@code src} is {@code null}
      */
     public static char binaryToHexDigit(final boolean[] src, final int srcPos) {
         if (src.length == 0) {
@@ -237,10 +237,10 @@ public static char binaryToHexDigit(final boolean[] src, final int srcPos) {
      * (1, 0, 0, 0) is converted as follow: '8'.
      * </p>
      *
-     * @param src the binary to convert.
-     * @return a hexadecimal digit representing the selected bits.
-     * @throws IllegalArgumentException if {@code src} is empty, {@code src.length < 4} or {@code src.length > 8}.
-     * @throws NullPointerException     if {@code src} is {@code null}.
+     * @param src the binary to convert
+     * @return a hexadecimal digit representing the selected bits
+     * @throws IllegalArgumentException if {@code src} is empty, {@code src.length < 4} or {@code src.length > 8}
+     * @throws NullPointerException     if {@code src} is {@code null}
      */
     public static char binaryToHexDigitMsb0_4bits(final boolean[] src) {
         return binaryToHexDigitMsb0_4bits(src, 0);
@@ -253,11 +253,11 @@ public static char binaryToHexDigitMsb0_4bits(final boolean[] src) {
      * (1, 0, 0, 0) is converted as follow: '8' (1, 0, 0, 1, 1, 0, 1, 0) with srcPos = 3 is converted to 'D'
      * </p>
      *
-     * @param src    the binary to convert.
-     * @param srcPos the position of the LSB to start the conversion.
-     * @return a hexadecimal digit representing the selected bits.
-     * @throws IllegalArgumentException if {@code src} is empty, {@code src.length > 8} or {@code src.length - srcPos < 4}.
-     * @throws NullPointerException     if {@code src} is {@code null}.
+     * @param src    the binary to convert
+     * @param srcPos the position of the LSB to start the conversion
+     * @return a hexadecimal digit representing the selected bits
+     * @throws IllegalArgumentException if {@code src} is empty, {@code src.length > 8} or {@code src.length - srcPos < 4}
+     * @throws NullPointerException     if {@code src} is {@code null}
      */
     public static char binaryToHexDigitMsb0_4bits(final boolean[] src, final int srcPos) {
         if (src.length > Byte.SIZE) {
@@ -293,15 +293,15 @@ public static char binaryToHexDigitMsb0_4bits(final boolean[] src, final int src
     /**
      * Converts binary (represented as boolean array) into an int using the default (little endian, LSB0) byte and bit ordering.
      *
-     * @param src     the binary to convert.
-     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion.
-     * @param dstInit initial value of the destination int.
-     * @param dstPos  the position of the LSB, in bits, in the result int.
-     * @param nBools  the number of booleans to convert.
-     * @return an int containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 32}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}.
+     * @param src     the binary to convert
+     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion
+     * @param dstInit initial value of the destination int
+     * @param dstPos  the position of the LSB, in bits, in the result int
+     * @param nBools  the number of booleans to convert
+     * @return an int containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}
+     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 32}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static int binaryToInt(final boolean[] src, final int srcPos, final int dstInit, final int dstPos, final int nBools) {
         if (src.length == 0 && srcPos == 0 || 0 == nBools) {
@@ -323,15 +323,15 @@ public static int binaryToInt(final boolean[] src, final int srcPos, final int d
     /**
      * Converts binary (represented as boolean array) into a long using the default (little endian, LSB0) byte and bit ordering.
      *
-     * @param src     the binary to convert.
-     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion.
-     * @param dstInit initial value of the destination long.
-     * @param dstPos  the position of the LSB, in bits, in the result long.
-     * @param nBools  the number of booleans to convert.
-     * @return a long containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 64}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}.
+     * @param src     the binary to convert
+     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion
+     * @param dstInit initial value of the destination long
+     * @param dstPos  the position of the LSB, in bits, in the result long
+     * @param nBools  the number of booleans to convert
+     * @return a long containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}
+     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 64}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static long binaryToLong(final boolean[] src, final int srcPos, final long dstInit, final int dstPos, final int nBools) {
         if (src.length == 0 && srcPos == 0 || 0 == nBools) {
@@ -353,15 +353,15 @@ public static long binaryToLong(final boolean[] src, final int srcPos, final lon
     /**
      * Converts binary (represented as boolean array) into a short using the default (little endian, LSB0) byte and bit ordering.
      *
-     * @param src     the binary to convert.
-     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion.
-     * @param dstInit initial value of the destination short.
-     * @param dstPos  the position of the LSB, in bits, in the result short.
-     * @param nBools  the number of booleans to convert.
-     * @return a short containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 16}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}.
+     * @param src     the binary to convert
+     * @param srcPos  the position in {@code src}, in boolean unit, from where to start the conversion
+     * @param dstInit initial value of the destination short
+     * @param dstPos  the position of the LSB, in bits, in the result short
+     * @param nBools  the number of booleans to convert
+     * @return a short containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBools > src.length}
+     * @throws IllegalArgumentException       if {@code nBools - 1 + dstPos >= 16}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static short binaryToShort(final boolean[] src, final int srcPos, final short dstInit, final int dstPos, final int nBools) {
         if (src.length == 0 && srcPos == 0 || 0 == nBools) {
@@ -383,15 +383,15 @@ public static short binaryToShort(final boolean[] src, final int srcPos, final s
     /**
      * Converts an array of byte into an int using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the byte array to convert.
-     * @param srcPos  the position in {@code src}, in byte unit, from where to start the conversion.
-     * @param dstInit initial value of the destination int.
-     * @param dstPos  the position of the LSB, in bits, in the result int.
-     * @param nBytes  the number of bytes to convert.
-     * @return an int containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + dstPos >= 32}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBytes > src.length}.
+     * @param src     the byte array to convert
+     * @param srcPos  the position in {@code src}, in byte unit, from where to start the conversion
+     * @param dstInit initial value of the destination int
+     * @param dstPos  the position of the LSB, in bits, in the result int
+     * @param nBytes  the number of bytes to convert
+     * @return an int containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBytes > src.length}
+     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + dstPos >= 32}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static int byteArrayToInt(final byte[] src, final int srcPos, final int dstInit, final int dstPos, final int nBytes) {
         if (src.length == 0 && srcPos == 0 || 0 == nBytes) {
@@ -413,15 +413,15 @@ public static int byteArrayToInt(final byte[] src, final int srcPos, final int d
     /**
      * Converts an array of byte into a long using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the byte array to convert.
-     * @param srcPos  the position in {@code src}, in byte unit, from where to start the conversion.
-     * @param dstInit initial value of the destination long.
-     * @param dstPos  the position of the LSB, in bits, in the result long.
-     * @param nBytes  the number of bytes to convert.
-     * @return a long containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + dstPos >= 64}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBytes > src.length}.
+     * @param src     the byte array to convert
+     * @param srcPos  the position in {@code src}, in byte unit, from where to start the conversion
+     * @param dstInit initial value of the destination long
+     * @param dstPos  the position of the LSB, in bits, in the result long
+     * @param nBytes  the number of bytes to convert
+     * @return a long containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBytes > src.length}
+     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + dstPos >= 64}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static long byteArrayToLong(final byte[] src, final int srcPos, final long dstInit, final int dstPos, final int nBytes) {
         if (src.length == 0 && srcPos == 0 || 0 == nBytes) {
@@ -443,15 +443,15 @@ public static long byteArrayToLong(final byte[] src, final int srcPos, final lon
     /**
      * Converts an array of byte into a short using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the byte array to convert.
-     * @param srcPos  the position in {@code src}, in byte unit, from where to start the conversion.
-     * @param dstInit initial value of the destination short.
-     * @param dstPos  the position of the LSB, in bits, in the result short.
-     * @param nBytes  the number of bytes to convert.
-     * @return a short containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + dstPos >= 16}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBytes > src.length}.
+     * @param src     the byte array to convert
+     * @param srcPos  the position in {@code src}, in byte unit, from where to start the conversion
+     * @param dstInit initial value of the destination short
+     * @param dstPos  the position of the LSB, in bits, in the result short
+     * @param nBytes  the number of bytes to convert
+     * @return a short containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBytes > src.length}
+     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + dstPos >= 16}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static short byteArrayToShort(final byte[] src, final int srcPos, final short dstInit, final int dstPos, final int nBytes) {
         if (src.length == 0 && srcPos == 0 || 0 == nBytes) {
@@ -473,11 +473,11 @@ public static short byteArrayToShort(final byte[] src, final int srcPos, final s
     /**
      * Converts bytes from an array into a UUID using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the byte array to convert.
-     * @param srcPos the position in {@code src} where to copy the result from.
-     * @return a UUID.
-     * @throws NullPointerException     if {@code src} is {@code null}.
-     * @throws IllegalArgumentException if array does not contain at least 16 bytes beginning with {@code srcPos}.
+     * @param src    the byte array to convert
+     * @param srcPos the position in {@code src} where to copy the result from
+     * @return a UUID
+     * @throws IllegalArgumentException if array does not contain at least 16 bytes beginning with {@code srcPos}
+     * @throws NullPointerException     if {@code src} is {@code null}
      */
     public static UUID byteArrayToUuid(final byte[] src, final int srcPos) {
         if (src.length - srcPos < 16) {
@@ -489,15 +489,15 @@ public static UUID byteArrayToUuid(final byte[] src, final int srcPos) {
     /**
      * Converts a byte into an array of boolean using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the byte to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 8}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}.
+     * @param src    the byte to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}
+     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 8}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static boolean[] byteToBinary(final byte src, final int srcPos, final boolean[] dst, final int dstPos, final int nBools) {
         if (0 == nBools) {
@@ -516,14 +516,14 @@ public static boolean[] byteToBinary(final byte src, final int srcPos, final boo
     /**
      * Converts a byte into an array of char using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the byte to convert.
-     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion.
-     * @param dstInit the initial value for the result String.
-     * @param dstPos  the position in {@code dst} where to copy the result.
-     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 8}.
-     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}.
+     * @param src     the byte to convert
+     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion
+     * @param dstInit the initial value for the result String
+     * @param dstPos  the position in {@code dst} where to copy the result
+     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 8}
+     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}
      */
     public static String byteToHex(final byte src, final int srcPos, final String dstInit, final int dstPos, final int nHexs) {
         if (0 == nHexs) {
@@ -554,9 +554,9 @@ public static String byteToHex(final byte src, final int srcPos, final String ds
      * '1' is converted as follow: (0, 0, 0, 1).
      * </p>
      *
-     * @param hexChar the hexadecimal digit to convert.
-     * @return a boolean array with the binary representation of {@code hexDigit}.
-     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit.
+     * @param hexChar the hexadecimal digit to convert
+     * @return a boolean array with the binary representation of {@code hexDigit}
+     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit
      */
     public static boolean[] hexDigitMsb0ToBinary(final char hexChar) {
         switch (hexChar) {
@@ -610,9 +610,9 @@ public static boolean[] hexDigitMsb0ToBinary(final char hexChar) {
      * '1' is converted to 8.
      * </p>
      *
-     * @param hexChar the hexadecimal digit to convert.
-     * @return an int equals to {@code hexDigit}.
-     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit.
+     * @param hexChar the hexadecimal digit to convert
+     * @return an int equals to {@code hexDigit}
+     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit
      */
     public static int hexDigitMsb0ToInt(final char hexChar) {
         switch (hexChar) {
@@ -666,9 +666,9 @@ public static int hexDigitMsb0ToInt(final char hexChar) {
      * '1' is converted as follow: (1, 0, 0, 0).
      * </p>
      *
-     * @param hexChar the hexadecimal digit to convert.
-     * @return a boolean array with the binary representation of {@code hexDigit}.
-     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit.
+     * @param hexChar the hexadecimal digit to convert
+     * @return a boolean array with the binary representation of {@code hexDigit}
+     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit
      */
     public static boolean[] hexDigitToBinary(final char hexChar) {
         switch (hexChar) {
@@ -722,9 +722,9 @@ public static boolean[] hexDigitToBinary(final char hexChar) {
      * '1' is converted to 1
      * </p>
      *
-     * @param hexChar the hexadecimal digit to convert.
-     * @return an int equals to {@code hexDigit}.
-     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit.
+     * @param hexChar the hexadecimal digit to convert
+     * @return an int equals to {@code hexDigit}
+     * @throws IllegalArgumentException if {@code hexDigit} is not a hexadecimal digit
      */
     public static int hexDigitToInt(final char hexChar) {
         final int digit = Character.digit(hexChar, 16);
@@ -737,13 +737,13 @@ public static int hexDigitToInt(final char hexChar) {
     /**
      * Converts a hexadecimal string into a byte using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the hexadecimal string to convert.
-     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion.
-     * @param dstInit initial value of the destination byte.
-     * @param dstPos  the position of the LSB, in bits, in the result byte.
-     * @param nHex    the number of Chars to convert.
-     * @return a byte containing the selected bits.
-     * @throws IllegalArgumentException if {@code (nHex-1)*4+dstPos >= 8}.
+     * @param src     the hexadecimal string to convert
+     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion
+     * @param dstInit initial value of the destination byte
+     * @param dstPos  the position of the LSB, in bits, in the result byte
+     * @param nHex    the number of Chars to convert
+     * @return a byte containing the selected bits
+     * @throws IllegalArgumentException if {@code (nHex-1)*4+dstPos >= 8}
      */
     public static byte hexToByte(final String src, final int srcPos, final byte dstInit, final int dstPos, final int nHex) {
         if (0 == nHex) {
@@ -765,13 +765,13 @@ public static byte hexToByte(final String src, final int srcPos, final byte dstI
     /**
      * Converts an array of char into an int using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the hexadecimal string to convert.
-     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion.
-     * @param dstInit initial value of the destination int.
-     * @param dstPos  the position of the LSB, in bits, in the result int.
-     * @param nHex    the number of chars to convert.
-     * @return an int containing the selected bits.
-     * @throws IllegalArgumentException if {@code (nHexs - 1) * 4 + dstPos >= 32}.
+     * @param src     the hexadecimal string to convert
+     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion
+     * @param dstInit initial value of the destination int
+     * @param dstPos  the position of the LSB, in bits, in the result int
+     * @param nHex    the number of chars to convert
+     * @return an int containing the selected bits
+     * @throws IllegalArgumentException if {@code (nHexs - 1) * 4 + dstPos >= 32}
      */
     public static int hexToInt(final String src, final int srcPos, final int dstInit, final int dstPos, final int nHex) {
         if (0 == nHex) {
@@ -793,13 +793,13 @@ public static int hexToInt(final String src, final int srcPos, final int dstInit
     /**
      * Converts an array of char into a long using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the hexadecimal string to convert.
-     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion.
-     * @param dstInit initial value of the destination long.
-     * @param dstPos  the position of the LSB, in bits, in the result long.
-     * @param nHex    the number of chars to convert.
-     * @return a long containing the selected bits.
-     * @throws IllegalArgumentException if {@code (nHexs - 1) * 4 + dstPos >= 64}.
+     * @param src     the hexadecimal string to convert
+     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion
+     * @param dstInit initial value of the destination long
+     * @param dstPos  the position of the LSB, in bits, in the result long
+     * @param nHex    the number of chars to convert
+     * @return a long containing the selected bits
+     * @throws IllegalArgumentException if {@code (nHexs - 1) * 4 + dstPos >= 64}
      */
     public static long hexToLong(final String src, final int srcPos, final long dstInit, final int dstPos, final int nHex) {
         if (0 == nHex) {
@@ -821,13 +821,13 @@ public static long hexToLong(final String src, final int srcPos, final long dstI
     /**
      * Converts an array of char into a short using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the hexadecimal string to convert.
-     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion.
-     * @param dstInit initial value of the destination short.
-     * @param dstPos  the position of the LSB, in bits, in the result short.
-     * @param nHex    the number of chars to convert.
-     * @return a short containing the selected bits.
-     * @throws IllegalArgumentException if {@code (nHexs - 1) * 4 + dstPos >= 16}.
+     * @param src     the hexadecimal string to convert
+     * @param srcPos  the position in {@code src}, in char unit, from where to start the conversion
+     * @param dstInit initial value of the destination short
+     * @param dstPos  the position of the LSB, in bits, in the result short
+     * @param nHex    the number of chars to convert
+     * @return a short containing the selected bits
+     * @throws IllegalArgumentException if {@code (nHexs - 1) * 4 + dstPos >= 16}
      */
     public static short hexToShort(final String src, final int srcPos, final short dstInit, final int dstPos, final int nHex) {
         if (0 == nHex) {
@@ -849,15 +849,15 @@ public static short hexToShort(final String src, final int srcPos, final short d
     /**
      * Converts an array of int into a long using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the int array to convert.
-     * @param srcPos  the position in {@code src}, in int unit, from where to start the conversion.
-     * @param dstInit initial value of the destination long.
-     * @param dstPos  the position of the LSB, in bits, in the result long.
-     * @param nInts   the number of ints to convert.
-     * @return a long containing the selected bits.
-     * @throws IllegalArgumentException       if {@code (nInts - 1) * 32 + dstPos >= 64}.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nInts > src.length}.
+     * @param src     the int array to convert
+     * @param srcPos  the position in {@code src}, in int unit, from where to start the conversion
+     * @param dstInit initial value of the destination long
+     * @param dstPos  the position of the LSB, in bits, in the result long
+     * @param nInts   the number of ints to convert
+     * @return a long containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nInts > src.length}
+     * @throws IllegalArgumentException       if {@code (nInts - 1) * 32 + dstPos >= 64}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static long intArrayToLong(final int[] src, final int srcPos, final long dstInit, final int dstPos, final int nInts) {
         if (src.length == 0 && srcPos == 0 || 0 == nInts) {
@@ -879,15 +879,15 @@ public static long intArrayToLong(final int[] src, final int srcPos, final long
     /**
      * Converts an int into an array of boolean using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the int to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 32}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}.
+     * @param src    the int to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}
+     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 32}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static boolean[] intToBinary(final int src, final int srcPos, final boolean[] dst, final int dstPos, final int nBools) {
         if (0 == nBools) {
@@ -906,15 +906,15 @@ public static boolean[] intToBinary(final int src, final int srcPos, final boole
     /**
      * Converts an int into an array of byte using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the int to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + srcPos >= 32}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}.
+     * @param src    the int to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}
+     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + srcPos >= 32}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static byte[] intToByteArray(final int src, final int srcPos, final byte[] dst, final int dstPos, final int nBytes) {
         if (0 == nBytes) {
@@ -933,14 +933,14 @@ public static byte[] intToByteArray(final int src, final int srcPos, final byte[
     /**
      * Converts an int into an array of char using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the int to convert.
-     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion.
-     * @param dstInit the initial value for the result String.
-     * @param dstPos  the position in {@code dst} where to copy the result.
-     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 32}.
-     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}.
+     * @param src     the int to convert
+     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion
+     * @param dstInit the initial value for the result String
+     * @param dstPos  the position in {@code dst} where to copy the result
+     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 32}
+     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}
      */
     public static String intToHex(final int src, final int srcPos, final String dstInit, final int dstPos, final int nHexs) {
         if (0 == nHexs) {
@@ -977,9 +977,9 @@ public static String intToHex(final int src, final int srcPos, final String dstI
      * 10 returns 'A' and so on...
      * </p>
      *
-     * @param nibble the 4 bits to convert.
-     * @return a hexadecimal digit representing the 4 LSB of {@code nibble}.
-     * @throws IllegalArgumentException if {@code nibble < 0} or {@code nibble > 15}.
+     * @param nibble the 4 bits to convert
+     * @return a hexadecimal digit representing the 4 LSB of {@code nibble}
+     * @throws IllegalArgumentException if {@code nibble < 0} or {@code nibble > 15}
      */
     public static char intToHexDigit(final int nibble) {
         final char c = Character.forDigit(nibble, 16);
@@ -1002,9 +1002,9 @@ public static char intToHexDigit(final int nibble) {
      * 10 returns '5' and so on...
      * </p>
      *
-     * @param nibble the 4 bits to convert.
-     * @return a hexadecimal digit representing the 4 LSB of {@code nibble}.
-     * @throws IllegalArgumentException if {@code nibble < 0} or {@code nibble > 15}.
+     * @param nibble the 4 bits to convert
+     * @return a hexadecimal digit representing the 4 LSB of {@code nibble}
+     * @throws IllegalArgumentException if {@code nibble < 0} or {@code nibble > 15}
      */
     public static char intToHexDigitMsb0(final int nibble) {
         switch (nibble) {
@@ -1048,15 +1048,15 @@ public static char intToHexDigitMsb0(final int nibble) {
     /**
      * Converts an int into an array of short using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the int to convert.
-     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst     the destination array.
-     * @param dstPos  the position in {@code dst} where to copy the result.
-     * @param nShorts the number of shorts to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + srcPos >= 32}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nShorts > dst.length}.
+     * @param src     the int to convert
+     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion
+     * @param dst     the destination array
+     * @param dstPos  the position in {@code dst} where to copy the result
+     * @param nShorts the number of shorts to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nShorts > dst.length}
+     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + srcPos >= 32}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static short[] intToShortArray(final int src, final int srcPos, final short[] dst, final int dstPos, final int nShorts) {
         if (0 == nShorts) {
@@ -1075,15 +1075,15 @@ public static short[] intToShortArray(final int src, final int srcPos, final sho
     /**
      * Converts a long into an array of boolean using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the long to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 64}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}.
+     * @param src    the long to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}
+     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 64}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static boolean[] longToBinary(final long src, final int srcPos, final boolean[] dst, final int dstPos, final int nBools) {
         if (0 == nBools) {
@@ -1102,15 +1102,15 @@ public static boolean[] longToBinary(final long src, final int srcPos, final boo
     /**
      * Converts a long into an array of byte using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the long to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + srcPos >= 64}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}.
+     * @param src    the long to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}
+     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + srcPos >= 64}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static byte[] longToByteArray(final long src, final int srcPos, final byte[] dst, final int dstPos, final int nBytes) {
         if (0 == nBytes) {
@@ -1129,14 +1129,14 @@ public static byte[] longToByteArray(final long src, final int srcPos, final byt
     /**
      * Converts a long into an array of char using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the long to convert.
-     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion.
-     * @param dstInit the initial value for the result String.
-     * @param dstPos  the position in {@code dst} where to copy the result.
-     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 64}.
-     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}.
+     * @param src     the long to convert
+     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion
+     * @param dstInit the initial value for the result String
+     * @param dstPos  the position in {@code dst} where to copy the result
+     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 64}
+     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}
      */
     public static String longToHex(final long src, final int srcPos, final String dstInit, final int dstPos, final int nHexs) {
         if (0 == nHexs) {
@@ -1163,15 +1163,15 @@ public static String longToHex(final long src, final int srcPos, final String ds
     /**
      * Converts a long into an array of int using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the long to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nInts  the number of ints to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null} and {@code nInts > 0}.
-     * @throws IllegalArgumentException       if {@code (nInts - 1) * 32 + srcPos >= 64}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nInts > dst.length}.
+     * @param src    the long to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nInts  the number of ints to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nInts > dst.length}
+     * @throws IllegalArgumentException       if {@code (nInts - 1) * 32 + srcPos >= 64}
+     * @throws NullPointerException           if {@code dst} is {@code null} and {@code nInts > 0}
      */
     public static int[] longToIntArray(final long src, final int srcPos, final int[] dst, final int dstPos, final int nInts) {
         if (0 == nInts) {
@@ -1190,15 +1190,15 @@ public static int[] longToIntArray(final long src, final int srcPos, final int[]
     /**
      * Converts a long into an array of short using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the long to convert.
-     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst     the destination array.
-     * @param dstPos  the position in {@code dst} where to copy the result.
-     * @param nShorts the number of shorts to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + srcPos >= 64}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nShorts > dst.length}.
+     * @param src     the long to convert
+     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion
+     * @param dst     the destination array
+     * @param dstPos  the position in {@code dst} where to copy the result
+     * @param nShorts the number of shorts to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nShorts > dst.length}
+     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + srcPos >= 64}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static short[] longToShortArray(final long src, final int srcPos, final short[] dst, final int dstPos, final int nShorts) {
         if (0 == nShorts) {
@@ -1217,15 +1217,15 @@ public static short[] longToShortArray(final long src, final int srcPos, final s
     /**
      * Converts an array of short into an int using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the short array to convert.
-     * @param srcPos  the position in {@code src}, in short unit, from where to start the conversion.
-     * @param dstInit initial value of the destination int.
-     * @param dstPos  the position of the LSB, in bits, in the result int.
-     * @param nShorts the number of shorts to convert.
-     * @return an int containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + dstPos >= 32}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nShorts > src.length}.
+     * @param src     the short array to convert
+     * @param srcPos  the position in {@code src}, in short unit, from where to start the conversion
+     * @param dstInit initial value of the destination int
+     * @param dstPos  the position of the LSB, in bits, in the result int
+     * @param nShorts the number of shorts to convert
+     * @return an int containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nShorts > src.length}
+     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + dstPos >= 32}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static int shortArrayToInt(final short[] src, final int srcPos, final int dstInit, final int dstPos, final int nShorts) {
         if (src.length == 0 && srcPos == 0 || 0 == nShorts) {
@@ -1247,15 +1247,15 @@ public static int shortArrayToInt(final short[] src, final int srcPos, final int
     /**
      * Converts an array of short into a long using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the short array to convert.
-     * @param srcPos  the position in {@code src}, in short unit, from where to start the conversion.
-     * @param dstInit initial value of the destination long.
-     * @param dstPos  the position of the LSB, in bits, in the result long.
-     * @param nShorts the number of shorts to convert.
-     * @return a long containing the selected bits.
-     * @throws NullPointerException           if {@code src} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + dstPos >= 64}.
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nShorts > src.length}.
+     * @param src     the short array to convert
+     * @param srcPos  the position in {@code src}, in short unit, from where to start the conversion
+     * @param dstInit initial value of the destination long
+     * @param dstPos  the position of the LSB, in bits, in the result long
+     * @param nShorts the number of shorts to convert
+     * @return a long containing the selected bits
+     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nShorts > src.length}
+     * @throws IllegalArgumentException       if {@code (nShorts - 1) * 16 + dstPos >= 64}
+     * @throws NullPointerException           if {@code src} is {@code null}
      */
     public static long shortArrayToLong(final short[] src, final int srcPos, final long dstInit, final int dstPos, final int nShorts) {
         if (src.length == 0 && srcPos == 0 || 0 == nShorts) {
@@ -1277,15 +1277,15 @@ public static long shortArrayToLong(final short[] src, final int srcPos, final l
     /**
      * Converts a short into an array of boolean using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the short to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 16}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}.
+     * @param src    the short to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBools the number of booleans to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBools > dst.length}
+     * @throws IllegalArgumentException       if {@code nBools -  1 + srcPos >= 16}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static boolean[] shortToBinary(final short src, final int srcPos, final boolean[] dst, final int dstPos, final int nBools) {
         if (0 == nBools) {
@@ -1305,15 +1305,15 @@ public static boolean[] shortToBinary(final short src, final int srcPos, final b
     /**
      * Converts a short into an array of byte using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the short to convert.
-     * @param srcPos the position in {@code src}, in bits, from where to start the conversion.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + srcPos >= 16}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}.
+     * @param src    the short to convert
+     * @param srcPos the position in {@code src}, in bits, from where to start the conversion
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}
+     * @throws IllegalArgumentException       if {@code (nBytes - 1) * 8 + srcPos >= 16}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static byte[] shortToByteArray(final short src, final int srcPos, final byte[] dst, final int dstPos, final int nBytes) {
         if (0 == nBytes) {
@@ -1332,14 +1332,14 @@ public static byte[] shortToByteArray(final short src, final int srcPos, final b
     /**
      * Converts a short into an array of char using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src     the short to convert.
-     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion.
-     * @param dstInit the initial value for the result String.
-     * @param dstPos  the position in {@code dst} where to copy the result.
-     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 16}.
-     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}.
+     * @param src     the short to convert
+     * @param srcPos  the position in {@code src}, in bits, from where to start the conversion
+     * @param dstInit the initial value for the result String
+     * @param dstPos  the position in {@code dst} where to copy the result
+     * @param nHexs   the number of chars to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws IllegalArgumentException        if {@code (nHexs - 1) * 4 + srcPos >= 16}
+     * @throws StringIndexOutOfBoundsException if {@code dst.init.length() < dstPos}
      */
     public static String shortToHex(final short src, final int srcPos, final String dstInit, final int dstPos, final int nHexs) {
         if (0 == nHexs) {
@@ -1366,14 +1366,14 @@ public static String shortToHex(final short src, final int srcPos, final String
     /**
      * Converts UUID into an array of byte using the default (little-endian, LSB0) byte and bit ordering.
      *
-     * @param src    the UUID to convert.
-     * @param dst    the destination array.
-     * @param dstPos the position in {@code dst} where to copy the result.
-     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB).
-     * @return {@code dst}.
-     * @throws NullPointerException           if {@code dst} is {@code null}.
-     * @throws IllegalArgumentException       if {@code nBytes > 16}.
-     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}.
+     * @param src    the UUID to convert
+     * @param dst    the destination array
+     * @param dstPos the position in {@code dst} where to copy the result
+     * @param nBytes the number of bytes to copy to {@code dst}, must be smaller or equal to the width of the input (from srcPos to MSB)
+     * @return {@code dst}
+     * @throws ArrayIndexOutOfBoundsException if {@code dstPos + nBytes > dst.length}
+     * @throws IllegalArgumentException       if {@code nBytes > 16}
+     * @throws NullPointerException           if {@code dst} is {@code null}
      */
     public static byte[] uuidToByteArray(final UUID src, final byte[] dst, final int dstPos, final int nBytes) {
         if (0 == nBytes) {
diff --git a/src/main/java/org/apache/commons/lang3/DoubleRange.java b/src/main/java/org/apache/commons/lang3/DoubleRange.java
index 060f4116e5a..fd4f9d12ec8 100644
--- a/src/main/java/org/apache/commons/lang3/DoubleRange.java
+++ b/src/main/java/org/apache/commons/lang3/DoubleRange.java
@@ -41,9 +41,9 @@ public final class DoubleRange extends NumberRange<Double> {
      * The arguments may be passed in the order (min, max) or (max,min). The getMinimum and getMaximum methods will return the correct values.
      * </p>
      *
-     * @param fromInclusive the first value that defines the edge of the range, inclusive.
-     * @param toInclusive the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
+     * @param fromInclusive the first value that defines the edge of the range, inclusive
+     * @param toInclusive the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
      */
     public static DoubleRange of(final double fromInclusive, final double toInclusive) {
         return of(Double.valueOf(fromInclusive), Double.valueOf(toInclusive));
@@ -60,10 +60,10 @@ public static DoubleRange of(final double fromInclusive, final double toInclusiv
      * The arguments may be passed in the order (min, max) or (max,min). The getMinimum and getMaximum methods will return the correct values.
      * </p>
      *
-     * @param fromInclusive the first value that defines the edge of the range, inclusive.
-     * @param toInclusive the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
-     * @throws NullPointerException if either element is null.
+     * @param fromInclusive the first value that defines the edge of the range, inclusive
+     * @param toInclusive the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
+     * @throws NullPointerException if either element is null
      */
     public static DoubleRange of(final Double fromInclusive, final Double toInclusive) {
         return new DoubleRange(fromInclusive, toInclusive);
@@ -72,10 +72,10 @@ public static DoubleRange of(final Double fromInclusive, final Double toInclusiv
     /**
      * Creates an instance.
      *
-     * @param number1 the first element, not null.
-     * @param number2 the second element, not null.
-     * @throws NullPointerException when element1 is null.
-     * @throws NullPointerException when element2 is null.
+     * @param number1 the first element, not null
+     * @param number2 the second element, not null
+     * @throws NullPointerException when element1 is null
+     * @throws NullPointerException when element2 is null
      */
     private DoubleRange(final Double number1, final Double number2) {
         super(number1, number2, null);
@@ -98,8 +98,8 @@ private DoubleRange(final Double number1, final Double number2) {
      * range.fit(99) -->  64
      * }</pre>
      *
-     * @param element the element to test.
-     * @return the minimum, the element, or the maximum depending on the element's location relative to the range.
+     * @param element the element to test
+     * @return the minimum, the element, or the maximum depending on the element's location relative to the range
      * @since 3.19.0
      */
     public double fit(final double element) {
diff --git a/src/main/java/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java
index 513b3140ae5..79c51c16eb3 100644
--- a/src/main/java/org/apache/commons/lang3/EnumUtils.java
+++ b/src/main/java/org/apache/commons/lang3/EnumUtils.java
@@ -47,11 +47,11 @@ public class EnumUtils {
     /**
      * Validate {@code enumClass}.
      *
-     * @param <E> the type of the enumeration.
-     * @param enumClass to check.
-     * @return {@code enumClass}.
-     * @throws NullPointerException if {@code enumClass} is {@code null}.
-     * @throws IllegalArgumentException if {@code enumClass} is not an enum class.
+     * @param <E> the type of the enumeration
+     * @param enumClass to check
+     * @return {@code enumClass}
+     * @throws IllegalArgumentException if {@code enumClass} is not an enum class
+     * @throws NullPointerException if {@code enumClass} is {@code null}
      * @since 3.2
      */
     private static <E extends Enum<E>> Class<E> asEnum(final Class<E> enumClass) {
@@ -63,11 +63,11 @@ private static <E extends Enum<E>> Class<E> asEnum(final Class<E> enumClass) {
     /**
      * Validate that {@code enumClass} is compatible with representation in a {@code long}.
      *
-     * @param <E> the type of the enumeration.
-     * @param enumClass to check.
-     * @return {@code enumClass}.
-     * @throws NullPointerException if {@code enumClass} is {@code null}.
-     * @throws IllegalArgumentException if {@code enumClass} is not an enum class or has more than 64 values.
+     * @param <E> the type of the enumeration
+     * @param enumClass to check
+     * @return {@code enumClass}
+     * @throws IllegalArgumentException if {@code enumClass} is not an enum class or has more than 64 values
+     * @throws NullPointerException if {@code enumClass} is {@code null}
      * @since 3.0.1
      */
     private static <E extends Enum<E>> Class<E> checkBitVectorable(final Class<E> enumClass) {
@@ -85,14 +85,14 @@ private static <E extends Enum<E>> Class<E> checkBitVectorable(final Class<E> en
      * <p>Do not use this method if you have more than 64 values in your Enum, as this
      * would create a value greater than a long can hold.</p>
      *
-     * @param enumClass the class of the enum we are working with, not {@code null}.
-     * @param values    the values we want to convert, not {@code null}.
-     * @param <E>       the type of the enumeration.
-     * @return a long whose value provides a binary representation of the given set of enum values.
-     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}.
-     * @throws IllegalArgumentException if {@code enumClass} is not an enum class or has more than 64 values.
-     * @since 3.0.1
+     * @param enumClass the class of the enum we are working with, not {@code null}
+     * @param values    the values we want to convert, not {@code null}
+     * @param <E>       the type of the enumeration
+     * @return a long whose value provides a binary representation of the given set of enum values
+     * @throws IllegalArgumentException if {@code enumClass} is not an enum class or has more than 64 values
+     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}
      * @see #generateBitVectors(Class, Iterable)
+     * @since 3.0.1
      */
     @SafeVarargs
     public static <E extends Enum<E>> long generateBitVector(final Class<E> enumClass, final E... values) {
@@ -108,15 +108,15 @@ public static <E extends Enum<E>> long generateBitVector(final Class<E> enumClas
      * <p>Do not use this method if you have more than 64 values in your Enum, as this
      * would create a value greater than a long can hold.</p>
      *
-     * @param enumClass the class of the enum we are working with, not {@code null}.
-     * @param values    the values we want to convert, not {@code null}, neither containing {@code null}.
-     * @param <E>       the type of the enumeration.
-     * @return a long whose value provides a binary representation of the given set of enum values.
-     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}.
+     * @param enumClass the class of the enum we are working with, not {@code null}
+     * @param values    the values we want to convert, not {@code null}, neither containing {@code null}
+     * @param <E>       the type of the enumeration
+     * @return a long whose value provides a binary representation of the given set of enum values
      * @throws IllegalArgumentException if {@code enumClass} is not an enum class or has more than 64 values,
-     *                                  or if any {@code values} {@code null}.
-     * @since 3.0.1
+     *                                  or if any {@code values} {@code null}
+     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}
      * @see #generateBitVectors(Class, Iterable)
+     * @since 3.0.1
      */
     public static <E extends Enum<E>> long generateBitVector(final Class<E> enumClass, final Iterable<? extends E> values) {
         checkBitVectorable(enumClass);
@@ -136,13 +136,13 @@ public static <E extends Enum<E>> long generateBitVector(final Class<E> enumClas
      *
      * <p>Use this method if you have more than 64 values in your Enum.</p>
      *
-     * @param enumClass the class of the enum we are working with, not {@code null}.
-     * @param values    the values we want to convert, not {@code null}, neither containing {@code null}.
-     * @param <E>       the type of the enumeration.
+     * @param enumClass the class of the enum we are working with, not {@code null}
+     * @param values    the values we want to convert, not {@code null}, neither containing {@code null}
+     * @param <E>       the type of the enumeration
      * @return a long[] whose values provide a binary representation of the given set of enum values
-     *         with the least significant digits rightmost.
-     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}.
-     * @throws IllegalArgumentException if {@code enumClass} is not an enum class, or if any {@code values} {@code null}.
+     *         with the least significant digits rightmost
+     * @throws IllegalArgumentException if {@code enumClass} is not an enum class, or if any {@code values} {@code null}
+     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}
      * @since 3.2
      */
     @SafeVarargs
@@ -166,13 +166,13 @@ public static <E extends Enum<E>> long[] generateBitVectors(final Class<E> enumC
      *
      * <p>Use this method if you have more than 64 values in your Enum.</p>
      *
-     * @param enumClass the class of the enum we are working with, not {@code null}.
-     * @param values    the values we want to convert, not {@code null}, neither containing {@code null}.
-     * @param <E>       the type of the enumeration.
+     * @param enumClass the class of the enum we are working with, not {@code null}
+     * @param values    the values we want to convert, not {@code null}, neither containing {@code null}
+     * @param <E>       the type of the enumeration
      * @return a long[] whose values provide a binary representation of the given set of enum values
-     *         with the least significant digits rightmost.
-     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}.
-     * @throws IllegalArgumentException if {@code enumClass} is not an enum class, or if any {@code values} {@code null}.
+     *         with the least significant digits rightmost
+     * @throws IllegalArgumentException if {@code enumClass} is not an enum class, or if any {@code values} {@code null}
+     * @throws NullPointerException if {@code enumClass} or {@code values} is {@code null}
      * @since 3.2
      */
     public static <E extends Enum<E>> long[] generateBitVectors(final Class<E> enumClass, final Iterable<? extends E> values) {
@@ -194,10 +194,10 @@ public static <E extends Enum<E>> long[] generateBitVectors(final Class<E> enumC
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name.</p>
      *
-     * @param <E> the type of the enumeration.
-     * @param enumClass  the class of the enum to query, not null.
-     * @param enumName   the enum name, null returns null.
-     * @return the enum, null if not found.
+     * @param <E> the type of the enumeration
+     * @param enumClass  the class of the enum to query, not null
+     * @param enumName   the enum name, null returns null
+     * @return the enum, null if not found
      */
     public static <E extends Enum<E>> E getEnum(final Class<E> enumClass, final String enumName) {
         return getEnum(enumClass, enumName, null);
@@ -209,11 +209,11 @@ public static <E extends Enum<E>> E getEnum(final Class<E> enumClass, final Stri
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name.</p>
      *
-     * @param <E> the type of the enumeration.
-     * @param enumClass   the class of the enum to query, null returns default enum.
-     * @param enumName    the enum name, null returns default enum.
-     * @param defaultEnum the default enum.
-     * @return the enum, default enum if not found.
+     * @param <E> the type of the enumeration
+     * @param enumClass   the class of the enum to query, null returns default enum
+     * @param enumName    the enum name, null returns default enum
+     * @param defaultEnum the default enum
+     * @return the enum, default enum if not found
      * @since 3.10
      */
     public static <E extends Enum<E>> E getEnum(final Class<E> enumClass, final String enumName, final E defaultEnum) {
@@ -233,10 +233,10 @@ public static <E extends Enum<E>> E getEnum(final Class<E> enumClass, final Stri
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name and performs case insensitive matching of the name.</p>
      *
-     * @param <E>         the type of the enumeration.
-     * @param enumClass   the class of the enum to query, may be null.
-     * @param enumName    the enum name, null returns null.
-     * @return the enum, null if not found.
+     * @param <E>         the type of the enumeration
+     * @param enumClass   the class of the enum to query, may be null
+     * @param enumName    the enum name, null returns null
+     * @return the enum, null if not found
      * @since 3.8
      */
     public static <E extends Enum<E>> E getEnumIgnoreCase(final Class<E> enumClass, final String enumName) {
@@ -249,11 +249,11 @@ public static <E extends Enum<E>> E getEnumIgnoreCase(final Class<E> enumClass,
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name and performs case insensitive matching of the name.</p>
      *
-     * @param <E>         the type of the enumeration.
-     * @param enumClass   the class of the enum to query, null returns default enum.
-     * @param enumName    the enum name, null returns default enum.
-     * @param defaultEnum the default enum.
-     * @return the enum, default enum if not found.
+     * @param <E>         the type of the enumeration
+     * @param enumClass   the class of the enum to query, null returns default enum
+     * @param enumName    the enum name, null returns default enum
+     * @param defaultEnum the default enum
+     * @return the enum, default enum if not found
      * @since 3.10
      */
     public static <E extends Enum<E>> E getEnumIgnoreCase(final Class<E> enumClass, final String enumName,
@@ -266,9 +266,9 @@ public static <E extends Enum<E>> E getEnumIgnoreCase(final Class<E> enumClass,
      *
      * <p>This method is useful when you need a list of enums rather than an array.</p>
      *
-     * @param <E> the type of the enumeration.
-     * @param enumClass  the class of the enum to query, not null.
-     * @return the modifiable list of enums, never null.
+     * @param <E> the type of the enumeration
+     * @param enumClass  the class of the enum to query, not null
+     * @return the modifiable list of enums, never null
      */
     public static <E extends Enum<E>> List<E> getEnumList(final Class<E> enumClass) {
         return new ArrayList<>(Arrays.asList(enumClass.getEnumConstants()));
@@ -279,9 +279,9 @@ public static <E extends Enum<E>> List<E> getEnumList(final Class<E> enumClass)
      *
      * <p>This method is useful when you need a map of enums by name.</p>
      *
-     * @param <E> the type of the enumeration.
-     * @param enumClass  the class of the enum to query, not null.
-     * @return the modifiable map of enum names to enums, never null.
+     * @param <E> the type of the enumeration
+     * @param enumClass  the class of the enum to query, not null
+     * @return the modifiable map of enum names to enums, never null
      */
     public static <E extends Enum<E>> Map<String, E> getEnumMap(final Class<E> enumClass) {
         return getEnumMap(enumClass, E::name);
@@ -294,11 +294,11 @@ public static <E extends Enum<E>> Map<String, E> getEnumMap(final Class<E> enumC
      * This method is useful when you need a map of enums by name.
      * </p>
      *
-     * @param <E>         the type of enumeration.
-     * @param <K>         the type of the map key.
-     * @param enumClass   the class of the enum to query, not null.
-     * @param keyFunction the function to query for the key, not null.
-     * @return the modifiable map of enums, never null.
+     * @param <E>         the type of enumeration
+     * @param <K>         the type of the map key
+     * @param enumClass   the class of the enum to query, not null
+     * @param keyFunction the function to query for the key, not null
+     * @return the modifiable map of enums, never null
      * @since 3.13.0
      */
     public static <E extends Enum<E>, K> Map<K, E> getEnumMap(final Class<E> enumClass, final Function<E, K> keyFunction) {
@@ -315,11 +315,11 @@ public static <E extends Enum<E>, K> Map<K, E> getEnumMap(final Class<E> enumCla
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param <E>         the type of the enumeration.
-     * @param enumClass   the class of the enum to query, not null.
-     * @param propName    the system property key for the enum name, null returns default enum.
-     * @param defaultEnum the default enum.
-     * @return the enum, default enum if not found.
+     * @param <E>         the type of the enumeration
+     * @param enumClass   the class of the enum to query, not null
+     * @param propName    the system property key for the enum name, null returns default enum
+     * @param defaultEnum the default enum
+     * @return the enum, default enum if not found
      * @since 3.13.0
      */
     public static <E extends Enum<E>> E getEnumSystemProperty(final Class<E> enumClass, final String propName, final E defaultEnum) {
@@ -334,12 +334,12 @@ public static <E extends Enum<E>> E getEnumSystemProperty(final Class<E> enumCla
      * the name.
      * </p>
      *
-     * @param <E>           the type of the enumeration.
-     * @param enumClass     the class of the enum to query, not null.
-     * @param value         the enum name, null returns default enum.
-     * @param toIntFunction the function that gets an int for an enum for comparison to {@code value}.
-     * @param defaultEnum   the default enum.
-     * @return an enum, default enum if not found.
+     * @param <E>           the type of the enumeration
+     * @param enumClass     the class of the enum to query, not null
+     * @param value         the enum name, null returns default enum
+     * @param toIntFunction the function that gets an int for an enum for comparison to {@code value}
+     * @param defaultEnum   the default enum
+     * @return an enum, default enum if not found
      * @since 3.18.0
      */
     public static <E extends Enum<E>> E getFirstEnum(final Class<E> enumClass, final int value, final ToIntFunction<E> toIntFunction, final E defaultEnum) {
@@ -355,12 +355,12 @@ public static <E extends Enum<E>> E getFirstEnum(final Class<E> enumClass, final
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name and performs case insensitive matching of the name.</p>
      *
-     * @param <E>         the type of the enumeration.
-     * @param enumClass   the class of the enum to query, null returns default enum.
-     * @param enumName    the enum name, null returns default enum.
-     * @param stringFunction the function that gets the string for an enum for comparison to {@code enumName}.
-     * @param defaultEnum the default enum.
-     * @return an enum, default enum if not found.
+     * @param <E>         the type of the enumeration
+     * @param enumClass   the class of the enum to query, null returns default enum
+     * @param enumName    the enum name, null returns default enum
+     * @param stringFunction the function that gets the string for an enum for comparison to {@code enumName}
+     * @param defaultEnum the default enum
+     * @return an enum, default enum if not found
      * @since 3.13.0
      */
     public static <E extends Enum<E>> E getFirstEnumIgnoreCase(final Class<E> enumClass, final String enumName, final Function<E, String> stringFunction,
@@ -382,10 +382,10 @@ private static <E extends Enum<E>> boolean isEnum(final Class<E> enumClass) {
      * This method differs from {@link Enum#valueOf} in that it checks if the name is a valid enum without needing to catch the exception.
      * </p>
      *
-     * @param <E>       the type of the enumeration.
-     * @param enumClass the class of the enum to query, null returns false.
-     * @param enumName  the enum name, null returns false.
-     * @return true if the enum name is valid, otherwise false.
+     * @param <E>       the type of the enumeration
+     * @param enumClass the class of the enum to query, null returns false
+     * @param enumName  the enum name, null returns false
+     * @return true if the enum name is valid, otherwise false
      */
     public static <E extends Enum<E>> boolean isValidEnum(final Class<E> enumClass, final String enumName) {
         return getEnum(enumClass, enumName) != null;
@@ -399,10 +399,10 @@ public static <E extends Enum<E>> boolean isValidEnum(final Class<E> enumClass,
      * insensitive matching of the name.
      * </p>
      *
-     * @param <E>       the type of the enumeration.
-     * @param enumClass the class of the enum to query, null returns false.
-     * @param enumName  the enum name, null returns false.
-     * @return true if the enum name is valid, otherwise false.
+     * @param <E>       the type of the enumeration
+     * @param enumClass the class of the enum to query, null returns false
+     * @param enumName  the enum name, null returns false
+     * @return true if the enum name is valid, otherwise false
      * @since 3.8
      */
     public static <E extends Enum<E>> boolean isValidEnumIgnoreCase(final Class<E> enumClass, final String enumName) {
@@ -415,12 +415,12 @@ public static <E extends Enum<E>> boolean isValidEnumIgnoreCase(final Class<E> e
      *
      * <p>If you store this value, beware any changes to the enum that would affect ordinal values.</p>
      *
-     * @param enumClass the class of the enum we are working with, not {@code null}.
-     * @param value     the long value representation of a set of enum values.
-     * @param <E>       the type of the enumeration.
-     * @return a set of enum values.
-     * @throws NullPointerException if {@code enumClass} is {@code null}.
-     * @throws IllegalArgumentException if {@code enumClass} is not an enum class or has more than 64 values.
+     * @param enumClass the class of the enum we are working with, not {@code null}
+     * @param value     the long value representation of a set of enum values
+     * @param <E>       the type of the enumeration
+     * @return a set of enum values
+     * @throws IllegalArgumentException if {@code enumClass} is not an enum class or has more than 64 values
+     * @throws NullPointerException if {@code enumClass} is {@code null}
      * @since 3.0.1
      */
     public static <E extends Enum<E>> EnumSet<E> processBitVector(final Class<E> enumClass, final long value) {
@@ -433,12 +433,12 @@ public static <E extends Enum<E>> EnumSet<E> processBitVector(final Class<E> enu
      *
      * <p>If you store this value, beware any changes to the enum that would affect ordinal values.</p>
      *
-     * @param enumClass the class of the enum we are working with, not {@code null}.
-     * @param values     the long[] bearing the representation of a set of enum values, the least significant digits rightmost, not {@code null}.
-     * @param <E>       the type of the enumeration.
-     * @return a set of enum values.
-     * @throws NullPointerException if {@code enumClass} is {@code null}.
-     * @throws IllegalArgumentException if {@code enumClass} is not an enum class.
+     * @param enumClass the class of the enum we are working with, not {@code null}
+     * @param values     the long[] bearing the representation of a set of enum values, the least significant digits rightmost, not {@code null}
+     * @param <E>       the type of the enumeration
+     * @return a set of enum values
+     * @throws IllegalArgumentException if {@code enumClass} is not an enum class
+     * @throws NullPointerException if {@code enumClass} is {@code null}
      * @since 3.2
      */
     public static <E extends Enum<E>> EnumSet<E> processBitVectors(final Class<E> enumClass, final long... values) {
@@ -457,11 +457,11 @@ public static <E extends Enum<E>> EnumSet<E> processBitVectors(final Class<E> en
     /**
      * Returns a sequential ordered stream whose elements are the given class' enum values.
      *
-     * @param <T>   the type of stream elements.
-     * @param clazz the class containing the enum values, may be null.
-     * @return the new stream, empty of {@code clazz} is null.
-     * @since 3.18.0
+     * @param <T>   the type of stream elements
+     * @param clazz the class containing the enum values, may be null
+     * @return the new stream, empty of {@code clazz} is null
      * @see Class#getEnumConstants()
+     * @since 3.18.0
      */
     public static <T> Stream<T> stream(final Class<T> clazz) {
         return clazz != null ? Streams.of(clazz.getEnumConstants()) : Stream.empty();
diff --git a/src/main/java/org/apache/commons/lang3/Functions.java b/src/main/java/org/apache/commons/lang3/Functions.java
index 70f0aaf3927..5b5b5fc09bd 100644
--- a/src/main/java/org/apache/commons/lang3/Functions.java
+++ b/src/main/java/org/apache/commons/lang3/Functions.java
@@ -80,9 +80,9 @@ public class Functions {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <O1> Consumed type 1.
-     * @param <O2> Consumed type 2.
-     * @param <T> Thrown exception.
+     * @param <O1> consumed type 1
+     * @param <O2> consumed type 2
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableBiConsumer}.
      */
     @Deprecated
@@ -94,7 +94,7 @@ public interface FailableBiConsumer<O1, O2, T extends Throwable> {
          *
          * @param object1 the first parameter for the consumable to accept
          * @param object2 the second parameter for the consumable to accept
-         * @throws T Thrown when the consumer fails.
+         * @throws T thrown when the consumer fails
          */
         void accept(O1 object1, O2 object2) throws T;
     }
@@ -104,10 +104,10 @@ public interface FailableBiConsumer<O1, O2, T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <O1> Input type 1.
-     * @param <O2> Input type 2.
-     * @param <R> Return type.
-     * @param <T> Thrown exception.
+     * @param <O1> input type 1
+     * @param <O2> input type 2
+     * @param <R> return type
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableBiFunction}.
      */
     @Deprecated
@@ -120,7 +120,7 @@ public interface FailableBiFunction<O1, O2, R, T extends Throwable> {
          * @param input1 the first input for the function
          * @param input2 the second input for the function
          * @return the result of the function
-         * @throws T Thrown when the function fails.
+         * @throws T thrown when the function fails
          */
         R apply(O1 input1, O2 input2) throws T;
     }
@@ -130,9 +130,9 @@ public interface FailableBiFunction<O1, O2, R, T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <O1> Predicate type 1.
-     * @param <O2> Predicate type 2.
-     * @param <T> Thrown exception.
+     * @param <O1> predicate type 1
+     * @param <O2> predicate type 2
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableBiPredicate}.
      */
     @Deprecated
@@ -155,8 +155,8 @@ public interface FailableBiPredicate<O1, O2, T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <R> Return type.
-     * @param <T> Thrown exception.
+     * @param <R> return type
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableCallable}.
      */
     @Deprecated
@@ -166,7 +166,7 @@ public interface FailableCallable<R, T extends Throwable> {
         /**
          * Calls the callable.
          *
-         * @return The value returned from the callable
+         * @return the value returned from the callable
          * @throws T if the callable fails
          */
         R call() throws T;
@@ -177,8 +177,8 @@ public interface FailableCallable<R, T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <O> Consumed type 1.
-     * @param <T> Thrown exception.
+     * @param <O> consumed type 1
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableConsumer}.
      */
     @Deprecated
@@ -189,7 +189,7 @@ public interface FailableConsumer<O, T extends Throwable> {
          * Accepts the consumer.
          *
          * @param object the parameter for the consumable to accept
-         * @throws T Thrown when the consumer fails.
+         * @throws T thrown when the consumer fails
          */
         void accept(O object) throws T;
     }
@@ -199,9 +199,9 @@ public interface FailableConsumer<O, T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <I> Input type 1.
-     * @param <R> Return type.
-     * @param <T> Thrown exception.
+     * @param <I> input type 1
+     * @param <R> return type
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableFunction}.
      */
     @Deprecated
@@ -213,7 +213,7 @@ public interface FailableFunction<I, R, T extends Throwable> {
          *
          * @param input the input for the function
          * @return the result of the function
-         * @throws T Thrown when the function fails.
+         * @throws T thrown when the function fails
          */
         R apply(I input) throws T;
     }
@@ -223,8 +223,8 @@ public interface FailableFunction<I, R, T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <I> Predicate type 1.
-     * @param <T> Thrown exception.
+     * @param <I> predicate type 1
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailablePredicate}.
      */
     @Deprecated
@@ -246,7 +246,7 @@ public interface FailablePredicate<I, T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <T> Thrown exception.
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableRunnable}.
      */
     @Deprecated
@@ -256,7 +256,7 @@ public interface FailableRunnable<T extends Throwable> {
         /**
          * Runs the function.
          *
-         * @throws T Thrown when the function fails.
+         * @throws T thrown when the function fails
          */
         void run() throws T;
     }
@@ -266,8 +266,8 @@ public interface FailableRunnable<T extends Throwable> {
      *
      * <p>TODO for 4.0: Move to org.apache.commons.lang3.function.</p>
      *
-     * @param <R> Return type.
-     * @param <T> Thrown exception.
+     * @param <R> return type
+     * @param <T> thrown exception
      * @deprecated Use {@link org.apache.commons.lang3.function.FailableSupplier}.
      */
     @Deprecated
@@ -275,7 +275,7 @@ public interface FailableRunnable<T extends Throwable> {
     public interface FailableSupplier<R, T extends Throwable> {
 
         /**
-         * Supplies an object
+         * Supplies an object.
          *
          * @return a result
          * @throws T if the supplier fails
@@ -468,10 +468,10 @@ public static <O, T extends Throwable> O call(final FailableCallable<O, T> calla
     /**
      * Invokes a supplier, and returns the result.
      *
-     * @param supplier The supplier to invoke.
-     * @param <O> The suppliers output type.
-     * @param <T> The type of checked exception, which the supplier can throw.
-     * @return The object, which has been created by the supplier
+     * @param supplier the supplier to invoke
+     * @param <O> the suppliers output type
+     * @param <T> the type of checked exception, which the supplier can throw
+     * @return the object, which has been created by the supplier
      * @since 3.10
      */
     public static <O, T extends Throwable> O get(final FailableSupplier<O, T> supplier) {
@@ -485,9 +485,9 @@ public static <O, T extends Throwable> O get(final FailableSupplier<O, T> suppli
     /**
      * Invokes a boolean supplier, and returns the result.
      *
-     * @param supplier The boolean supplier to invoke.
-     * @param <T> The type of checked exception, which the supplier can throw.
-     * @return The boolean, which has been created by the supplier
+     * @param supplier the boolean supplier to invoke
+     * @param <T> the type of checked exception, which the supplier can throw
+     * @return the boolean, which has been created by the supplier
      */
     private static <T extends Throwable> boolean getAsBoolean(final FailableBooleanSupplier<T> supplier) {
         try {
@@ -518,8 +518,8 @@ private static <T extends Throwable> boolean getAsBoolean(final FailableBooleanS
      * follow the method call, like a {@code return} statement from a value returning method.
      * </p>
      *
-     * @param throwable The throwable to rethrow possibly wrapped into an unchecked exception
-     * @return Never returns anything, this method never terminates normally.
+     * @param throwable the throwable to rethrow possibly wrapped into an unchecked exception
+     * @return never returns anything, this method never terminates normally
      */
     public static RuntimeException rethrow(final Throwable throwable) {
         Objects.requireNonNull(throwable, "throwable");
@@ -533,7 +533,7 @@ public static RuntimeException rethrow(final Throwable throwable) {
     /**
      * Runs a runnable and rethrows any exception as a {@link RuntimeException}.
      *
-     * @param runnable The runnable to run
+     * @param runnable the runnable to run
      * @param <T> the type of checked exception the runnable may throw
      */
     public static <T extends Throwable> void run(final FailableRunnable<T> runnable) {
@@ -551,9 +551,9 @@ public static <T extends Throwable> void run(final FailableRunnable<T> runnable)
      * <pre>
      * Functions.stream(collection.stream());</pre>
      *
-     * @param collection The collection, which is being converted into a {@link FailableStream}.
-     * @param <O> The collections element type. (In turn, the result streams element type.)
-     * @return The created {@link FailableStream}.
+     * @param collection the collection, which is being converted into a {@link FailableStream}
+     * @param <O> the collections element type. (In turn, the result streams element type.)
+     * @return the created {@link FailableStream}
      * @since 3.10
      */
     public static <O> FailableStream<O> stream(final Collection<O> collection) {
@@ -566,9 +566,9 @@ public static <O> FailableStream<O> stream(final Collection<O> collection) {
      * {@link FailableFunction}, and {@link FailableConsumer} may be applied, rather than {@link Predicate},
      * {@link Function}, {@link Consumer}, etc.
      *
-     * @param stream The stream, which is being converted into a {@link FailableStream}.
-     * @param <O> The streams element type.
-     * @return The created {@link FailableStream}.
+     * @param stream the stream, which is being converted into a {@link FailableStream}
+     * @param <O> the streams element type
+     * @return the created {@link FailableStream}
      * @since 3.10
      */
     public static <O> FailableStream<O> stream(final Stream<O> stream) {
@@ -617,10 +617,10 @@ public static <O, T extends Throwable> boolean test(final FailablePredicate<O, T
      *     Functions.tryWithResources(useInputStream(fis), null, () -> fis.close());
      * }</pre>
      *
-     * @param action The action to execute. This object <em>will</em> always be invoked.
-     * @param errorHandler An optional error handler, which will be invoked finally, if any error occurred. The error
+     * @param action the action to execute. This object <em>will</em> always be invoked.
+     * @param errorHandler an optional error handler, which will be invoked finally, if any error occurred. The error
      *        handler will receive the first error, AKA {@link Throwable}.
-     * @param resources The resource actions to execute. <em>All</em> resource actions will be invoked, in the given
+     * @param resources the resource actions to execute. <em>All</em> resource actions will be invoked, in the given
      *        order. A resource action is an instance of {@link FailableRunnable}, which will be executed.
      * @see #tryWithResources(FailableRunnable, FailableRunnable...)
      */
@@ -646,8 +646,8 @@ public static void tryWithResources(final FailableRunnable<? extends Throwable>
      *     Functions.tryWithResources(useInputStream(fis), () -> fis.close());
      * }</pre>
      *
-     * @param action The action to execute. This object <em>will</em> always be invoked.
-     * @param resources The resource actions to execute. <em>All</em> resource actions will be invoked, in the given
+     * @param action the action to execute. This object <em>will</em> always be invoked.
+     * @param resources the resource actions to execute. <em>All</em> resource actions will be invoked, in the given
      *        order. A resource action is an instance of {@link FailableRunnable}, which will be executed.
      * @see #tryWithResources(FailableRunnable, FailableConsumer, FailableRunnable...)
      */
diff --git a/src/main/java/org/apache/commons/lang3/IntegerRange.java b/src/main/java/org/apache/commons/lang3/IntegerRange.java
index 69dc1a58459..0062482ec91 100644
--- a/src/main/java/org/apache/commons/lang3/IntegerRange.java
+++ b/src/main/java/org/apache/commons/lang3/IntegerRange.java
@@ -43,9 +43,9 @@ public final class IntegerRange extends NumberRange<Integer> {
      * The arguments may be passed in the order (min, max) or (max,min). The getMinimum and getMaximum methods will return the correct values.
      * </p>
      *
-     * @param fromInclusive the first value that defines the edge of the range, inclusive.
-     * @param toInclusive the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
+     * @param fromInclusive the first value that defines the edge of the range, inclusive
+     * @param toInclusive the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
      */
     public static IntegerRange of(final int fromInclusive, final int toInclusive) {
         return of(Integer.valueOf(fromInclusive), Integer.valueOf(toInclusive));
@@ -62,10 +62,10 @@ public static IntegerRange of(final int fromInclusive, final int toInclusive) {
      * The arguments may be passed in the order (min, max) or (max,min). The getMinimum and getMaximum methods will return the correct values.
      * </p>
      *
-     * @param fromInclusive the first value that defines the edge of the range, inclusive.
-     * @param toInclusive the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
-     * @throws NullPointerException if either element is null.
+     * @param fromInclusive the first value that defines the edge of the range, inclusive
+     * @param toInclusive the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
+     * @throws NullPointerException if either element is null
      */
     public static IntegerRange of(final Integer fromInclusive, final Integer toInclusive) {
         return new IntegerRange(fromInclusive, toInclusive);
@@ -74,10 +74,10 @@ public static IntegerRange of(final Integer fromInclusive, final Integer toInclu
     /**
      * Creates a new instance.
      *
-     * @param number1 the first element, not null.
-     * @param number2 the second element, not null.
-     * @throws NullPointerException when element1 is null.
-     * @throws NullPointerException when element2 is null.
+     * @param number1 the first element, not null
+     * @param number2 the second element, not null
+     * @throws NullPointerException when element1 is null
+     * @throws NullPointerException when element2 is null
      */
     private IntegerRange(final Integer number1, final Integer number2) {
         super(number1, number2, null);
@@ -100,8 +100,8 @@ private IntegerRange(final Integer number1, final Integer number2) {
      * range.fit(99) -->  64
      * }</pre>
      *
-     * @param element the element to test.
-     * @return the minimum, the element, or the maximum depending on the element's location relative to the range.
+     * @param element the element to test
+     * @return the minimum, the element, or the maximum depending on the element's location relative to the range
      * @since 3.19.0
      */
     public int fit(final int element) {
@@ -112,7 +112,7 @@ public int fit(final int element) {
      * Returns a sequential ordered {@code IntStream} from {@link #getMinimum()} (inclusive) to {@link #getMaximum()} (inclusive) by an incremental step of
      * {@code 1}.
      *
-     * @return a sequential {@code IntStream} for the range of {@code int} elements.
+     * @return a sequential {@code IntStream} for the range of {@code int} elements
      * @since 3.18.0
      */
     public IntStream toIntStream() {
diff --git a/src/main/java/org/apache/commons/lang3/JavaVersion.java b/src/main/java/org/apache/commons/lang3/JavaVersion.java
index af13d4ae4d5..6424d33faa0 100644
--- a/src/main/java/org/apache/commons/lang3/JavaVersion.java
+++ b/src/main/java/org/apache/commons/lang3/JavaVersion.java
@@ -220,8 +220,8 @@ public enum JavaVersion {
     /**
      * Transforms the given string with a Java version number to the corresponding constant of this enumeration class. This method is used internally.
      *
-     * @param versionStr the Java version as string.
-     * @return the corresponding enumeration constant or <strong>null</strong> if the version is unknown.
+     * @param versionStr the Java version as string
+     * @return the corresponding enumeration constant or <strong>null</strong> if the version is unknown
      */
     static JavaVersion get(final String versionStr) {
         if (versionStr == null) {
@@ -302,8 +302,8 @@ static JavaVersion get(final String versionStr) {
     /**
      * Transforms the given string with a Java version number to the corresponding constant of this enumeration class. This method is used internally.
      *
-     * @param versionStr the Java version as string.
-     * @return the corresponding enumeration constant or <strong>null</strong> if the version is unknown.
+     * @param versionStr the Java version as string
+     * @return the corresponding enumeration constant or <strong>null</strong> if the version is unknown
      */
     static JavaVersion getJavaVersion(final String versionStr) {
         return get(versionStr);
@@ -312,7 +312,7 @@ static JavaVersion getJavaVersion(final String versionStr) {
     /**
      * Gets the Java Version from the system or 99.0 if the {@code java.specification.version} system property is not set.
      *
-     * @return the value of {@code java.specification.version} system property or 99.0 if it is not set.
+     * @return the value of {@code java.specification.version} system property or 99.0 if it is not set
      */
     private static float maxVersion() {
         final float v = toFloatVersion(SystemProperties.getJavaSpecificationVersion("99.0"));
@@ -326,8 +326,8 @@ static String[] split(final String value) {
     /**
      * Parses a float value from a String.
      *
-     * @param value the String to parse.
-     * @return the float value represented by the string or -1 if the given String cannot be parsed.
+     * @param value the String to parse
+     * @return the float value represented by the string or -1 if the given String cannot be parsed
      */
     private static float toFloatVersion(final String value) {
         final int defaultReturnValue = -1;
@@ -354,8 +354,8 @@ private static float toFloatVersion(final String value) {
     /**
      * Constructs a new instance.
      *
-     * @param value the float value.
-     * @param name  the standard name, not null.
+     * @param value the float value
+     * @param name  the standard name, not null
      */
     JavaVersion(final float value, final String name) {
         this.value = value;
@@ -374,8 +374,8 @@ private static float toFloatVersion(final String value) {
      * myVersion.atLeast(JavaVersion.JAVA_1_8)
      * }</pre>
      *
-     * @param requiredVersion the version to check against, not null.
-     * @return true if this version is equal to or greater than the specified version.
+     * @param requiredVersion the version to check against, not null
+     * @return true if this version is equal to or greater than the specified version
      */
     public boolean atLeast(final JavaVersion requiredVersion) {
         return this.value >= requiredVersion.value;
@@ -393,8 +393,8 @@ public boolean atLeast(final JavaVersion requiredVersion) {
      * myVersion.atMost(JavaVersion.JAVA_1_4)
      * }</pre>
      *
-     * @param requiredVersion the version to check against, not null.
-     * @return true if this version is equal to or greater than the specified version.
+     * @param requiredVersion the version to check against, not null
+     * @return true if this version is equal to or greater than the specified version
      * @since 3.9
      */
     public boolean atMost(final JavaVersion requiredVersion) {
@@ -408,7 +408,7 @@ public boolean atMost(final JavaVersion requiredVersion) {
      * For example, {@code "1.5"}.
      * </p>
      *
-     * @return the name, not null.
+     * @return the name, not null
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
index 3b720a8c54c..b2c7d80182c 100644
--- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
+++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
@@ -98,7 +98,7 @@ private static final class SyncAvoid {
      * called.
      * </p>
      *
-     * @return the unmodifiable and sorted list of available locales.
+     * @return the unmodifiable and sorted list of available locales
      */
     public static List<Locale> availableLocaleList() {
         return SyncAvoid.AVAILABLE_LOCALE_ULIST;
@@ -116,7 +116,7 @@ private static List<Locale> availableLocaleList(final Predicate<Locale> predicat
      * called.
      * </p>
      *
-     * @return the unmodifiable set of available locales.
+     * @return the unmodifiable set of available locales
      */
     public static Set<Locale> availableLocaleSet() {
         return SyncAvoid.AVAILABLE_LOCALE_USET;
@@ -129,8 +129,8 @@ public static Set<Locale> availableLocaleSet() {
      * This method takes a language code and searches to find the countries available for that language. Variant locales are removed.
      * </p>
      *
-     * @param languageCode the 2 letter language code, null returns empty.
-     * @return an unmodifiable List of Locale objects, not null.
+     * @param languageCode the 2 letter language code, null returns empty
+     * @return an unmodifiable List of Locale objects, not null
      */
     public static List<Locale> countriesByLanguage(final String languageCode) {
         if (languageCode == null) {
@@ -143,8 +143,8 @@ public static List<Locale> countriesByLanguage(final String languageCode) {
     /**
      * Tests whether the given Locale defines a variant.
      *
-     * @param locale The Locale to test.
-     * @return whether the given Locale defines a variant.
+     * @param locale the Locale to test
+     * @return whether the given Locale defines a variant
      */
     private static boolean hasCountry(final Locale locale) {
         return locale.getCountry().isEmpty();
@@ -153,8 +153,8 @@ private static boolean hasCountry(final Locale locale) {
     /**
      * Tests whether the given Locale defines a country.
      *
-     * @param locale The Locale to test.
-     * @return whether the given Locale defines a country.
+     * @param locale the Locale to test
+     * @return whether the given Locale defines a country
      */
     private static boolean hasVariant(final Locale locale) {
         return locale.getVariant().isEmpty();
@@ -163,8 +163,8 @@ private static boolean hasVariant(final Locale locale) {
     /**
      * Tests whether the given string is the length of an <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> alpha-2 country code.
      *
-     * @param str The string to test.
-     * @return whether the given string is the length of an <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> alpha-2 country code.
+     * @param str the string to test
+     * @return whether the given string is the length of an <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> alpha-2 country code
      */
     private static boolean isAlpha2Len(final String str) {
         return str.length() == 2;
@@ -173,8 +173,8 @@ private static boolean isAlpha2Len(final String str) {
     /**
      * Tests whether the given string is the length of an <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> alpha-3 country code.
      *
-     * @param str The string to test.
-     * @return whether the given string is the length of an <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> alpha-3 country code.
+     * @param str the string to test
+     * @return whether the given string is the length of an <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> alpha-3 country code
      */
     private static boolean isAlpha3Len(final String str) {
         return str.length() == 3;
@@ -183,8 +183,8 @@ private static boolean isAlpha3Len(final String str) {
     /**
      * Checks if the locale specified is in the set of available locales.
      *
-     * @param locale the Locale object to check if it is available.
-     * @return true if the locale is a known locale.
+     * @param locale the Locale object to check if it is available
+     * @return true if the locale is a known locale
      */
     public static boolean isAvailableLocale(final Locale locale) {
         return availableLocaleSet().contains(locale);
@@ -193,8 +193,8 @@ public static boolean isAvailableLocale(final Locale locale) {
     /**
      * Tests whether the given String is a <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> alpha-2 country code.
      *
-     * @param str the String to check.
-     * @return true, is the given String is a <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> compliant country code.
+     * @param str the String to check
+     * @return true, is the given String is a <a href="https://www.iso.org/iso-3166-country-codes.html">ISO 3166</a> compliant country code
      */
     private static boolean isISO3166CountryCode(final String str) {
         return StringUtils.isAllUpperCase(str) && isAlpha2Len(str);
@@ -203,8 +203,8 @@ private static boolean isISO3166CountryCode(final String str) {
     /**
      * Tests whether the given String is a <a href="https://www.iso.org/iso-639-language-code">ISO 639</a> compliant language code.
      *
-     * @param str the String to check.
-     * @return true, if the given String is a <a href="https://www.iso.org/iso-639-language-code">ISO 639</a> compliant language code.
+     * @param str the String to check
+     * @return true, if the given String is a <a href="https://www.iso.org/iso-639-language-code">ISO 639</a> compliant language code
      */
     private static boolean isISO639LanguageCode(final String str) {
         return StringUtils.isAllLowerCase(str) && (isAlpha2Len(str) || isAlpha3Len(str));
@@ -217,8 +217,8 @@ private static boolean isISO639LanguageCode(final String str) {
      * equal to {@code "und"}.
      * </p>
      *
-     * @param locale the locale to test.
-     * @return whether a Locale's language is undetermined.
+     * @param locale the locale to test
+     * @return whether a Locale's language is undetermined
      * @see Locale#toLanguageTag()
      * @since 3.14.0
      */
@@ -229,8 +229,8 @@ public static boolean isLanguageUndetermined(final Locale locale) {
     /**
      * TestsNo whether the given String is a UN M.49 numeric area code.
      *
-     * @param str the String to check.
-     * @return true, is the given String is a UN M.49 numeric area code.
+     * @param str the String to check
+     * @return true, is the given String is a UN M.49 numeric area code
      */
     private static boolean isNumericAreaCode(final String str) {
         return StringUtils.isNumeric(str) && isAlpha3Len(str);
@@ -243,8 +243,8 @@ private static boolean isNumericAreaCode(final String str) {
      * This method takes a country code and searches to find the languages available for that country. Variant locales are removed.
      * </p>
      *
-     * @param countryCode the 2-letter country code, null returns empty.
-     * @return an unmodifiable List of Locale objects, not null.
+     * @param countryCode the 2-letter country code, null returns empty
+     * @return an unmodifiable List of Locale objects, not null
      */
     public static List<Locale> languagesByCountry(final String countryCode) {
         if (countryCode == null) {
@@ -262,8 +262,8 @@ public static List<Locale> languagesByCountry(final String countryCode) {
      *   = [Locale("fr", "CA", "xxx"), Locale("fr", "CA"), Locale("fr")]
      * </pre>
      *
-     * @param locale the locale to start from.
-     * @return the unmodifiable list of Locale objects, 0 being locale, not null.
+     * @param locale the locale to start from
+     * @return the unmodifiable list of Locale objects, 0 being locale, not null
      */
     public static List<Locale> localeLookupList(final Locale locale) {
         return localeLookupList(locale, locale);
@@ -282,9 +282,9 @@ public static List<Locale> localeLookupList(final Locale locale) {
      * contain the same locale twice.
      * </p>
      *
-     * @param locale        the locale to start from, null returns empty list.
-     * @param defaultLocale the default locale to use if no other is found.
-     * @return the unmodifiable list of Locale objects, 0 being locale, not null.
+     * @param locale        the locale to start from, null returns empty list
+     * @param defaultLocale the default locale to use if no other is found
+     * @return the unmodifiable list of Locale objects, 0 being locale, not null
      */
     public static List<Locale> localeLookupList(final Locale locale, final Locale defaultLocale) {
         final List<Locale> list = new ArrayList<>(4);
@@ -306,10 +306,10 @@ public static List<Locale> localeLookupList(final Locale locale, final Locale de
     /**
      * Creates new {@linkplain Locale} for the given country.
      *
-     * @param country An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code. See the {@linkplain Locale} class description about valid country
+     * @param country an ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code. See the {@linkplain Locale} class description about valid country
      *                values.
-     * @throws NullPointerException thrown if either argument is null.
-     * @return a new new Locale for the given country.
+     * @return a new new Locale for the given country
+     * @throws NullPointerException thrown if either argument is null
      * @see Locale#Locale(String, String)
      */
     static Locale ofCountry(final String country) {
@@ -322,9 +322,9 @@ static Locale ofCountry(final String country) {
      * See {@link Locale} for the format.
      * </p>
      *
-     * @param str the String to parse as a Locale.
-     * @return a Locale parsed from the given String.
-     * @throws IllegalArgumentException if the given String cannot be parsed.
+     * @param str the String to parse as a Locale
+     * @return a Locale parsed from the given String
+     * @throws IllegalArgumentException if the given String cannot be parsed
      * @see Locale
      */
     private static Locale parseLocale(final String str) {
@@ -356,8 +356,8 @@ private static Locale parseLocale(final String str) {
     /**
      * Returns the given locale if non-{@code null}, otherwise {@link Locale#getDefault()}.
      *
-     * @param locale a locale or {@code null}.
-     * @return the given locale if non-{@code null}, otherwise {@link Locale#getDefault()}.
+     * @param locale a locale or {@code null}
+     * @return the given locale if non-{@code null}, otherwise {@link Locale#getDefault()}
      * @since 3.12.0
      */
     public static Locale toLocale(final Locale locale) {
@@ -391,9 +391,9 @@ public static Locale toLocale(final Locale locale) {
      * a dash. The length must be correct.
      * </p>
      *
-     * @param str the locale String to convert, null returns null.
-     * @return a Locale, null if null input.
-     * @throws IllegalArgumentException if the string is an invalid format.
+     * @param str the locale String to convert, null returns null
+     * @return a Locale, null if null input
+     * @throws IllegalArgumentException if the string is an invalid format
      * @see Locale#forLanguageTag(String)
      * @see Locale#getISOCountries()
      */
diff --git a/src/main/java/org/apache/commons/lang3/LongRange.java b/src/main/java/org/apache/commons/lang3/LongRange.java
index 88f3ee535dd..5928437729b 100644
--- a/src/main/java/org/apache/commons/lang3/LongRange.java
+++ b/src/main/java/org/apache/commons/lang3/LongRange.java
@@ -43,9 +43,9 @@ public final class LongRange extends NumberRange<Long> {
      * The arguments may be passed in the order (min, max) or (max,min). The getMinimum and getMaximum methods will return the correct values.
      * </p>
      *
-     * @param fromInclusive the first value that defines the edge of the range, inclusive.
-     * @param toInclusive the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
+     * @param fromInclusive the first value that defines the edge of the range, inclusive
+     * @param toInclusive the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
      */
     public static LongRange of(final long fromInclusive, final long toInclusive) {
         return of(Long.valueOf(fromInclusive), Long.valueOf(toInclusive));
@@ -62,10 +62,10 @@ public static LongRange of(final long fromInclusive, final long toInclusive) {
      * The arguments may be passed in the order (min, max) or (max,min). The getMinimum and getMaximum methods will return the correct values.
      * </p>
      *
-     * @param fromInclusive the first value that defines the edge of the range, inclusive.
-     * @param toInclusive the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
-     * @throws NullPointerException if either element is null.
+     * @param fromInclusive the first value that defines the edge of the range, inclusive
+     * @param toInclusive the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
+     * @throws NullPointerException if either element is null
      */
     public static LongRange of(final Long fromInclusive, final Long toInclusive) {
         return new LongRange(fromInclusive, toInclusive);
@@ -74,10 +74,10 @@ public static LongRange of(final Long fromInclusive, final Long toInclusive) {
     /**
      * Creates a new instance.
      *
-     * @param number1 the first element, not null.
-     * @param number2 the second element, not null.
-     * @throws NullPointerException when element1 is null.
-     * @throws NullPointerException when element2 is null.
+     * @param number1 the first element, not null
+     * @param number2 the second element, not null
+     * @throws NullPointerException when element1 is null
+     * @throws NullPointerException when element2 is null
      */
     private LongRange(final Long number1, final Long number2) {
         super(number1, number2, null);
@@ -100,8 +100,8 @@ private LongRange(final Long number1, final Long number2) {
      * range.fit(99) -->  64
      * }</pre>
      *
-     * @param element the element to test.
-     * @return the minimum, the element, or the maximum depending on the element's location relative to the range.
+     * @param element the element to test
+     * @return the minimum, the element, or the maximum depending on the element's location relative to the range
      * @since 3.19.0
      */
     public long fit(final long element) {
diff --git a/src/main/java/org/apache/commons/lang3/NumberRange.java b/src/main/java/org/apache/commons/lang3/NumberRange.java
index 908c9c078c8..bea9c734123 100644
--- a/src/main/java/org/apache/commons/lang3/NumberRange.java
+++ b/src/main/java/org/apache/commons/lang3/NumberRange.java
@@ -25,7 +25,7 @@
  * We only offer specializations for Integer, Long, and Double (like Java Streams).
  * </p>
  *
- * @param <N> The Number class.
+ * @param <N> the Number class
  * @since 3.13.0
  */
 public class NumberRange<N extends Number> extends Range<N> {
@@ -35,11 +35,11 @@ public class NumberRange<N extends Number> extends Range<N> {
     /**
      * Creates an instance.
      *
-     * @param number1 the first element, not null.
-     * @param number2 the second element, not null.
-     * @param comp the comparator to be used, null for natural ordering.
-     * @throws NullPointerException when element1 is null.
-     * @throws NullPointerException when element2 is null.
+     * @param number1 the first element, not null
+     * @param number2 the second element, not null
+     * @param comp the comparator to be used, null for natural ordering
+     * @throws NullPointerException when element1 is null
+     * @throws NullPointerException when element2 is null
      */
     public NumberRange(final N number1, final N number2, final Comparator<N> comp) {
         super(number1, number2, comp);
diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
index d07feb2a478..aa6ccb57967 100644
--- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
@@ -77,7 +77,7 @@ public class ObjectUtils {
     public static class Null implements Serializable {
 
         /**
-         * Required for serialization support. Declare serialization compatibility with Commons Lang 1.0
+         * Required for serialization support. Declare serialization compatibility with Commons Lang 1.0.
          *
          * @see java.io.Serializable
          */
@@ -92,7 +92,7 @@ public static class Null implements Serializable {
         /**
          * Ensures singleton after serialization.
          *
-         * @return the singleton value.
+         * @return the singleton value
          */
         private Object readResolve() {
             return NULL;
@@ -137,9 +137,9 @@ private Object readResolve() {
      * ObjectUtils.allNotNull(*, *, null, *) = false
      * </pre>
      *
-     * @param values the values to test, may be {@code null} or empty.
+     * @param values the values to test, may be {@code null} or empty
      * @return {@code false} if there is at least one {@code null} value in the array or the array is {@code null}, {@code true} if all values in the array are
-     *         not {@code null}s or array contains no elements.
+     *         not {@code null}s or array contains no elements
      * @since 3.5
      */
     public static boolean allNotNull(final Object... values) {
@@ -162,8 +162,8 @@ public static boolean allNotNull(final Object... values) {
      * ObjectUtils.allNull(null, null)       = true
      * </pre>
      *
-     * @param values the values to test, may be {@code null} or empty.
-     * @return {@code true} if all values in the array are {@code null}s, {@code false} if there is at least one non-null value in the array.
+     * @param values the values to test, may be {@code null} or empty
+     * @return {@code true} if all values in the array are {@code null}s, {@code false} if there is at least one non-null value in the array
      * @since 3.11
      */
     public static boolean allNull(final Object... values) {
@@ -186,7 +186,7 @@ public static boolean allNull(final Object... values) {
      * ObjectUtils.anyNotNull(null, null)       = false
      * </pre>
      *
-     * @param values the values to test, may be {@code null} or empty.
+     * @param values the values to test, may be {@code null} or empty
      * @return {@code true} if there is at least one non-null value in the array, {@code false} if all values in the array are {@code null}s. If the array is
      *         {@code null} or empty {@code false} is also returned.
      * @since 3.5
@@ -212,7 +212,7 @@ public static boolean anyNotNull(final Object... values) {
      * ObjectUtils.anyNull(*, *, null, *) = true
      * </pre>
      *
-     * @param values the values to test, may be {@code null} or empty.
+     * @param values the values to test, may be {@code null} or empty
      * @return {@code true} if there is at least one {@code null} value in the array, {@code false} if all the values are non-null. If the array is {@code null}
      *         or empty, {@code true} is also returned.
      * @since 3.11
@@ -224,10 +224,10 @@ public static boolean anyNull(final Object... values) {
     /**
      * Clones an object.
      *
-     * @param <T> the type of the object.
-     * @param obj the object to clone, null returns null.
-     * @return the clone if the object implements {@link Cloneable} otherwise {@code null}.
-     * @throws CloneFailedException if the object is cloneable and the clone operation fails.
+     * @param <T> the type of the object
+     * @param obj the object to clone, null returns null
+     * @return the clone if the object implements {@link Cloneable} otherwise {@code null}
+     * @throws CloneFailedException if the object is cloneable and the clone operation fails
      * @since 3.0
      */
     public static <T> T clone(final T obj) {
@@ -267,10 +267,10 @@ public static <T> T clone(final T obj) {
      * have to change.
      * </p>
      *
-     * @param <T> the type of the object.
-     * @param obj the object to clone, null returns null.
-     * @return the clone if the object implements {@link Cloneable} otherwise the object itself.
-     * @throws CloneFailedException if the object is cloneable and the clone operation fails.
+     * @param <T> the type of the object
+     * @param obj the object to clone, null returns null
+     * @return the clone if the object implements {@link Cloneable} otherwise the object itself
+     * @throws CloneFailedException if the object is cloneable and the clone operation fails
      * @since 3.0
      */
     public static <T> T cloneIfPossible(final T obj) {
@@ -284,10 +284,10 @@ public static <T> T cloneIfPossible(final T obj) {
      * TODO Move to ComparableUtils.
      * </p>
      *
-     * @param <T> type of the values processed by this method.
-     * @param c1  the first comparable, may be null.
-     * @param c2  the second comparable, may be null.
-     * @return a negative value if c1 &lt; c2, zero if c1 = c2 and a positive value if c1 &gt; c2.
+     * @param <T> type of the values processed by this method
+     * @param c1  the first comparable, may be null
+     * @param c2  the second comparable, may be null
+     * @return a negative value if c1 &lt; c2, zero if c1 = c2 and a positive value if c1 &gt; c2
      */
     public static <T extends Comparable<? super T>> int compare(final T c1, final T c2) {
         return compare(c1, c2, false);
@@ -299,12 +299,12 @@ public static <T extends Comparable<? super T>> int compare(final T c1, final T
      * TODO Move to ComparableUtils.
      * </p>
      *
-     * @param <T>         type of the values processed by this method.
-     * @param c1          the first comparable, may be null.
-     * @param c2          the second comparable, may be null.
+     * @param <T>         type of the values processed by this method
+     * @param c1          the first comparable, may be null
+     * @param c2          the second comparable, may be null
      * @param nullGreater if true {@code null} is considered greater than a non-{@code null} value or if false {@code null} is considered less than a
-     *                    Non-{@code null} value.
-     * @return a negative value if c1 &lt; c2, zero if c1 = c2 and a positive value if c1 &gt; c2.
+     *                    Non-{@code null} value
+     * @return a negative value if c1 &lt; c2, zero if c1 = c2 and a positive value if c1 &gt; c2
      * @see java.util.Comparator#compare(Object, Object)
      */
     public static <T extends Comparable<? super T>> int compare(final T c1, final T c2, final boolean nullGreater) {
@@ -329,8 +329,8 @@ public static <T extends Comparable<? super T>> int compare(final T c1, final T
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the boolean value to return.
-     * @return the boolean v, unchanged.
+     * @param v the boolean value to return
+     * @return the boolean v, unchanged
      * @since 3.2
      */
     public static boolean CONST(final boolean v) {
@@ -346,8 +346,8 @@ public static boolean CONST(final boolean v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the byte value to return.
-     * @return the byte v, unchanged.
+     * @param v the byte value to return
+     * @return the byte v, unchanged
      * @since 3.2
      */
     public static byte CONST(final byte v) {
@@ -363,8 +363,8 @@ public static byte CONST(final byte v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the char value to return.
-     * @return the char v, unchanged.
+     * @param v the char value to return
+     * @return the char v, unchanged
      * @since 3.2
      */
     public static char CONST(final char v) {
@@ -380,8 +380,8 @@ public static char CONST(final char v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the double value to return.
-     * @return the double v, unchanged.
+     * @param v the double value to return
+     * @return the double v, unchanged
      * @since 3.2
      */
     public static double CONST(final double v) {
@@ -397,8 +397,8 @@ public static double CONST(final double v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the float value to return.
-     * @return the float v, unchanged.
+     * @param v the float value to return
+     * @return the float v, unchanged
      * @since 3.2
      */
     public static float CONST(final float v) {
@@ -414,8 +414,8 @@ public static float CONST(final float v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the int value to return.
-     * @return the int v, unchanged.
+     * @param v the int value to return
+     * @return the int v, unchanged
      * @since 3.2
      */
     public static int CONST(final int v) {
@@ -431,8 +431,8 @@ public static int CONST(final int v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the long value to return.
-     * @return the long v, unchanged.
+     * @param v the long value to return
+     * @return the long v, unchanged
      * @since 3.2
      */
     public static long CONST(final long v) {
@@ -448,8 +448,8 @@ public static long CONST(final long v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the short value to return.
-     * @return the short v, unchanged.
+     * @param v the short value to return
+     * @return the short v, unchanged
      * @since 3.2
      */
     public static short CONST(final short v) {
@@ -465,9 +465,9 @@ public static short CONST(final short v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param <T> the Object type.
-     * @param v   the genericized Object value to return (typically a String).
-     * @return the genericized Object v, unchanged (typically a String).
+     * @param <T> the Object type
+     * @param v   the genericized Object value to return (typically a String)
+     * @return the genericized Object v, unchanged (typically a String)
      * @since 3.2
      */
     public static <T> T CONST(final T v) {
@@ -483,9 +483,9 @@ public static <T> T CONST(final T v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the byte literal (as an int) value to return.
-     * @throws IllegalArgumentException if the value passed to v is larger than a byte, that is, smaller than -128 or larger than 127.
-     * @return the byte v, unchanged.
+     * @param v the byte literal (as an int) value to return
+     * @return the byte v, unchanged
+     * @throws IllegalArgumentException if the value passed to v is larger than a byte, that is, smaller than -128 or larger than 127
      * @since 3.2
      */
     public static byte CONST_BYTE(final int v) {
@@ -504,9 +504,9 @@ public static byte CONST_BYTE(final int v) {
      *
      * This way any jars that refer to this field do not have to recompile themselves if the field's value changes at some future date.
      *
-     * @param v the short literal (as an int) value to return.
-     * @throws IllegalArgumentException if the value passed to v is larger than a short, that is, smaller than -32768 or larger than 32767.
-     * @return the byte v, unchanged.
+     * @param v the short literal (as an int) value to return
+     * @return the byte v, unchanged
+     * @throws IllegalArgumentException if the value passed to v is larger than a short, that is, smaller than -32768 or larger than 32767
      * @since 3.2
      */
     public static short CONST_SHORT(final int v) {
@@ -527,10 +527,10 @@ public static short CONST_SHORT(final int v) {
      * ObjectUtils.defaultIfNull(Boolean.TRUE, *) = Boolean.TRUE
      * </pre>
      *
-     * @param <T> the type of the object.
-     * @param object  the {@link Object} to test, may be {@code null}.
-     * @param defaultValue  the default value to return, may be {@code null}.
-     * @return {@code object} if it is not {@code null}, defaultValue otherwise.
+     * @param <T> the type of the object
+     * @param object  the {@link Object} to test, may be {@code null}
+     * @param defaultValue  the default value to return, may be {@code null}
+     * @return {@code object} if it is not {@code null}, defaultValue otherwise
      * @see #getIfNull(Object, Object)
      * @see #getIfNull(Object, Supplier)
      * @deprecated Use {@link #getIfNull(Object, Object)}.
@@ -555,9 +555,9 @@ public static <T> T defaultIfNull(final T object, final T defaultValue) {
      * ObjectUtils.equals(Boolean.TRUE, Boolean.FALSE) = false
      * </pre>
      *
-     * @param object1  the first object, may be {@code null}.
-     * @param object2  the second object, may be {@code null}.
-     * @return {@code true} if the values of both objects are the same.
+     * @param object1  the first object, may be {@code null}
+     * @param object2  the second object, may be {@code null}
+     * @return {@code true} if the values of both objects are the same
      * @deprecated Replaced by {@code java.util.Objects.equals(Object, Object)} in Java 7 and will
      * be removed from future releases.
      */
@@ -582,10 +582,10 @@ public static boolean equals(final Object object1, final Object object2) {
      * ObjectUtils.firstNonNull()                = null
      * </pre>
      *
-     * @param <T> the component type of the array.
-     * @param values  the values to test, may be {@code null} or empty.
+     * @param <T> the component type of the array
+     * @param values  the values to test, may be {@code null} or empty
      * @return the first value from {@code values} which is not {@code null},
-     *  or {@code null} if there are no non-null values.
+     *  or {@code null} if there are no non-null values
      * @since 3.0
      */
     @SafeVarargs
@@ -596,9 +596,9 @@ public static <T> T firstNonNull(final T... values) {
     /**
      * Delegates to {@link Object#getClass()} using generics.
      *
-     * @param <T> The argument type or null.
-     * @param object The argument.
-     * @return The argument's Class or null.
+     * @param <T> the argument type or null
+     * @param object the argument
+     * @return the argument's Class or null
      * @since 3.13.0
      */
     @SuppressWarnings("unchecked")
@@ -622,10 +622,10 @@ public static <T> Class<T> getClass(final T object) {
      * See also {@link Consumers#accept(Consumer, Object)} and {@link Suppliers#get(Supplier)}.
      * </p>
      *
-     * @param <T>       the type of the return values.
+     * @param <T>       the type of the return values
      * @param suppliers the suppliers returning the values to test. {@code null} values are ignored. Suppliers may return {@code null} or a value of type
      *                  {@code T}.
-     * @return the first return value from {@code suppliers} which is not {@code null}, or {@code null} if there are no non-null values.
+     * @return the first return value from {@code suppliers} which is not {@code null}, or {@code null} if there are no non-null values
      * @see Consumers#accept(Consumer, Object)
      * @see Suppliers#get(Supplier)
      * @since 3.10
@@ -655,10 +655,10 @@ public static <T> T getFirstNonNull(final Supplier<T>... suppliers) {
      * See also {@link Consumers#accept(Consumer, Object)} and {@link Suppliers#get(Supplier)}.
      * </p>
      *
-     * @param <T> the type of the object.
-     * @param object the {@link Object} to test, may be {@code null}.
-     * @param defaultSupplier the default value to return, may be {@code null}.
-     * @return {@code object} if it is not {@code null}, {@code defaultValueSupplier.get()} otherwise.
+     * @param <T> the type of the object
+     * @param object the {@link Object} to test, may be {@code null}
+     * @param defaultSupplier the default value to return, may be {@code null}
+     * @return {@code object} if it is not {@code null}, {@code defaultValueSupplier.get()} otherwise
      * @see #getIfNull(Object, Object)
      * @see Consumers#accept(Consumer, Object)
      * @see Suppliers#get(Supplier)
@@ -682,10 +682,10 @@ public static <T> T getIfNull(final T object, final Supplier<T> defaultSupplier)
      * See also {@link Consumers#accept(Consumer, Object)} and {@link Suppliers#get(Supplier)}.
      * </p>
      *
-     * @param <T> the type of the object.
-     * @param object  the {@link Object} to test, may be {@code null}.
-     * @param defaultValue  the default value to return, may be {@code null}.
-     * @return {@code object} if it is not {@code null}, defaultValue otherwise.
+     * @param <T> the type of the object
+     * @param object  the {@link Object} to test, may be {@code null}
+     * @param defaultValue  the default value to return, may be {@code null}
+     * @return {@code object} if it is not {@code null}, defaultValue otherwise
      * @see #getIfNull(Object, Supplier)
      * @see Consumers#accept(Consumer, Object)
      * @see Suppliers#get(Supplier)
@@ -703,8 +703,8 @@ public static <T> T getIfNull(final T object, final T defaultValue) {
      * ObjectUtils.hashCode(obj)    = obj.hashCode()
      * </pre>
      *
-     * @param obj the object to obtain the hash code of, may be {@code null}.
-     * @return the hash code of the object, or zero if null.
+     * @param obj the object to obtain the hash code of, may be {@code null}
+     * @return the hash code of the object, or zero if null
      * @since 2.1
      * @deprecated Replaced by {@code java.util.Objects.hashCode(Object)} in Java 7 and will be removed in future releases.
      */
@@ -720,8 +720,8 @@ public static int hashCode(final Object obj) {
      * Short hand for {@code Integer.toHexString(Objects.hashCode(object))}.
      * </p>
      *
-     * @param object object for which the hashCode is to be calculated.
-     * @return Hash code in hexadecimal format.
+     * @param object object for which the hashCode is to be calculated
+     * @return hash code in hexadecimal format
      * @since 3.13.0
      */
     public static String hashCodeHex(final Object object) {
@@ -744,8 +744,8 @@ public static String hashCodeHex(final Object object) {
      * ObjectUtils.hashCodeMulti(a, b, c)          = ((31 + a.hashCode()) * 31 + b.hashCode()) * 31 + c.hashCode()
      * </pre>
      *
-     * @param objects the objects to obtain the hash code of, may be {@code null}.
-     * @return the hash code of the objects, or zero if null.
+     * @param objects the objects to obtain the hash code of, may be {@code null}
+     * @return the hash code of the objects, or zero if null
      * @since 3.0
      * @deprecated Replaced by {@code java.util.Objects.hash(Object...)} in Java 7 and will be removed in future releases.
      */
@@ -767,8 +767,8 @@ public static int hashCodeMulti(final Object... objects) {
      * Short hand for {@code Integer.toHexString(System.identityHashCode(object))}.
      * </p>
      *
-     * @param object object for which the hashCode is to be calculated.
-     * @return Hash code in hexadecimal format.
+     * @param object object for which the hashCode is to be calculated
+     * @return hash code in hexadecimal format
      * @since 3.13.0
      */
     public static String identityHashCodeHex(final Object object) {
@@ -786,9 +786,9 @@ public static String identityHashCodeHex(final Object object) {
      * ObjectUtils.identityToString(appendable, Boolean.TRUE)  = appendable.append("java.lang.Boolean@7fa")
      * </pre>
      *
-     * @param appendable  the appendable to append to.
-     * @param object  the object to create a toString for.
-     * @throws IOException if an I/O error occurs.
+     * @param appendable  the appendable to append to
+     * @param object  the object to create a toString for
+     * @throws IOException if an I/O error occurs
      * @since 3.2
      */
     public static void identityToString(final Appendable appendable, final Object object) throws IOException {
@@ -807,8 +807,8 @@ public static void identityToString(final Appendable appendable, final Object ob
      * ObjectUtils.identityToString(Boolean.TRUE) = "java.lang.Boolean@7fa"
      * </pre>
      *
-     * @param object the object to create a toString for, may be {@code null}.
-     * @return the default toString text, or {@code null} if {@code null} passed in.
+     * @param object the object to create a toString for, may be {@code null}
+     * @return the default toString text, or {@code null} if {@code null} passed in
      */
     public static String identityToString(final Object object) {
         if (object == null) {
@@ -836,8 +836,8 @@ public static String identityToString(final Object object) {
      * ObjectUtils.identityToString(builder, Boolean.TRUE)  = builder.append("java.lang.Boolean@7fa")
      * </pre>
      *
-     * @param builder  the builder to append to.
-     * @param object  the object to create a toString for.
+     * @param builder  the builder to append to
+     * @param object  the object to create a toString for
      * @since 3.2
      * @deprecated as of 3.6, because StrBuilder was moved to commons-text,
      *  use one of the other {@code identityToString} methods instead.
@@ -864,8 +864,8 @@ public static void identityToString(final StrBuilder builder, final Object objec
      * ObjectUtils.identityToString(buf, Boolean.TRUE)  = buf.append("java.lang.Boolean@7fa")
      * </pre>
      *
-     * @param buffer  the buffer to append to.
-     * @param object  the object to create a toString for.
+     * @param buffer  the buffer to append to
+     * @param object  the object to create a toString for
      * @since 2.4
      */
     public static void identityToString(final StringBuffer buffer, final Object object) {
@@ -889,8 +889,8 @@ public static void identityToString(final StringBuffer buffer, final Object obje
      * ObjectUtils.identityToString(builder, Boolean.TRUE)  = builder.append("java.lang.Boolean@7fa")
      * </pre>
      *
-     * @param builder  the builder to append to.
-     * @param object  the object to create a toString for.
+     * @param builder  the builder to append to
+     * @param object  the object to create a toString for
      * @since 3.2
      */
     public static void identityToString(final StringBuilder builder, final Object object) {
@@ -919,8 +919,8 @@ public static void identityToString(final StringBuilder builder, final Object ob
      * ObjectUtils.isArray(1234)             = false
      * </pre>
      *
-     * @param object the object to check, may be {@code null}.
-     * @return {@code true} if the object is an {@code array}, {@code false} otherwise.
+     * @param object the object to check, may be {@code null}
+     * @return {@code true} if the object is an {@code array}, {@code false} otherwise
      * @since 3.13.0
      */
     public static boolean isArray(final Object object) {
@@ -952,8 +952,8 @@ public static boolean isArray(final Object object) {
      * ObjectUtils.isEmpty(Optional.empty()) = true
      * </pre>
      *
-     * @param object the {@link Object} to test, may be {@code null}.
-     * @return {@code true} if the object has a supported type and is empty or null, {@code false} otherwise.
+     * @param object the {@link Object} to test, may be {@code null}
+     * @return {@code true} if the object has a supported type and is empty or null, {@code false} otherwise
      * @since 3.9
      */
     public static boolean isEmpty(final Object object) {
@@ -1003,7 +1003,7 @@ public static boolean isEmpty(final Object object) {
      * ObjectUtils.isNotEmpty(Optional.empty()) = false
      * </pre>
      *
-     * @param object  the {@link Object} to test, may be {@code null}.
+     * @param object  the {@link Object} to test, may be {@code null}
      * @return {@code true} if the object has an unsupported type or is not empty.
      * and not null, {@code false} otherwise.
      * @since 3.9
@@ -1018,10 +1018,10 @@ public static boolean isNotEmpty(final Object object) {
      * TODO Move to ComparableUtils.
      * </p>
      *
-     * @param <T>    type of the values processed by this method.
-     * @param values the set of comparable values, may be null.
+     * @param <T>    type of the values processed by this method
+     * @param values the set of comparable values, may be null
      * @return
-     *         <ul>
+    *         <ul>
      *         <li>If any objects are non-null and unequal, the greater object.</li>
      *         <li>If all objects are non-null and equal, the first.</li>
      *         <li>If any of the comparables are null, the greater of the non-null objects.</li>
@@ -1045,12 +1045,12 @@ public static <T extends Comparable<? super T>> T max(final T... values) {
      * Finds the "best guess" middle value among comparables. If there is an even
      * number of total values, the lower of the two middle values will be returned.
      *
-     * @param <T> type of values processed by this method.
-     * @param comparator to use for comparisons.
-     * @param items to compare.
-     * @return T at middle position.
-     * @throws NullPointerException if items or comparator is {@code null}.
-     * @throws IllegalArgumentException if items is empty or contains {@code null} values.
+     * @param <T> type of values processed by this method
+     * @param comparator to use for comparisons
+     * @param items to compare
+     * @return t at middle position
+     * @throws IllegalArgumentException if items is empty or contains {@code null} values
+     * @throws NullPointerException if items or comparator is {@code null}
      * @since 3.0.1
      */
     @SafeVarargs
@@ -1066,11 +1066,11 @@ public static <T> T median(final Comparator<T> comparator, final T... items) {
     /**
      * Finds the "best guess" middle value among comparables. If there is an even number of total values, the lower of the two middle values will be returned.
      *
-     * @param <T>   type of values processed by this method.
-     * @param items to compare.
-     * @return T at middle position.
-     * @throws NullPointerException     if items is {@code null}.
-     * @throws IllegalArgumentException if items is empty or contains {@code null} values.
+     * @param <T>   type of values processed by this method
+     * @param items to compare
+     * @return t at middle position
+     * @throws IllegalArgumentException if items is empty or contains {@code null} values
+     * @throws NullPointerException     if items is {@code null}
      * @since 3.0.1
      */
     @SafeVarargs
@@ -1091,7 +1091,7 @@ public static <T extends Comparable<? super T>> T median(final T... items) {
      * @param <T>    type of the values processed by this method
      * @param values the set of comparable values, may be null
      * @return
-     *         <ul>
+    *         <ul>
      *         <li>If any objects are non-null and unequal, the lesser object.</li>
      *         <li>If all objects are non-null and equal, the first.</li>
      *         <li>If any of the comparables are null, the lesser of the non-null objects.</li>
@@ -1114,9 +1114,9 @@ public static <T extends Comparable<? super T>> T min(final T... values) {
     /**
      * Finds the most frequently occurring item.
      *
-     * @param <T> type of values processed by this method.
-     * @param items to check.
-     * @return most populous T, {@code null} if non-unique or no items supplied.
+     * @param <T> type of values processed by this method
+     * @param items to check
+     * @return most populous T, {@code null} if non-unique or no items supplied
      * @since 3.0.1
      */
     @SafeVarargs
@@ -1157,9 +1157,9 @@ public static <T> T mode(final T... items) {
      * ObjectUtils.notEqual(Boolean.TRUE, Boolean.FALSE) = true
      * </pre>
      *
-     * @param object1  the first object, may be {@code null}.
-     * @param object2  the second object, may be {@code null}.
-     * @return {@code false} if the values of both objects are the same.
+     * @param object1  the first object, may be {@code null}
+     * @param object2  the second object, may be {@code null}
+     * @return {@code false} if the values of both objects are the same
      */
     public static boolean notEqual(final Object object1, final Object object2) {
         return !Objects.equals(object1, object2);
@@ -1175,11 +1175,11 @@ public static boolean notEqual(final Object object1, final Object object2) {
      * }
      * </pre>
      *
-     * @param <T> the type of the reference.
-     * @param obj the object reference to check for nullity.
-     * @return {@code obj} if not {@code null}.
-     * @throws NullPointerException     if {@code obj} is {@code null}.
-     * @throws IllegalArgumentException if {@code obj} is empty per {@link #isEmpty(Object)}.
+     * @param <T> the type of the reference
+     * @param obj the object reference to check for nullity
+     * @return {@code obj} if not {@code null}
+     * @throws IllegalArgumentException if {@code obj} is empty per {@link #isEmpty(Object)}
+     * @throws NullPointerException     if {@code obj} is {@code null}
      * @see #isEmpty(Object)
      * @since 3.12.0
      */
@@ -1197,12 +1197,12 @@ public static <T> T  requireNonEmpty(final T obj) {
      * }
      * </pre>
      *
-     * @param <T> the type of the reference.
-     * @param obj the object reference to check for nullity.
-     * @param message the exception message.
-     * @return {@code obj} if not {@code null}.
-     * @throws NullPointerException     if {@code obj} is {@code null}.
-     * @throws IllegalArgumentException if {@code obj} is empty per {@link #isEmpty(Object)}.
+     * @param <T> the type of the reference
+     * @param obj the object reference to check for nullity
+     * @param message the exception message
+     * @return {@code obj} if not {@code null}
+     * @throws IllegalArgumentException if {@code obj} is empty per {@link #isEmpty(Object)}
+     * @throws NullPointerException     if {@code obj} is {@code null}
      * @see #isEmpty(Object)
      * @since 3.12.0
      */
@@ -1225,8 +1225,8 @@ public static <T> T requireNonEmpty(final T obj, final String message) {
      * ObjectUtils.toString(Boolean.TRUE) = "true"
      * </pre>
      *
-     * @param obj  the Object to {@code toString()}, may be {@code null}.
-     * @return the input's {@code toString()}, or {@code ""} if the input is {@code null}.
+     * @param obj  the Object to {@code toString()}, may be {@code null}
+     * @return the input's {@code toString()}, or {@code ""} if the input is {@code null}
      * @see Objects#toString(Object)
      * @see Objects#toString(Object, String)
      * @see StringUtils#defaultString(String)
@@ -1249,9 +1249,9 @@ public static String toString(final Object obj) {
      * ObjectUtils.toString(Boolean.TRUE, "null") = "true"
      * </pre>
      *
-     * @param obj  the Object to {@code toString}, may be null.
-     * @param nullStr  the String to return if {@code null} input, may be null.
-     * @return the passed in Object's toString, or {@code nullStr} if {@code null} input.
+     * @param obj  the Object to {@code toString}, may be null
+     * @param nullStr  the String to return if {@code null} input, may be null
+     * @return the passed in Object's toString, or {@code nullStr} if {@code null} input
      * @see Objects#toString(Object)
      * @see Objects#toString(Object, String)
      * @see StringUtils#defaultString(String,String)
@@ -1280,9 +1280,9 @@ public static String toString(final Object obj, final String nullStr) {
      * ObjectUtils.toString(() -> Boolean.TRUE, () -> expensive()) = "true"
      * }</pre>
      *
-     * @param obj  the Object to {@code toString}, may be null.
-     * @param supplier  the Supplier of String used on {@code null} input, may be null.
-     * @return the passed in Object's toString, or {@code nullStr} if {@code null} input.
+     * @param obj  the Object to {@code toString}, may be null
+     * @param supplier  the Supplier of String used on {@code null} input, may be null
+     * @return the passed in Object's toString, or {@code nullStr} if {@code null} input
      * @since 3.14.0
      */
     public static String toString(final Supplier<Object> obj, final Supplier<String> supplier) {
@@ -1304,10 +1304,10 @@ public static String toString(final Supplier<Object> obj, final Supplier<String>
      * ObjectUtils.toString(Boolean.TRUE, () -> expensive()) = "true"
      * }</pre>
      *
-     * @param <T> the obj type (used to provide better source compatibility in 3.14.0).
-     * @param obj  the Object to {@code toString}, may be null.
-     * @param supplier  the Supplier of String used on {@code null} input, may be null.
-     * @return the passed in Object's toString, or {@code nullStr} if {@code null} input.
+     * @param <T> the obj type (used to provide better source compatibility in 3.14.0)
+     * @param obj  the Object to {@code toString}, may be null
+     * @param supplier  the Supplier of String used on {@code null} input, may be null
+     * @return the passed in Object's toString, or {@code nullStr} if {@code null} input
      * @since 3.11
      */
     public static <T> String toString(final T obj, final Supplier<String> supplier) {
@@ -1317,10 +1317,10 @@ public static <T> String toString(final T obj, final Supplier<String> supplier)
     /**
      * Calls {@link Object#wait(long, int)} for the given Duration.
      *
-     * @param obj The receiver of the wait call.
-     * @param duration How long to wait.
-     * @throws IllegalArgumentException if the timeout duration is negative.
-     * @throws IllegalMonitorStateException if the current thread is not the owner of the {@code obj}'s monitor.
+     * @param obj the receiver of the wait call
+     * @param duration how long to wait
+     * @throws IllegalArgumentException if the timeout duration is negative
+     * @throws IllegalMonitorStateException if the current thread is not the owner of the {@code obj}'s monitor
      * @throws InterruptedException if any thread interrupted the current thread before or while the current thread was
      *         waiting for a notification. The <em>interrupted status</em> of the current thread is cleared when this
      *         exception is thrown.
diff --git a/src/main/java/org/apache/commons/lang3/RandomStringUtils.java b/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
index 1e42a7d15a1..970f8fe5735 100644
--- a/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
@@ -109,7 +109,7 @@ public class RandomStringUtils {
      * The method {@link ThreadLocalRandom#current()} is called on-demand.
      * </p>
      *
-     * @return the singleton instance based on {@link ThreadLocalRandom#current()}.
+     * @return the singleton instance based on {@link ThreadLocalRandom#current()}
      * @see ThreadLocalRandom#current()
      * @see #secure()
      * @see #secureStrong()
@@ -126,9 +126,9 @@ public static RandomStringUtils insecure() {
      * Characters will be chosen from the set of all characters.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #next(int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -143,11 +143,11 @@ public static String random(final int count) {
      * Characters will be chosen from the set of alpha-numeric characters as indicated by the arguments.
      * </p>
      *
-     * @param count   the length of random string to create.
-     * @param letters if {@code true}, generated string may include alphabetic characters.
-     * @param numbers if {@code true}, generated string may include numeric characters.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count   the length of random string to create
+     * @param letters if {@code true}, generated string may include alphabetic characters
+     * @param numbers if {@code true}, generated string may include numeric characters
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #next(int, boolean, boolean)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -162,10 +162,10 @@ public static String random(final int count, final boolean letters, final boolea
      * Characters will be chosen from the set of characters specified.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @param chars the character array containing the set of characters to use, may be null.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @param chars the character array containing the set of characters to use, may be null
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #next(int, char...)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -180,13 +180,13 @@ public static String random(final int count, final char... chars) {
      * Characters will be chosen from the set of alpha-numeric characters as indicated by the arguments.
      * </p>
      *
-     * @param count   the length of random string to create.
-     * @param start   the position in set of chars to start at.
-     * @param end     the position in set of chars to end before.
-     * @param letters if {@code true}, generated string may include alphabetic characters.
-     * @param numbers if {@code true}, generated string may include numeric characters.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count   the length of random string to create
+     * @param start   the position in set of chars to start at
+     * @param end     the position in set of chars to end before
+     * @param letters if {@code true}, generated string may include alphabetic characters
+     * @param numbers if {@code true}, generated string may include numeric characters
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #next(int, int, int, boolean, boolean)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -204,15 +204,15 @@ public static String random(final int count, final int start, final int end, fin
      * instance.
      * </p>
      *
-     * @param count   the length of random string to create.
-     * @param start   the position in set of chars to start at.
-     * @param end     the position in set of chars to end before.
-     * @param letters if {@code true}, generated string may include alphabetic characters.
-     * @param numbers if {@code true}, generated string may include numeric characters.
+     * @param count   the length of random string to create
+     * @param start   the position in set of chars to start at
+     * @param end     the position in set of chars to end before
+     * @param letters if {@code true}, generated string may include alphabetic characters
+     * @param numbers if {@code true}, generated string may include numeric characters
      * @param chars   the set of chars to choose randoms from. If {@code null}, then it will use the set of all chars.
-     * @return the random string.
-     * @throws ArrayIndexOutOfBoundsException if there are not {@code (end - start) + 1} characters in the set array.
-     * @throws IllegalArgumentException       if {@code count} &lt; 0.
+     * @return the random string
+     * @throws ArrayIndexOutOfBoundsException if there are not {@code (end - start) + 1} characters in the set array
+     * @throws IllegalArgumentException       if {@code count} &lt; 0
      * @deprecated Use {@link #next(int, int, int, boolean, boolean, char...)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -239,17 +239,17 @@ public static String random(final int count, final int start, final int end, fin
      * generated repeatedly and predictably.
      * </p>
      *
-     * @param count   the length of random string to create.
-     * @param start   the position in set of chars to start at (inclusive).
-     * @param end     the position in set of chars to end before (exclusive).
-     * @param letters if {@code true}, generated string may include alphabetic characters.
-     * @param digits if {@code true}, generated string may include digit characters.
+     * @param count   the length of random string to create
+     * @param start   the position in set of chars to start at (inclusive)
+     * @param end     the position in set of chars to end before (exclusive)
+     * @param letters if {@code true}, generated string may include alphabetic characters
+     * @param digits if {@code true}, generated string may include digit characters
      * @param chars   the set of chars to choose randoms from, must not be empty. If {@code null}, then it will use the
      *                set of all chars.
-     * @param random  a source of randomness.
-     * @return the random string.
-     * @throws ArrayIndexOutOfBoundsException if there are not {@code (end - start) + 1} characters in the set array.
-     * @throws IllegalArgumentException       if {@code count} &lt; 0 or the provided chars array is empty.
+     * @param random  a source of randomness
+     * @return the random string
+     * @throws ArrayIndexOutOfBoundsException if there are not {@code (end - start) + 1} characters in the set array
+     * @throws IllegalArgumentException       if {@code count} &lt; 0 or the provided chars array is empty
      * @since 2.0
      */
     public static String random(int count, int start, int end, final boolean letters, final boolean digits,
@@ -401,10 +401,10 @@ public static String random(int count, int start, int end, final boolean letters
      * of all characters is used.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @param chars the String containing the set of characters to use, may be null, but must not be empty.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0 or the string is empty.
+     * @param count the length of random string to create
+     * @param chars the String containing the set of characters to use, may be null, but must not be empty
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0 or the string is empty
      * @deprecated Use {@link #next(int, String)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -419,9 +419,9 @@ public static String random(final int count, final String chars) {
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #nextAlphabetic(int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -436,9 +436,9 @@ public static String randomAlphabetic(final int count) {
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z).
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      * @deprecated Use {@link #nextAlphabetic(int, int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -454,9 +454,9 @@ public static String randomAlphabetic(final int minLengthInclusive, final int ma
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z) and the digits 0-9.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #nextAlphanumeric(int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -471,9 +471,9 @@ public static String randomAlphanumeric(final int count) {
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z) and the digits 0-9.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      * @deprecated Use {@link #nextAlphanumeric(int, int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -490,9 +490,9 @@ public static String randomAlphanumeric(final int minLengthInclusive, final int
      * (inclusive).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #nextAscii(int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -508,9 +508,9 @@ public static String randomAscii(final int count) {
      * (inclusive).
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      * @deprecated Use {@link #nextAscii(int, int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -527,9 +527,9 @@ public static String randomAscii(final int minLengthInclusive, final int maxLeng
      * class. This class contains all visible ASCII characters (i.e. anything except spaces and control characters).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.5
      * @deprecated Use {@link #nextGraph(int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -545,9 +545,9 @@ public static String randomGraph(final int count) {
      * Characters will be chosen from the set of \p{Graph} characters.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      * @deprecated Use {@link #nextGraph(int, int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -563,9 +563,9 @@ public static String randomGraph(final int minLengthInclusive, final int maxLeng
      * Characters will be chosen from the set of numeric characters.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @deprecated Use {@link #nextNumeric(int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -580,9 +580,9 @@ public static String randomNumeric(final int count) {
      * Characters will be chosen from the set of \p{Digit} characters.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      * @deprecated Use {@link #nextNumeric(int, int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -599,9 +599,9 @@ public static String randomNumeric(final int minLengthInclusive, final int maxLe
      * class. This class includes all visible ASCII characters and spaces (i.e. anything except control characters).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.5
      * @deprecated Use {@link #nextPrint(int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -617,9 +617,9 @@ public static String randomPrint(final int count) {
      * Characters will be chosen from the set of \p{Print} characters.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      * @deprecated Use {@link #nextPrint(int, int)} from {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -635,7 +635,7 @@ public static String randomPrint(final int minLengthInclusive, final int maxLeng
      * The method {@link SecureRandom#SecureRandom()} is called on-demand.
      * </p>
      *
-     * @return the singleton instance based on {@link SecureRandom#SecureRandom()}.
+     * @return the singleton instance based on {@link SecureRandom#SecureRandom()}
      * @see SecureRandom#SecureRandom()
      * @since 3.16.0
      */
@@ -650,7 +650,7 @@ public static RandomStringUtils secure() {
      * The method {@link SecureRandom#getInstanceStrong()} is called on-demand.
      * </p>
      *
-     * @return the singleton instance based on {@link SecureRandom#getInstanceStrong()}.
+     * @return the singleton instance based on {@link SecureRandom#getInstanceStrong()}
      * @see SecureRandom#getInstanceStrong()
      * @since 3.17.0
      */
@@ -686,9 +686,9 @@ private RandomStringUtils(final Supplier<RandomUtils> random) {
      * Characters will be chosen from the set of all characters.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.16.0
      */
     public String next(final int count) {
@@ -702,11 +702,11 @@ public String next(final int count) {
      * Characters will be chosen from the set of alpha-numeric characters as indicated by the arguments.
      * </p>
      *
-     * @param count   the length of random string to create.
-     * @param letters if {@code true}, generated string may include alphabetic characters.
-     * @param numbers if {@code true}, generated string may include numeric characters.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count   the length of random string to create
+     * @param letters if {@code true}, generated string may include alphabetic characters
+     * @param numbers if {@code true}, generated string may include numeric characters
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.16.0
      */
     public String next(final int count, final boolean letters, final boolean numbers) {
@@ -720,10 +720,10 @@ public String next(final int count, final boolean letters, final boolean numbers
      * Characters will be chosen from the set of characters specified.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @param chars the character array containing the set of characters to use, may be null.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @param chars the character array containing the set of characters to use, may be null
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.16.0
      */
     public String next(final int count, final char... chars) {
@@ -740,13 +740,13 @@ public String next(final int count, final char... chars) {
      * Characters will be chosen from the set of alpha-numeric characters as indicated by the arguments.
      * </p>
      *
-     * @param count   the length of random string to create.
-     * @param start   the position in set of chars to start at.
-     * @param end     the position in set of chars to end before.
-     * @param letters if {@code true}, generated string may include alphabetic characters.
-     * @param numbers if {@code true}, generated string may include numeric characters.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count   the length of random string to create
+     * @param start   the position in set of chars to start at
+     * @param end     the position in set of chars to end before
+     * @param letters if {@code true}, generated string may include alphabetic characters
+     * @param numbers if {@code true}, generated string may include numeric characters
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.16.0
      */
     public String next(final int count, final int start, final int end, final boolean letters, final boolean numbers) {
@@ -762,15 +762,15 @@ public String next(final int count, final int start, final int end, final boolea
      * instance.
      * </p>
      *
-     * @param count   the length of random string to create.
-     * @param start   the position in set of chars to start at.
-     * @param end     the position in set of chars to end before.
-     * @param letters if {@code true}, generated string may include alphabetic characters.
-     * @param numbers if {@code true}, generated string may include numeric characters.
+     * @param count   the length of random string to create
+     * @param start   the position in set of chars to start at
+     * @param end     the position in set of chars to end before
+     * @param letters if {@code true}, generated string may include alphabetic characters
+     * @param numbers if {@code true}, generated string may include numeric characters
      * @param chars   the set of chars to choose randoms from. If {@code null}, then it will use the set of all chars.
-     * @return the random string.
-     * @throws ArrayIndexOutOfBoundsException if there are not {@code (end - start) + 1} characters in the set array.
-     * @throws IllegalArgumentException       if {@code count} &lt; 0.
+     * @return the random string
+     * @throws ArrayIndexOutOfBoundsException if there are not {@code (end - start) + 1} characters in the set array
+     * @throws IllegalArgumentException       if {@code count} &lt; 0
      */
     public String next(final int count, final int start, final int end, final boolean letters, final boolean numbers,
             final char... chars) {
@@ -785,10 +785,10 @@ public String next(final int count, final int start, final int end, final boolea
      * of all characters is used.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @param chars the String containing the set of characters to use, may be null, but must not be empty.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0 or the string is empty.
+     * @param count the length of random string to create
+     * @param chars the String containing the set of characters to use, may be null, but must not be empty
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0 or the string is empty
      * @since 3.16.0
      */
     public String next(final int count, final String chars) {
@@ -805,9 +805,9 @@ public String next(final int count, final String chars) {
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      */
     public String nextAlphabetic(final int count) {
         return next(count, true, false);
@@ -820,9 +820,9 @@ public String nextAlphabetic(final int count) {
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z).
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      */
     public String nextAlphabetic(final int minLengthInclusive, final int maxLengthExclusive) {
@@ -836,9 +836,9 @@ public String nextAlphabetic(final int minLengthInclusive, final int maxLengthEx
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z) and the digits 0-9.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      */
     public String nextAlphanumeric(final int count) {
         return next(count, true, true);
@@ -851,9 +851,9 @@ public String nextAlphanumeric(final int count) {
      * Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z) and the digits 0-9.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      */
     public String nextAlphanumeric(final int minLengthInclusive, final int maxLengthExclusive) {
@@ -868,9 +868,9 @@ public String nextAlphanumeric(final int minLengthInclusive, final int maxLength
      * (inclusive).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      */
     public String nextAscii(final int count) {
         return next(count, 32, 127, false, false);
@@ -884,9 +884,9 @@ public String nextAscii(final int count) {
      * (inclusive).
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      */
     public String nextAscii(final int minLengthInclusive, final int maxLengthExclusive) {
@@ -901,9 +901,9 @@ public String nextAscii(final int minLengthInclusive, final int maxLengthExclusi
      * class. This class contains all visible ASCII characters (i.e. anything except spaces and control characters).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.5
      */
     public String nextGraph(final int count) {
@@ -917,9 +917,9 @@ public String nextGraph(final int count) {
      * Characters will be chosen from the set of \p{Graph} characters.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      */
     public String nextGraph(final int minLengthInclusive, final int maxLengthExclusive) {
@@ -933,9 +933,9 @@ public String nextGraph(final int minLengthInclusive, final int maxLengthExclusi
      * Characters will be chosen from the set of numeric characters.
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      */
     public String nextNumeric(final int count) {
         return next(count, false, true);
@@ -948,9 +948,9 @@ public String nextNumeric(final int count) {
      * Characters will be chosen from the set of \p{Digit} characters.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.5
      */
     public String nextNumeric(final int minLengthInclusive, final int maxLengthExclusive) {
@@ -965,9 +965,9 @@ public String nextNumeric(final int minLengthInclusive, final int maxLengthExclu
      * class. This class includes all visible ASCII characters and spaces (i.e. anything except control characters).
      * </p>
      *
-     * @param count the length of random string to create.
-     * @return the random string.
-     * @throws IllegalArgumentException if {@code count} &lt; 0.
+     * @param count the length of random string to create
+     * @return the random string
+     * @throws IllegalArgumentException if {@code count} &lt; 0
      * @since 3.5
      * @since 3.16.0
      */
@@ -982,9 +982,9 @@ public String nextPrint(final int count) {
      * Characters will be chosen from the set of \p{Print} characters.
      * </p>
      *
-     * @param minLengthInclusive the inclusive minimum length of the string to generate.
-     * @param maxLengthExclusive the exclusive maximum length of the string to generate.
-     * @return the random string.
+     * @param minLengthInclusive the inclusive minimum length of the string to generate
+     * @param maxLengthExclusive the exclusive maximum length of the string to generate
+     * @return the random string
      * @since 3.16.0
      */
     public String nextPrint(final int minLengthInclusive, final int maxLengthExclusive) {
@@ -994,7 +994,7 @@ public String nextPrint(final int minLengthInclusive, final int maxLengthExclusi
     /**
      * Gets the Random.
      *
-     * @return the Random.
+     * @return the Random
      */
     private Random random() {
         return randomUtils().random();
@@ -1003,7 +1003,7 @@ private Random random() {
     /**
      * Gets the RandomUtils.
      *
-     * @return the RandomUtils.
+     * @return the RandomUtils
      */
     private RandomUtils randomUtils() {
         return random.get();
diff --git a/src/main/java/org/apache/commons/lang3/RandomUtils.java b/src/main/java/org/apache/commons/lang3/RandomUtils.java
index b29bd7f6e30..f835b312807 100644
--- a/src/main/java/org/apache/commons/lang3/RandomUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RandomUtils.java
@@ -93,7 +93,7 @@ public class RandomUtils {
      * The method {@link ThreadLocalRandom#current()} is called on-demand.
      * </p>
      *
-     * @return the singleton instance based on {@link ThreadLocalRandom#current()}.
+     * @return the singleton instance based on {@link ThreadLocalRandom#current()}
      * @see ThreadLocalRandom#current()
      * @see #secure()
      * @see #secureStrong()
@@ -106,7 +106,7 @@ public static RandomUtils insecure() {
     /**
      * Generates a random boolean value.
      *
-     * @return the random boolean.
+     * @return the random boolean
      * @since 3.5
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
@@ -118,9 +118,9 @@ public static boolean nextBoolean() {
     /**
      * Generates an array of random bytes.
      *
-     * @param count the size of the returned array.
-     * @return the random byte array.
-     * @throws IllegalArgumentException if {@code count} is negative.
+     * @param count the size of the returned array
+     * @return the random byte array
+     * @throws IllegalArgumentException if {@code count} is negative
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -131,7 +131,7 @@ public static byte[] nextBytes(final int count) {
     /**
      * Generates a random double between 0 (inclusive) and Double.MAX_VALUE (exclusive).
      *
-     * @return the random double.
+     * @return the random double
      * @see #nextDouble(double, double)
      * @since 3.5
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
@@ -144,10 +144,10 @@ public static double nextDouble() {
     /**
      * Generates a random double within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random double.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random double
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -158,7 +158,7 @@ public static double nextDouble(final double startInclusive, final double endExc
     /**
      * Generates a random float between 0 (inclusive) and Float.MAX_VALUE (exclusive).
      *
-     * @return the random float.
+     * @return the random float
      * @see #nextFloat(float, float)
      * @since 3.5
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
@@ -171,10 +171,10 @@ public static float nextFloat() {
     /**
      * Generates a random float within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random float.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random float
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -185,7 +185,7 @@ public static float nextFloat(final float startInclusive, final float endExclusi
     /**
      * Generates a random int between 0 (inclusive) and Integer.MAX_VALUE (exclusive).
      *
-     * @return the random integer.
+     * @return the random integer
      * @see #nextInt(int, int)
      * @since 3.5
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
@@ -198,10 +198,10 @@ public static int nextInt() {
     /**
      * Generates a random integer within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random integer.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random integer
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -212,7 +212,7 @@ public static int nextInt(final int startInclusive, final int endExclusive) {
     /**
      * Generates a random long between 0 (inclusive) and Long.MAX_VALUE (exclusive).
      *
-     * @return the random long.
+     * @return the random long
      * @see #nextLong(long, long)
      * @since 3.5
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
@@ -225,10 +225,10 @@ public static long nextLong() {
     /**
      * Generates a random long within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random long.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random long
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @deprecated Use {@link #secure()}, {@link #secureStrong()}, or {@link #insecure()}.
      */
     @Deprecated
@@ -243,7 +243,7 @@ public static long nextLong(final long startInclusive, final long endExclusive)
      * The method {@link SecureRandom#SecureRandom()} is called on-demand.
      * </p>
      *
-     * @return the singleton instance based on {@link SecureRandom#SecureRandom()}.
+     * @return the singleton instance based on {@link SecureRandom#SecureRandom()}
      * @see SecureRandom#SecureRandom()
      * @since 3.16.0
      */
@@ -262,7 +262,7 @@ static SecureRandom secureRandom() {
      * The method {@link SecureRandom#getInstanceStrong()} is called on-demand.
      * </p>
      *
-     * @return the singleton instance based on {@link SecureRandom#getInstanceStrong()}.
+     * @return the singleton instance based on {@link SecureRandom#getInstanceStrong()}
      * @see SecureRandom#getInstanceStrong()
      * @since 3.17.0
      */
@@ -297,7 +297,7 @@ Random random() {
     /**
      * Generates a random boolean value.
      *
-     * @return the random boolean.
+     * @return the random boolean
      * @since 3.16.0
      */
     public boolean randomBoolean() {
@@ -307,9 +307,9 @@ public boolean randomBoolean() {
     /**
      * Generates an array of random bytes.
      *
-     * @param count the size of the returned array.
-     * @return the random byte array.
-     * @throws IllegalArgumentException if {@code count} is negative.
+     * @param count the size of the returned array
+     * @return the random byte array
+     * @throws IllegalArgumentException if {@code count} is negative
      * @since 3.16.0
      */
     public byte[] randomBytes(final int count) {
@@ -322,7 +322,7 @@ public byte[] randomBytes(final int count) {
     /**
      * Generates a random double between 0 (inclusive) and Double.MAX_VALUE (exclusive).
      *
-     * @return the random double.
+     * @return the random double
      * @see #randomDouble(double, double)
      * @since 3.16.0
      */
@@ -333,10 +333,10 @@ public double randomDouble() {
     /**
      * Generates a random double within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random double.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random double
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @since 3.16.0
      */
     public double randomDouble(final double startInclusive, final double endExclusive) {
@@ -351,7 +351,7 @@ public double randomDouble(final double startInclusive, final double endExclusiv
     /**
      * Generates a random float between 0 (inclusive) and Float.MAX_VALUE (exclusive).
      *
-     * @return the random float.
+     * @return the random float
      * @see #randomFloat(float, float)
      * @since 3.16.0
      */
@@ -362,10 +362,10 @@ public float randomFloat() {
     /**
      * Generates a random float within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random float.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random float
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @since 3.16.0
      */
     public float randomFloat(final float startInclusive, final float endExclusive) {
@@ -380,7 +380,7 @@ public float randomFloat(final float startInclusive, final float endExclusive) {
     /**
      * Generates a random int between 0 (inclusive) and Integer.MAX_VALUE (exclusive).
      *
-     * @return the random integer.
+     * @return the random integer
      * @see #randomInt(int, int)
      * @since 3.16.0
      */
@@ -391,10 +391,10 @@ public int randomInt() {
     /**
      * Generates a random integer within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random integer.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random integer
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @since 3.16.0
      */
     public int randomInt(final int startInclusive, final int endExclusive) {
@@ -409,7 +409,7 @@ public int randomInt(final int startInclusive, final int endExclusive) {
     /**
      * Generates a random long between 0 (inclusive) and Long.MAX_VALUE (exclusive).
      *
-     * @return the random long.
+     * @return the random long
      * @see #randomLong(long, long)
      * @since 3.16.0
      */
@@ -420,8 +420,8 @@ public long randomLong() {
     /**
      * Generates a {@code long} value between 0 (inclusive) and the specified value (exclusive).
      *
-     * @param n Bound on the random number to be returned. Must be positive.
-     * @return a random {@code long} value between 0 (inclusive) and {@code n} (exclusive).
+     * @param n bound on the random number to be returned. Must be positive.
+     * @return a random {@code long} value between 0 (inclusive) and {@code n} (exclusive)
      */
     private long randomLong(final long n) {
         // Extracted from o.a.c.rng.core.BaseProvider.nextLong(long)
@@ -437,10 +437,10 @@ private long randomLong(final long n) {
     /**
      * Generates a random long within the specified range.
      *
-     * @param startInclusive the smallest value that can be returned, must be non-negative.
-     * @param endExclusive   the upper bound (not included).
-     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative.
-     * @return the random long.
+     * @param startInclusive the smallest value that can be returned, must be non-negative
+     * @param endExclusive   the upper bound (not included)
+     * @return the random long
+     * @throws IllegalArgumentException if {@code startInclusive > endExclusive} or if {@code startInclusive} is negative
      * @since 3.16.0
      */
     public long randomLong(final long startInclusive, final long endExclusive) {
diff --git a/src/main/java/org/apache/commons/lang3/Range.java b/src/main/java/org/apache/commons/lang3/Range.java
index 998f0646f9b..443e304104e 100644
--- a/src/main/java/org/apache/commons/lang3/Range.java
+++ b/src/main/java/org/apache/commons/lang3/Range.java
@@ -28,9 +28,9 @@
  *
  * <p>#ThreadSafe# if the objects and comparator are thread-safe.</p>
  *
- * @param <T> The type of range values.
+ * @param <T> the type of range values
  * @since 3.0
- * @since 3.20.1 {@code serialVersionUID} changed from {@code 1L} to {@code 2L}.
+ * @since 3.20.1 {@code serialVersionUID} changed from {@code 1L} to {@code 2L}
  */
 public class Range<T> implements Serializable {
 
@@ -41,9 +41,9 @@ private enum ComparableComparator implements Comparator {
         /**
          * Comparable based compare implementation.
          *
-         * @param obj1 left-hand side side of comparison.
-         * @param obj2 right-hand side side of comparison.
-         * @return negative, 0, positive comparison value.
+         * @param obj1 left-hand side side of comparison
+         * @param obj2 right-hand side side of comparison
+         * @return negative, 0, positive comparison value
          */
         @Override
         public int compare(final Object obj1, final Object obj2) {
@@ -55,7 +55,7 @@ public int compare(final Object obj1, final Object obj2) {
      * Serialization version.
      *
      * @see java.io.Serializable
-     * @since 3.20.1 {@code serialVersionUID} changed from {@code 1L} to {@value}.
+     * @since 3.20.1 {@code serialVersionUID} changed from {@code 1L} to {@value}
      */
     private static final long serialVersionUID = 2L;
 
@@ -68,13 +68,13 @@ public int compare(final Object obj1, final Object obj2) {
      * <p>The arguments may be passed in the order (min, max) or (max, min).
      * The getMinimum and getMaximum methods will return the correct values.</p>
      *
-     * @param <T> the type of the elements in this range.
-     * @param fromInclusive  the first value that defines the edge of the range, inclusive.
-     * @param toInclusive  the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
-     * @throws NullPointerException when fromInclusive is null.
-     * @throws NullPointerException when toInclusive is null.
-     * @throws ClassCastException if the elements are not {@link Comparable}.
+     * @param <T> the type of the elements in this range
+     * @param fromInclusive  the first value that defines the edge of the range, inclusive
+     * @param toInclusive  the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
+     * @throws ClassCastException if the elements are not {@link Comparable}
+     * @throws NullPointerException when fromInclusive is null
+     * @throws NullPointerException when toInclusive is null
      * @deprecated Use {@link #of(Comparable, Comparable)}.
      */
     @Deprecated
@@ -91,14 +91,14 @@ public static <T extends Comparable<? super T>> Range<T> between(final T fromInc
      * <p>The arguments may be passed in the order (min, max) or (max, min).
      * The getMinimum and getMaximum methods will return the correct values.</p>
      *
-     * @param <T> the type of the elements in this range.
-     * @param fromInclusive  the first value that defines the edge of the range, inclusive.
-     * @param toInclusive  the second value that defines the edge of the range, inclusive.
-     * @param comparator  the comparator to be used, null for natural ordering.
-     * @return the range object, not null.
-     * @throws NullPointerException when fromInclusive is null.
-     * @throws NullPointerException when toInclusive is null.
-     * @throws ClassCastException if using natural ordering and the elements are not {@link Comparable}.
+     * @param <T> the type of the elements in this range
+     * @param fromInclusive  the first value that defines the edge of the range, inclusive
+     * @param toInclusive  the second value that defines the edge of the range, inclusive
+     * @param comparator  the comparator to be used, null for natural ordering
+     * @return the range object, not null
+     * @throws ClassCastException if using natural ordering and the elements are not {@link Comparable}
+     * @throws NullPointerException when fromInclusive is null
+     * @throws NullPointerException when toInclusive is null
      * @deprecated Use {@link #of(Object, Object, Comparator)}.
      */
     @Deprecated
@@ -113,11 +113,11 @@ public static <T> Range<T> between(final T fromInclusive, final T toInclusive, f
      * <p>The range uses the natural ordering of the elements to determine where
      * values lie in the range.</p>
      *
-     * @param <T> the type of the elements in this range.
-     * @param element  the value to use for this range, not null.
-     * @return the range object, not null.
-     * @throws NullPointerException if the element is null.
-     * @throws ClassCastException if the element is not {@link Comparable}.
+     * @param <T> the type of the elements in this range
+     * @param element  the value to use for this range, not null
+     * @return the range object, not null
+     * @throws ClassCastException if the element is not {@link Comparable}
+     * @throws NullPointerException if the element is null
      */
     public static <T extends Comparable<? super T>> Range<T> is(final T element) {
         return of(element, element, null);
@@ -130,12 +130,12 @@ public static <T extends Comparable<? super T>> Range<T> is(final T element) {
      * <p>The range uses the specified {@link Comparator} to determine where
      * values lie in the range.</p>
      *
-     * @param <T> the type of the elements in this range.
-     * @param element  the value to use for this range, must not be {@code null}.
-     * @param comparator  the comparator to be used, null for natural ordering.
-     * @return the range object, not null.
-     * @throws NullPointerException if the element is null.
-     * @throws ClassCastException if using natural ordering and the elements are not {@link Comparable}.
+     * @param <T> the type of the elements in this range
+     * @param element  the value to use for this range, must not be {@code null}
+     * @param comparator  the comparator to be used, null for natural ordering
+     * @return the range object, not null
+     * @throws ClassCastException if using natural ordering and the elements are not {@link Comparable}
+     * @throws NullPointerException if the element is null
      */
     public static <T> Range<T> is(final T element, final Comparator<T> comparator) {
         return of(element, element, comparator);
@@ -150,12 +150,12 @@ public static <T> Range<T> is(final T element, final Comparator<T> comparator) {
      * <p>The arguments may be passed in the order (min, max) or (max, min).
      * The getMinimum and getMaximum methods will return the correct values.</p>
      *
-     * @param <T> the type of the elements in this range.
-     * @param fromInclusive  the first value that defines the edge of the range, inclusive.
-     * @param toInclusive  the second value that defines the edge of the range, inclusive.
-     * @return the range object, not null.
-     * @throws NullPointerException if either element is null.
-     * @throws ClassCastException if the elements are not {@link Comparable}.
+     * @param <T> the type of the elements in this range
+     * @param fromInclusive  the first value that defines the edge of the range, inclusive
+     * @param toInclusive  the second value that defines the edge of the range, inclusive
+     * @return the range object, not null
+     * @throws ClassCastException if the elements are not {@link Comparable}
+     * @throws NullPointerException if either element is null
      * @since 3.13.0
      */
     public static <T extends Comparable<? super T>> Range<T> of(final T fromInclusive, final T toInclusive) {
@@ -171,14 +171,14 @@ public static <T extends Comparable<? super T>> Range<T> of(final T fromInclusiv
      * <p>The arguments may be passed in the order (min, max) or (max, min).
      * The getMinimum and getMaximum methods will return the correct values.</p>
      *
-     * @param <T> the type of the elements in this range.
-     * @param fromInclusive  the first value that defines the edge of the range, inclusive.
-     * @param toInclusive  the second value that defines the edge of the range, inclusive.
-     * @param comparator  the comparator to be used, null for natural ordering.
-     * @return the range object, not null.
-     * @throws NullPointerException when fromInclusive is null.
-     * @throws NullPointerException when toInclusive is null.
-     * @throws ClassCastException if using natural ordering and the elements are not {@link Comparable}.
+     * @param <T> the type of the elements in this range
+     * @param fromInclusive  the first value that defines the edge of the range, inclusive
+     * @param toInclusive  the second value that defines the edge of the range, inclusive
+     * @param comparator  the comparator to be used, null for natural ordering
+     * @return the range object, not null
+     * @throws ClassCastException if using natural ordering and the elements are not {@link Comparable}
+     * @throws NullPointerException when fromInclusive is null
+     * @throws NullPointerException when toInclusive is null
      * @since 3.13.0
      */
     public static <T> Range<T> of(final T fromInclusive, final T toInclusive, final Comparator<T> comparator) {
@@ -213,11 +213,11 @@ public static <T> Range<T> of(final T fromInclusive, final T toInclusive, final
     /**
      * Creates an instance.
      *
-     * @param element1  the first element, not null.
+     * @param element1  the first element, not null
      * @param element2  the second element, not null
-     * @param comp  the comparator to be used, null for natural ordering.
-     * @throws NullPointerException when element1 is null.
-     * @throws NullPointerException when element2 is null.
+     * @param comp  the comparator to be used, null for natural ordering
+     * @throws NullPointerException when element1 is null
+     * @throws NullPointerException when element2 is null
      */
     @SuppressWarnings("unchecked")
     Range(final T element1, final T element2, final Comparator<T> comp) {
@@ -241,8 +241,8 @@ public static <T> Range<T> of(final T fromInclusive, final T toInclusive, final
     /**
      * Checks whether the specified element occurs within this range.
      *
-     * @param element  the element to check for, null returns false.
-     * @return true if the specified element occurs within this range.
+     * @param element  the element to check for, null returns false
+     * @return true if the specified element occurs within this range
      */
     public boolean contains(final T element) {
         if (element == null) {
@@ -256,9 +256,9 @@ public boolean contains(final T element) {
      *
      * <p>This method may fail if the ranges have two different comparators or element types.</p>
      *
-     * @param otherRange  the range to check, null returns false.
-     * @return true if this range contains the specified range.
-     * @throws RuntimeException if ranges cannot be compared.
+     * @param otherRange  the range to check, null returns false
+     * @return true if this range contains the specified range
+     * @throws RuntimeException if ranges cannot be compared
      */
     public boolean containsRange(final Range<T> otherRange) {
         if (otherRange == null) {
@@ -275,9 +275,9 @@ public boolean containsRange(final Range<T> otherRange) {
      * the element is before the range, {@code 0} if contained within the range and
      * {@code 1} if the element is after the range.</p>
      *
-     * @param element  the element to check for, not null.
-     * @return -1, 0 or +1 depending on the element's location relative to the range.
-     * @throws NullPointerException if {@code element} is {@code null}.
+     * @param element  the element to check for, not null
+     * @return -1, 0 or +1 depending on the element's location relative to the range
+     * @throws NullPointerException if {@code element} is {@code null}
      */
     public int elementCompareTo(final T element) {
         // Comparable API says throw NPE on null
@@ -297,8 +297,8 @@ public int elementCompareTo(final T element) {
      * <p>To be equal, the minimum and maximum values must be equal, which
      * ignores any differences in the comparator.</p>
      *
-     * @param obj the reference object with which to compare.
-     * @return true if this object is equal.
+     * @param obj the reference object with which to compare
+     * @return true if this object is equal
      */
     @Override
     public boolean equals(final Object obj) {
@@ -332,9 +332,9 @@ public boolean equals(final Object obj) {
      * range.fit(99) -->  64
      * }</pre>
      *
-     * @param element the element to check for, not null.
-     * @return the minimum, the element, or the maximum depending on the element's location relative to the range.
-     * @throws NullPointerException if {@code element} is {@code null}.
+     * @param element the element to check for, not null
+     * @return the minimum, the element, or the maximum depending on the element's location relative to the range
+     * @throws NullPointerException if {@code element} is {@code null}
      * @since 3.10
      */
     public T fit(final T element) {
@@ -355,7 +355,7 @@ public T fit(final T element) {
      * <p>Natural ordering uses an internal comparator implementation, thus this
      * method never returns null. See {@link #isNaturalOrdering()}.</p>
      *
-     * @return the comparator being used, not null.
+     * @return the comparator being used, not null
      */
     public Comparator<T> getComparator() {
         return comparator;
@@ -364,7 +364,7 @@ public Comparator<T> getComparator() {
     /**
      * Gets the maximum value in this range.
      *
-     * @return the maximum value in this range, not null.
+     * @return the maximum value in this range, not null
      */
     public T getMaximum() {
         return maximum;
@@ -373,7 +373,7 @@ public T getMaximum() {
     /**
      * Gets the minimum value in this range.
      *
-     * @return the minimum value in this range, not null.
+     * @return the minimum value in this range, not null
      */
     public T getMinimum() {
         return minimum;
@@ -382,7 +382,7 @@ public T getMinimum() {
     /**
      * Gets a suitable hash code for the range.
      *
-     * @return a hash code value for this object.
+     * @return a hash code value for this object
      */
     @Override
     public int hashCode() {
@@ -392,9 +392,9 @@ public int hashCode() {
     /**
      * Calculate the intersection of {@code this} and an overlapping Range.
      *
-     * @param other overlapping Range.
-     * @return range representing the intersection of {@code this} and {@code other} ({@code this} if equal).
-     * @throws IllegalArgumentException if {@code other} does not overlap {@code this}.
+     * @param other overlapping Range
+     * @return range representing the intersection of {@code this} and {@code other} ({@code this} if equal)
+     * @throws IllegalArgumentException if {@code other} does not overlap {@code this}
      * @since 3.0.1
      */
     public Range<T> intersectionWith(final Range<T> other) {
@@ -413,8 +413,8 @@ public Range<T> intersectionWith(final Range<T> other) {
     /**
      * Checks whether this range is after the specified element.
      *
-     * @param element  the element to check for, null returns false.
-     * @return true if this range is entirely after the specified element.
+     * @param element  the element to check for, null returns false
+     * @return true if this range is entirely after the specified element
      */
     public boolean isAfter(final T element) {
         if (element == null) {
@@ -428,9 +428,9 @@ public boolean isAfter(final T element) {
      *
      * <p>This method may fail if the ranges have two different comparators or element types.</p>
      *
-     * @param otherRange  the range to check, null returns false.
-     * @return true if this range is completely after the specified range.
-     * @throws RuntimeException if ranges cannot be compared.
+     * @param otherRange  the range to check, null returns false
+     * @return true if this range is completely after the specified range
+     * @throws RuntimeException if ranges cannot be compared
      */
     public boolean isAfterRange(final Range<T> otherRange) {
         if (otherRange == null) {
@@ -442,8 +442,8 @@ public boolean isAfterRange(final Range<T> otherRange) {
     /**
      * Checks whether this range is before the specified element.
      *
-     * @param element  the element to check for, null returns false.
-     * @return true if this range is entirely before the specified element.
+     * @param element  the element to check for, null returns false
+     * @return true if this range is entirely before the specified element
      */
     public boolean isBefore(final T element) {
         if (element == null) {
@@ -457,9 +457,9 @@ public boolean isBefore(final T element) {
      *
      * <p>This method may fail if the ranges have two different comparators or element types.</p>
      *
-     * @param otherRange  the range to check, null returns false.
-     * @return true if this range is completely before the specified range.
-     * @throws RuntimeException if ranges cannot be compared.
+     * @param otherRange  the range to check, null returns false
+     * @return true if this range is completely before the specified range
+     * @throws RuntimeException if ranges cannot be compared
      */
     public boolean isBeforeRange(final Range<T> otherRange) {
         if (otherRange == null) {
@@ -471,8 +471,8 @@ public boolean isBeforeRange(final Range<T> otherRange) {
     /**
      * Checks whether this range ends with the specified element.
      *
-     * @param element  the element to check for, null returns false.
-     * @return true if the specified element occurs within this range.
+     * @param element  the element to check for, null returns false
+     * @return true if the specified element occurs within this range
      */
     public boolean isEndedBy(final T element) {
         if (element == null) {
@@ -487,7 +487,7 @@ public boolean isEndedBy(final T element) {
      * <p>Natural ordering uses an internal comparator implementation, thus this
      * method is the only way to check if a null comparator was specified.</p>
      *
-     * @return true if using natural ordering.
+     * @return true if using natural ordering
      */
     public boolean isNaturalOrdering() {
         return comparator == ComparableComparator.INSTANCE;
@@ -500,10 +500,10 @@ public boolean isNaturalOrdering() {
      *
      * <p>This method may fail if the ranges have two different comparators or element types.</p>
      *
-     * @param otherRange  the range to test, null returns false.
+     * @param otherRange  the range to test, null returns false
      * @return true if the specified range overlaps with this
-     *  range; otherwise, {@code false}.
-     * @throws RuntimeException if ranges cannot be compared.
+     *  range; otherwise, {@code false}
+     * @throws RuntimeException if ranges cannot be compared
      */
     public boolean isOverlappedBy(final Range<T> otherRange) {
         if (otherRange == null) {
@@ -517,8 +517,8 @@ public boolean isOverlappedBy(final Range<T> otherRange) {
     /**
      * Tests whether this range starts with the specified element.
      *
-     * @param element  the element to check for, null returns false.
-     * @return true if the specified element occurs within this range.
+     * @param element  the element to check for, null returns false
+     * @return true if the specified element occurs within this range
      */
     public boolean isStartedBy(final T element) {
         if (element == null) {
@@ -532,7 +532,7 @@ public boolean isStartedBy(final T element) {
      *
      * <p>The format of the String is '[<em>min</em>..<em>max</em>]'.</p>
      *
-     * @return the {@link String} representation of this range.
+     * @return the {@link String} representation of this range
      */
     @Override
     public String toString() {
@@ -551,8 +551,8 @@ public String toString() {
      * and {@code %3$s} for the comparator.
      * The default format used by {@code toString()} is {@code [%1$s..%2$s]}.</p>
      *
-     * @param format  the format string, optionally containing {@code %1$s}, {@code %2$s} and  {@code %3$s}, not null.
-     * @return the formatted string, not null.
+     * @param format  the format string, optionally containing {@code %1$s}, {@code %2$s} and  {@code %3$s}, not null
+     * @return the formatted string, not null
      */
     public String toString(final String format) {
         return String.format(format, minimum, maximum, comparator);
diff --git a/src/main/java/org/apache/commons/lang3/RegExUtils.java b/src/main/java/org/apache/commons/lang3/RegExUtils.java
index 319e7bb0a97..a4daee56e1d 100644
--- a/src/main/java/org/apache/commons/lang3/RegExUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RegExUtils.java
@@ -36,8 +36,8 @@ public class RegExUtils {
     /**
      * Compiles the given regular expression into a pattern with the {@link Pattern#DOTALL} flag.
      *
-     * @param regex The expression to be compiled.
-     * @return the given regular expression compiled into a pattern with the {@link Pattern#DOTALL} flag.
+     * @param regex the expression to be compiled
+     * @return the given regular expression compiled into a pattern with the {@link Pattern#DOTALL} flag
      * @since 3.13.0
      */
     public static Pattern dotAll(final String regex) {
@@ -48,9 +48,9 @@ public static Pattern dotAll(final String regex) {
      * Compiles the given regular expression into a pattern with the {@link Pattern#DOTALL} flag, then creates a matcher that will match the given text against
      * this pattern.
      *
-     * @param regex The expression to be compiled.
-     * @param text  The character sequence to be matched.
-     * @return A new matcher for this pattern.
+     * @param regex the expression to be compiled
+     * @param text  the character sequence to be matched
+     * @return a new matcher for this pattern
      * @since 3.18.0
      */
     public static Matcher dotAllMatcher(final String regex, final CharSequence text) {
@@ -61,9 +61,9 @@ public static Matcher dotAllMatcher(final String regex, final CharSequence text)
      * Compiles the given regular expression into a pattern with the {@link Pattern#DOTALL} flag, then creates a matcher that will match the given text against
      * this pattern.
      *
-     * @param regex The expression to be compiled.
-     * @param text  The character sequence to be matched.
-     * @return A new matcher for this pattern.
+     * @param regex the expression to be compiled
+     * @param text  the character sequence to be matched
+     * @return a new matcher for this pattern
      * @since 3.13.0
      * @deprecated Use {@link #dotAllMatcher(String, CharSequence)}.
      */
@@ -95,11 +95,10 @@ public static Matcher dotAllMatcher(final String regex, final String text) {
      * RegExUtils.removeAll("ABCabc123abc", Pattern.compile("[a-z]"))     = "ABC123"
      * }</pre>
      *
-     * @param text  text to remove from, may be null.
-     * @param regex  the regular expression to which this string is to be matched.
-     * @return  the text with any removes processed,
-     *              {@code null} if null String input.
-     *
+     * @param text  text to remove from, may be null
+     * @param regex  the regular expression to which this string is to be matched
+     * @return the text with any removes processed,
+     *              {@code null} if null String input
      * @see #replaceAll(CharSequence, Pattern, String)
      * @see java.util.regex.Matcher#replaceAll(String)
      * @see java.util.regex.Pattern
@@ -132,11 +131,10 @@ public static String removeAll(final CharSequence text, final Pattern regex) {
      * RegExUtils.removeAll("ABCabc123abc", Pattern.compile("[a-z]"))     = "ABC123"
      * }</pre>
      *
-     * @param text  text to remove from, may be null.
+     * @param text  text to remove from, may be null
      * @param regex  the regular expression to which this string is to be matched
-     * @return  the text with any removes processed,
-     *              {@code null} if null String input.
-     *
+     * @return the text with any removes processed,
+     *              {@code null} if null String input
      * @see #replaceAll(CharSequence, Pattern, String)
      * @see java.util.regex.Matcher#replaceAll(String)
      * @see java.util.regex.Pattern
@@ -177,12 +175,10 @@ public static String removeAll(final String text, final Pattern regex) {
      *
      * @param text  text to remove from, may be null
      * @param regex  the regular expression to which this string is to be matched
-     * @return  the text with any removes processed,
-     *              {@code null} if null String input.
-     *
-     * @throws  java.util.regex.PatternSyntaxException
-     *              if the regular expression's syntax is invalid.
-     *
+     * @return the text with any removes processed,
+     *              {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException
+     *              if the regular expression's syntax is invalid
      * @see #replaceAll(String, String, String)
      * @see #removePattern(CharSequence, String)
      * @see String#replaceAll(String, String)
@@ -216,11 +212,10 @@ public static String removeAll(final String text, final String regex) {
      * RegExUtils.removeFirst("ABCabc123abc", Pattern.compile("[a-z]+"))      = "ABC123abc"
      * }</pre>
      *
-     * @param text  text to remove from, may be null.
-     * @param regex  the regular expression pattern to which this string is to be matched.
-     * @return  the text with the first replacement processed,
-     *              {@code null} if null String input.
-     *
+     * @param text  text to remove from, may be null
+     * @param regex  the regular expression pattern to which this string is to be matched
+     * @return the text with the first replacement processed,
+     *              {@code null} if null String input
      * @see #replaceFirst(String, Pattern, String)
      * @see java.util.regex.Matcher#replaceFirst(String)
      * @see java.util.regex.Pattern
@@ -253,11 +248,10 @@ public static String removeFirst(final CharSequence text, final Pattern regex) {
      * RegExUtils.removeFirst("ABCabc123abc", Pattern.compile("[a-z]+"))      = "ABC123abc"
      * }</pre>
      *
-     * @param text  text to remove from, may be null.
-     * @param regex  the regular expression pattern to which this string is to be matched.
-     * @return  the text with the first replacement processed,
-     *              {@code null} if null String input.
-     *
+     * @param text  text to remove from, may be null
+     * @param regex  the regular expression pattern to which this string is to be matched
+     * @return the text with the first replacement processed,
+     *              {@code null} if null String input
      * @see #replaceFirst(String, Pattern, String)
      * @see java.util.regex.Matcher#replaceFirst(String)
      * @see java.util.regex.Pattern
@@ -296,14 +290,12 @@ public static String removeFirst(final String text, final Pattern regex) {
      * RegExUtils.removeFirst("ABCabc123abc", "[a-z]+")      = "ABC123abc"
      * }</pre>
      *
-     * @param text  text to remove from, may be null.
-     * @param regex  the regular expression to which this string is to be matched.
-     * @return  the text with the first replacement processed,
-     *              {@code null} if null String input.
-     *
-     * @throws  java.util.regex.PatternSyntaxException
-     *              if the regular expression's syntax is invalid.
-     *
+     * @param text  text to remove from, may be null
+     * @param regex  the regular expression to which this string is to be matched
+     * @return the text with the first replacement processed,
+     *              {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException
+     *              if the regular expression's syntax is invalid
      * @see #replaceFirst(String, String, String)
      * @see String#replaceFirst(String, String)
      * @see java.util.regex.Pattern
@@ -332,10 +324,10 @@ public static String removeFirst(final String text, final String regex) {
      * }</pre>
      *
      * @param text
-     *            the source string.
+     *            the source string
      * @param regex
-     *            the regular expression to which this string is to be matched.
-     * @return The resulting {@link String}.
+     *            the regular expression to which this string is to be matched
+     * @return the resulting {@link String}
      * @see #replacePattern(CharSequence, String, String)
      * @see String#replaceAll(String, String)
      * @see Pattern#DOTALL
@@ -364,10 +356,10 @@ public static String removePattern(final CharSequence text, final String regex)
      * }</pre>
      *
      * @param text
-     *            the source string.
+     *            the source string
      * @param regex
-     *            the regular expression to which this string is to be matched.
-     * @return The resulting {@link String}.
+     *            the regular expression to which this string is to be matched
+     * @return the resulting {@link String}
      * @see #replacePattern(CharSequence, String, String)
      * @see String#replaceAll(String, String)
      * @see Pattern#DOTALL
@@ -405,11 +397,11 @@ public static String removePattern(final String text, final String regex) {
      * RegExUtils.replaceAll("Lorem ipsum  dolor   sit", Pattern.compile("( +)([a-z]+)"), "_$2")  = "Lorem_ipsum_dolor_sit"
      * }</pre>
      *
-     * @param text  text to search and replace in, may be null.
-     * @param regex  the regular expression pattern to which this string is to be matched.
-     * @param replacement  the string to be substituted for each match.
-     * @return  the text with any replacements processed,
-     *              {@code null} if null String input.
+     * @param text  text to search and replace in, may be null
+     * @param regex  the regular expression pattern to which this string is to be matched
+     * @param replacement  the string to be substituted for each match
+     * @return the text with any replacements processed,
+     *              {@code null} if null String input
      * @see java.util.regex.Matcher#replaceAll(String)
      * @see java.util.regex.Pattern
      */
@@ -447,11 +439,11 @@ public static String replaceAll(final CharSequence text, final Pattern regex, fi
      * RegExUtils.replaceAll("Lorem ipsum  dolor   sit", Pattern.compile("( +)([a-z]+)"), "_$2")  = "Lorem_ipsum_dolor_sit"
      * }</pre>
      *
-     * @param text  text to search and replace in, may be null.
-     * @param regex  the regular expression pattern to which this string is to be matched.
-     * @param replacement  the string to be substituted for each match.
-     * @return  the text with any replacements processed,
-     *              {@code null} if null String input.
+     * @param text  text to search and replace in, may be null
+     * @param regex  the regular expression pattern to which this string is to be matched
+     * @param replacement  the string to be substituted for each match
+     * @return the text with any replacements processed,
+     *              {@code null} if null String input
      * @see java.util.regex.Matcher#replaceAll(String)
      * @see java.util.regex.Pattern
      * @deprecated Use {@link #replaceAll(CharSequence, Pattern, String)}.
@@ -494,13 +486,13 @@ public static String replaceAll(final String text, final Pattern regex, final St
      * RegExUtils.replaceAll("Lorem ipsum  dolor   sit", "( +)([a-z]+)", "_$2")  = "Lorem_ipsum_dolor_sit"
      * }</pre>
      *
-     * @param text  text to search and replace in, may be null.
-     * @param regex  the regular expression to which this string is to be matched.
-     * @param replacement  the string to be substituted for each match.
-     * @return  the text with any replacements processed,
-     *              {@code null} if null String input.
-     * @throws  java.util.regex.PatternSyntaxException
-     *              if the regular expression's syntax is invalid.
+     * @param text  text to search and replace in, may be null
+     * @param regex  the regular expression to which this string is to be matched
+     * @param replacement  the string to be substituted for each match
+     * @return the text with any replacements processed,
+     *              {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException
+     *              if the regular expression's syntax is invalid
      * @see #replacePattern(String, String, String)
      * @see String#replaceAll(String, String)
      * @see java.util.regex.Pattern
@@ -540,11 +532,11 @@ public static String replaceAll(final String text, final String regex, final Str
      * RegExUtils.replaceFirst("Lorem ipsum  dolor   sit", Pattern.compile("( +)([a-z]+)"), "_$2")  = "Lorem_ipsum  dolor   sit"
      * }</pre>
      *
-     * @param text  text to search and replace in, may be null.
-     * @param regex  the regular expression pattern to which this string is to be matched.
+     * @param text  text to search and replace in, may be null
+     * @param regex  the regular expression pattern to which this string is to be matched
      * @param replacement  the string to be substituted for the first match
-     * @return  the text with the first replacement processed,
-     *              {@code null} if null String input.
+     * @return the text with the first replacement processed,
+     *              {@code null} if null String input
      * @see java.util.regex.Matcher#replaceFirst(String)
      * @see java.util.regex.Pattern
      * @since 3.18.0
@@ -583,11 +575,11 @@ public static String replaceFirst(final CharSequence text, final Pattern regex,
      * RegExUtils.replaceFirst("Lorem ipsum  dolor   sit", Pattern.compile("( +)([a-z]+)"), "_$2")  = "Lorem_ipsum  dolor   sit"
      * }</pre>
      *
-     * @param text  text to search and replace in, may be null.
-     * @param regex  the regular expression pattern to which this string is to be matched.
-     * @param replacement  the string to be substituted for the first match.
-     * @return  the text with the first replacement processed,
-     *              {@code null} if null String input.
+     * @param text  text to search and replace in, may be null
+     * @param regex  the regular expression pattern to which this string is to be matched
+     * @param replacement  the string to be substituted for the first match
+     * @return the text with the first replacement processed,
+     *              {@code null} if null String input
      * @see java.util.regex.Matcher#replaceFirst(String)
      * @see java.util.regex.Pattern
      * @deprecated Use {@link #replaceFirst(CharSequence, Pattern, String)}.
@@ -629,13 +621,13 @@ public static String replaceFirst(final String text, final Pattern regex, final
      * RegExUtils.replaceFirst("Lorem ipsum  dolor   sit", "( +)([a-z]+)", "_$2")  = "Lorem_ipsum  dolor   sit"
      * }</pre>
      *
-     * @param text  text to search and replace in, may be null.
-     * @param regex  the regular expression to which this string is to be matched.
-     * @param replacement  the string to be substituted for the first match.
-     * @return  the text with the first replacement processed,
-     *              {@code null} if null String input.
-     * @throws  java.util.regex.PatternSyntaxException
-     *              if the regular expression's syntax is invalid.
+     * @param text  text to search and replace in, may be null
+     * @param regex  the regular expression to which this string is to be matched
+     * @param replacement  the string to be substituted for the first match
+     * @return the text with the first replacement processed,
+     *              {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException
+     *              if the regular expression's syntax is invalid
      * @see String#replaceFirst(String, String)
      * @see java.util.regex.Pattern
      * @see java.util.regex.Pattern#DOTALL
@@ -674,12 +666,12 @@ public static String replaceFirst(final String text, final String regex, final S
      * }</pre>
      *
      * @param text
-     *            the source string.
+     *            the source string
      * @param regex
-     *            the regular expression to which this string is to be matched.
+     *            the regular expression to which this string is to be matched
      * @param replacement
-     *            the string to be substituted for each match.
-     * @return The resulting {@link String}.
+     *            the string to be substituted for each match
+     * @return the resulting {@link String}
      * @see #replaceAll(String, String, String)
      * @see String#replaceAll(String, String)
      * @see Pattern#DOTALL
@@ -719,12 +711,12 @@ public static String replacePattern(final CharSequence text, final String regex,
      * }</pre>
      *
      * @param text
-     *            the source string.
+     *            the source string
      * @param regex
-     *            the regular expression to which this string is to be matched.
+     *            the regular expression to which this string is to be matched
      * @param replacement
-     *            the string to be substituted for each match.
-     * @return The resulting {@link String}.
+     *            the string to be substituted for each match
+     * @return the resulting {@link String}
      * @see #replaceAll(String, String, String)
      * @see String#replaceAll(String, String)
      * @see Pattern#DOTALL
diff --git a/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java b/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java
index 7be1ee9e982..b0d21305bd1 100644
--- a/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java
+++ b/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java
@@ -97,7 +97,7 @@ public static Boolean inContainer() {
      * </li>
      * </ol>
      *
-     * @return Whether we are running in a container like Docker or Podman.
+     * @return whether we are running in a container like Docker or Podman
      * @see <a href="https://github.com/systemd/systemd/blob/0747e3b60eb4496ee122066c844210ce818d76d9/src/basic/virt.c#L692">SystemD virt.c</a>
      */
     static boolean inContainer(final String dirPrefix) {
@@ -111,9 +111,9 @@ static boolean inContainer(final String dirPrefix) {
     /**
      * Tests whether the {@code /proc/N/environ} file at the given path string contains a specific line prefix.
      *
-     * @param envVarFile The path to a /proc/N/environ file.
-     * @param key        The env var key to find.
-     * @return value The env var value or null.
+     * @param envVarFile the path to a /proc/N/environ file
+     * @param key        the env var key to find
+     * @return value The env var value or null
      */
     private static String readFile(final String envVarFile, final String key) {
         try {
diff --git a/src/main/java/org/apache/commons/lang3/SerializationException.java b/src/main/java/org/apache/commons/lang3/SerializationException.java
index 05c4e1fa869..7cad9decafe 100644
--- a/src/main/java/org/apache/commons/lang3/SerializationException.java
+++ b/src/main/java/org/apache/commons/lang3/SerializationException.java
@@ -45,7 +45,7 @@ public SerializationException() {
      * Constructs a new {@link SerializationException} with specified
      * detail message.
      *
-     * @param msg  The error message.
+     * @param msg the error message
      */
     public SerializationException(final String msg) {
         super(msg);
@@ -55,9 +55,9 @@ public SerializationException(final String msg) {
      * Constructs a new {@link SerializationException} with specified
      * detail message and nested {@link Throwable}.
      *
-     * @param msg    The error message.
-     * @param cause  The {@link Exception} or {@link Error}
-     *  that caused this exception to be thrown.
+     * @param msg    the error message
+     * @param cause  the {@link Exception} or {@link Error}
+     *  that caused this exception to be thrown
      */
     public SerializationException(final String msg, final Throwable cause) {
         super(msg, cause);
@@ -67,8 +67,8 @@ public SerializationException(final String msg, final Throwable cause) {
      * Constructs a new {@link SerializationException} with specified
      * nested {@link Throwable}.
      *
-     * @param cause  The {@link Exception} or {@link Error}
-     *  that caused this exception to be thrown.
+     * @param cause the {@link Exception} or {@link Error}
+     *  that caused this exception to be thrown
      */
     public SerializationException(final Throwable cause) {
         super(cause);
diff --git a/src/main/java/org/apache/commons/lang3/SerializationUtils.java b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
index 124fcb0fc83..7c356a9b884 100644
--- a/src/main/java/org/apache/commons/lang3/SerializationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
@@ -72,9 +72,9 @@ static final class ClassLoaderAwareObjectInputStream extends ObjectInputStream {
         /**
          * Constructs a new instance.
          *
-         * @param in The {@link InputStream}.
+         * @param in the {@link InputStream}
          * @param classLoader classloader to use
-         * @throws IOException if an I/O error occurs while reading stream header.
+         * @throws IOException if an I/O error occurs while reading stream header
          * @see java.io.ObjectInputStream
          */
         ClassLoaderAwareObjectInputStream(final InputStream in, final ClassLoader classLoader) throws IOException {
@@ -86,10 +86,10 @@ static final class ClassLoaderAwareObjectInputStream extends ObjectInputStream {
          * Overridden version that uses the parameterized {@link ClassLoader} or the {@link ClassLoader}
          * of the current {@link Thread} to resolve the class.
          *
-         * @param desc An instance of class {@link ObjectStreamClass}.
-         * @return A {@link Class} object corresponding to {@code desc}.
-         * @throws IOException Any of the usual Input/Output exceptions.
-         * @throws ClassNotFoundException If class of a serialized object cannot be found.
+         * @param desc an instance of class {@link ObjectStreamClass}
+         * @return a {@link Class} object corresponding to {@code desc}
+         * @throws ClassNotFoundException if class of a serialized object cannot be found
+         * @throws IOException any of the usual Input/Output exceptions
          */
         @Override
         protected Class<?> resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
@@ -120,10 +120,10 @@ protected Class<?> resolveClass(final ObjectStreamClass desc) throws IOException
      * be a simple alternative implementation. Of course all the objects
      * must be {@link Serializable}.</p>
      *
-     * @param <T> the type of the object involved.
-     * @param object  the {@link Serializable} object to clone.
-     * @return the cloned object.
-     * @throws SerializationException (runtime) if the serialization fails.
+     * @param <T> the type of the object involved
+     * @param object  the {@link Serializable} object to clone
+     * @return the cloned object
+     * @throws SerializationException (runtime) if the serialization fails
      */
     public static <T extends Serializable> T clone(final T object) {
         if (object == null) {
@@ -154,12 +154,12 @@ public static <T extends Serializable> T clone(final T object) {
      * {@link org.apache.commons.io.serialization.ValidatingObjectInputStream ValidatingObjectInputStream}.
      * </p>
      *
-     * @param <T>  the object type to be deserialized.
+     * @param <T>  the object type to be deserialized
      * @param objectData
-     *            the serialized object, must not be null.
-     * @return the deserialized object.
-     * @throws NullPointerException if {@code objectData} is {@code null}.
-     * @throws SerializationException (runtime) if the serialization fails.
+     *            the serialized object, must not be null
+     * @return the deserialized object
+     * @throws NullPointerException if {@code objectData} is {@code null}
+     * @throws SerializationException (runtime) if the serialization fails
      * @see org.apache.commons.io.serialization.ValidatingObjectInputStream
      */
     public static <T> T deserialize(final byte[] objectData) {
@@ -191,11 +191,11 @@ public static <T> T deserialize(final byte[] objectData) {
      * {@link org.apache.commons.io.serialization.ValidatingObjectInputStream ValidatingObjectInputStream}.
      * </p>
      *
-     * @param <T>  the object type to be deserialized.
-     * @param inputStream the serialized object input stream, must not be null.
-     * @return the deserialized object.
-     * @throws NullPointerException if {@code inputStream} is {@code null}.
-     * @throws SerializationException (runtime) if the serialization fails.
+     * @param <T>  the object type to be deserialized
+     * @param inputStream the serialized object input stream, must not be null
+     * @return the deserialized object
+     * @throws NullPointerException if {@code inputStream} is {@code null}
+     * @throws SerializationException (runtime) if the serialization fails
      * @see org.apache.commons.io.serialization.ValidatingObjectInputStream
      */
     @SuppressWarnings("resource") // inputStream is managed by the caller
@@ -215,10 +215,10 @@ public static <T> T deserialize(final InputStream inputStream) {
      * implement {@link Serializable}.
      *
      * @param <T>
-     *           the type of the object involved.
+     *           the type of the object involved
      * @param obj
-     *            the object to roundtrip.
-     * @return the serialized and deserialized object.
+     *            the object to roundtrip
+     * @return the serialized and deserialized object
      * @since 3.3
      */
     @SuppressWarnings("unchecked") // OK, because we serialized a type `T`
@@ -230,9 +230,9 @@ public static <T extends Serializable> T roundtrip(final T obj) {
      * Serializes an {@link Object} to a byte array for
      * storage/serialization.
      *
-     * @param obj  the object to serialize to bytes.
-     * @return a byte[] with the converted Serializable.
-     * @throws SerializationException (runtime) if the serialization fails.
+     * @param obj  the object to serialize to bytes
+     * @return a byte[] with the converted Serializable
+     * @throws SerializationException (runtime) if the serialization fails
      */
     public static byte[] serialize(final Serializable obj) {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
@@ -250,10 +250,10 @@ public static byte[] serialize(final Serializable obj) {
      * <p>The stream passed in is not buffered internally within this method.
      * This is the responsibility of your application if desired.</p>
      *
-     * @param obj  the object to serialize to bytes, may be null.
-     * @param outputStream  the stream to write to, must not be null.
-     * @throws NullPointerException if {@code outputStream} is {@code null}.
-     * @throws SerializationException (runtime) if the serialization fails.
+     * @param obj  the object to serialize to bytes, may be null
+     * @param outputStream  the stream to write to, must not be null
+     * @throws NullPointerException if {@code outputStream} is {@code null}
+     * @throws SerializationException (runtime) if the serialization fails
      */
     @SuppressWarnings("resource") // outputStream is managed by the caller
     public static void serialize(final Serializable obj, final OutputStream outputStream) {
diff --git a/src/main/java/org/apache/commons/lang3/Streams.java b/src/main/java/org/apache/commons/lang3/Streams.java
index c587976390b..93956a7a0a5 100644
--- a/src/main/java/org/apache/commons/lang3/Streams.java
+++ b/src/main/java/org/apache/commons/lang3/Streams.java
@@ -74,7 +74,7 @@ public class Streams {
     /**
      * A Collector type for arrays.
      *
-     * @param <O> The array type.
+     * @param <O> the array type
      * @deprecated Use {@link org.apache.commons.lang3.stream.Streams.ArrayCollector}.
      */
     @Deprecated
@@ -85,7 +85,7 @@ public static class ArrayCollector<O> implements Collector<O, List<O>, O[]> {
         /**
          * Constructs a new instance for the given element type.
          *
-         * @param elementType The element type.
+         * @param elementType the element type
          */
         public ArrayCollector(final Class<O> elementType) {
             this.elementType = elementType;
@@ -124,7 +124,7 @@ public Supplier<List<O>> supplier() {
      * A reduced, and simplified version of a {@link Stream} with
      * failable method signatures.
      *
-     * @param <O> The streams element type.
+     * @param <O> the streams element type
      * @deprecated Use {@link org.apache.commons.lang3.stream.Streams.FailableStream}.
      */
     @Deprecated
@@ -136,7 +136,7 @@ public static class FailableStream<O> {
         /**
          * Constructs a new instance with the given {@code stream}.
          *
-         * @param stream The stream.
+         * @param stream the stream
          */
         public FailableStream(final Stream<O> stream) {
             this.stream = stream;
@@ -160,10 +160,10 @@ public FailableStream(final Stream<O> stream) {
          * satisfied</em> and is always {@code true} (regardless of P(x)).
          * </p>
          *
-         * @param predicate A non-interfering, stateless predicate to apply to
-         * elements of this stream.
+         * @param predicate a non-interfering, stateless predicate to apply to
+         * elements of this stream
          * @return {@code true} If either all elements of the stream match the
-         * provided predicate or the stream is empty, otherwise {@code false}.
+         * provided predicate or the stream is empty, otherwise {@code false}
          */
         public boolean allMatch(final FailablePredicate<O, ?> predicate) {
             assertNotTerminated();
@@ -184,10 +184,10 @@ public boolean allMatch(final FailablePredicate<O, ?> predicate) {
          * This method evaluates the <em>existential quantification</em> of the
          * predicate over the elements of the stream (for some x P(x)).
          *
-         * @param predicate A non-interfering, stateless predicate to apply to
-         * elements of this stream.
+         * @param predicate a non-interfering, stateless predicate to apply to
+         * elements of this stream
          * @return {@code true} if any elements of the stream match the provided
-         * predicate, otherwise {@code false}.
+         * predicate, otherwise {@code false}
          */
         public boolean anyMatch(final FailablePredicate<O, ?> predicate) {
             assertNotTerminated();
@@ -197,7 +197,7 @@ public boolean anyMatch(final FailablePredicate<O, ?> predicate) {
         /**
          * Throws IllegalStateException if this stream is already terminated.
          *
-         * @throws IllegalStateException if this stream is already terminated.
+         * @throws IllegalStateException if this stream is already terminated
          */
         protected void assertNotTerminated() {
             if (terminated) {
@@ -257,10 +257,10 @@ protected void assertNotTerminated() {
          *                                                      Collectors.groupingBy(Person::getCity)));
          * }</pre>
          *
-         * @param <R> the type of the result.
-         * @param <A> the intermediate accumulation type of the {@link Collector}.
-         * @param collector the {@link Collector} describing the reduction.
-         * @return the result of the reduction.
+         * @param <R> the type of the result
+         * @param <A> the intermediate accumulation type of the {@link Collector}
+         * @param collector the {@link Collector} describing the reduction
+         * @return the result of the reduction
          * @see #collect(Supplier, BiConsumer, BiConsumer)
          * @see Collectors
          */
@@ -310,17 +310,17 @@ public <A, R> R collect(final Collector<? super O, A, R> collector) {
          *                                 .toString();
          * }</pre>
          *
-         * @param <R> type of the result.
-         * @param <A> Type of the accumulator.
+         * @param <R> type of the result
+         * @param <A> type of the accumulator
          * @param supplier a function that creates a new result container. For a
          *                 parallel execution, this function may be called
          *                 multiple times and must return a fresh value each time.
-         * @param accumulator An associative, non-interfering, stateless function for
-         *   incorporating an additional element into a result.
-         * @param combiner An associative, non-interfering, stateless
+         * @param accumulator an associative, non-interfering, stateless function for
+         *   incorporating an additional element into a result
+         * @param combiner an associative, non-interfering, stateless
          *   function for combining two values, which must be compatible with the
-         *   accumulator function.
-         * @return The result of the reduction.
+         *   accumulator function
+         * @return the result of the reduction
          */
         public <A, R> R collect(final Supplier<R> supplier, final BiConsumer<R, ? super O> accumulator, final BiConsumer<R, R> combiner) {
             makeTerminated();
@@ -336,8 +336,8 @@ public <A, R> R collect(final Supplier<R> supplier, final BiConsumer<R, ? super
          * </p>
          *
          * @param predicate a non-interfering, stateless predicate to apply to each
-         * element to determine if it should be included.
-         * @return the new stream.
+         * element to determine if it should be included
+         * @return the new stream
          */
         public FailableStream<O> filter(final FailablePredicate<O, ?> predicate) {
             assertNotTerminated();
@@ -362,7 +362,7 @@ public FailableStream<O> filter(final FailablePredicate<O, ?> predicate) {
          * responsible for providing the required synchronization.
          * </p>
          *
-         * @param action a non-interfering action to perform on the elements.
+         * @param action a non-interfering action to perform on the elements
          */
         public void forEach(final FailableConsumer<O, ?> action) {
             makeTerminated();
@@ -372,7 +372,7 @@ public void forEach(final FailableConsumer<O, ?> action) {
         /**
          * Marks this stream as terminated.
          *
-         * @throws IllegalStateException if this stream is already terminated.
+         * @throws IllegalStateException if this stream is already terminated
          */
         protected void makeTerminated() {
             assertNotTerminated();
@@ -387,9 +387,9 @@ protected void makeTerminated() {
          * This is an intermediate operation.
          * </p>
          *
-         * @param <R> The element type of the new stream.
-         * @param mapper A non-interfering, stateless function to apply to each element.
-         * @return the new stream.
+         * @param <R> the element type of the new stream
+         * @param mapper a non-interfering, stateless function to apply to each element
+         * @return the new stream
          */
         public <R> FailableStream<R> map(final FailableFunction<O, R, ?> mapper) {
             assertNotTerminated();
@@ -440,10 +440,10 @@ public <R> FailableStream<R> map(final FailableFunction<O, R, ?> mapper) {
          * synchronization and with greatly reduced risk of data races.
          * </p>
          *
-         * @param identity the identity value for the accumulating function.
+         * @param identity the identity value for the accumulating function
          * @param accumulator an associative, non-interfering, stateless
-         *                    function for combining two values.
-         * @return the result of the reduction.
+         *                    function for combining two values
+         * @return the result of the reduction
          */
         public O reduce(final O identity, final BinaryOperator<O> accumulator) {
             makeTerminated();
@@ -453,7 +453,7 @@ public O reduce(final O identity, final BinaryOperator<O> accumulator) {
         /**
          * Converts the FailableStream into an equivalent stream.
          *
-         * @return A stream, which will return the same elements, which this FailableStream would return.
+         * @return a stream, which will return the same elements, which this FailableStream would return
          */
         public Stream<O> stream() {
             return stream;
@@ -498,10 +498,10 @@ public Stream<O> stream() {
      * than the first version.
      * </p>
      *
-     * @param <O> The streams element type.
-     * @param stream The stream, which is being converted.
-     * @return The {@link FailableStream}, which has been created by
-     *   converting the stream.
+     * @param <O> the streams element type
+     * @param stream the stream, which is being converted
+     * @return the {@link FailableStream}, which has been created by
+     *   converting the stream
      */
     public static <O> FailableStream<O> stream(final Collection<O> stream) {
         return stream(stream.stream());
@@ -545,10 +545,10 @@ public static <O> FailableStream<O> stream(final Collection<O> stream) {
      * than the first version.
      * </p>
      *
-     * @param <O> The streams element type.
-     * @param stream The stream, which is being converted.
-     * @return The {@link FailableStream}, which has been created by
-     *   converting the stream.
+     * @param <O> the streams element type
+     * @param stream the stream, which is being converted
+     * @return the {@link FailableStream}, which has been created by
+     *   converting the stream
      */
     public static <O> FailableStream<O> stream(final Stream<O> stream) {
         return new FailableStream<>(stream);
@@ -558,10 +558,10 @@ public static <O> FailableStream<O> stream(final Stream<O> stream) {
      * Returns a {@link Collector} that accumulates the input elements into a
      * new array.
      *
-     * @param elementType Type of an element in the array.
-     * @param <O> the type of the input elements.
+     * @param elementType type of an element in the array
+     * @param <O> the type of the input elements
      * @return a {@link Collector} which collects all the input elements into an
-     * array, in encounter order.
+     * array, in encounter order
      */
     public static <O> Collector<O, ?, O[]> toArray(final Class<O> elementType) {
         return new ArrayCollector<>(elementType);
diff --git a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
index 4e0f46f777d..5a2f57f64fc 100644
--- a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
@@ -452,8 +452,8 @@ public static final String escapeCsv(final String input) {
      * output string: He didn\'t say, \"Stop!\"
      * </pre>
      *
-     * @param input  String to escape values in, may be null
-     * @return String with escaped values, {@code null} if null string input
+     * @param input  string to escape values in, may be null
+     * @return string with escaped values, {@code null} if null string input
      * @since 3.0
      */
     public static final String escapeEcmaScript(final String input) {
@@ -518,8 +518,8 @@ public static final String escapeHtml4(final String input) {
      * output string: He didn't say, \"Stop!\"
      * </pre>
      *
-     * @param input  String to escape values in, may be null
-     * @return String with escaped values, {@code null} if null string input
+     * @param input  string to escape values in, may be null
+     * @return string with escaped values, {@code null} if null string input
      */
     public static final String escapeJava(final String input) {
         return ESCAPE_JAVA.translate(input);
@@ -544,8 +544,8 @@ public static final String escapeJava(final String input) {
      * output string: He didn't say, \"Stop!\"
      * </pre>
      *
-     * @param input  String to escape values in, may be null
-     * @return String with escaped values, {@code null} if null string input
+     * @param input  string to escape values in, may be null
+     * @return string with escaped values, {@code null} if null string input
      * @since 3.2
      */
     public static final String escapeJson(final String input) {
@@ -689,9 +689,9 @@ public static final String unescapeCsv(final String input) {
      * into a newline character, unless the {@code '\'} is preceded by another
      * {@code '\'}.</p>
      *
-     * @see #unescapeJava(String)
      * @param input  the {@link String} to unescape, may be null
-     * @return A new unescaped {@link String}, {@code null} if null string input
+     * @return a new unescaped {@link String}, {@code null} if null string input
+     * @see #unescapeJava(String)
      * @since 3.0
      */
     public static final String unescapeEcmaScript(final String input) {
@@ -751,9 +751,9 @@ public static final String unescapeJava(final String input) {
      * into a newline character, unless the {@code '\'} is preceded by another
      * {@code '\'}.</p>
      *
-     * @see #unescapeJava(String)
      * @param input  the {@link String} to unescape, may be null
-     * @return A new unescaped {@link String}, {@code null} if null string input
+     * @return a new unescaped {@link String}, {@code null} if null string input
+     * @see #unescapeJava(String)
      * @since 3.2
      */
     public static final String unescapeJson(final String input) {
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index bcc26aaf6e1..1b8a9204eb2 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -228,10 +228,10 @@ public class StringUtils {
      * StringUtils.abbreviate("abcdefg", 3) = Throws {@link IllegalArgumentException}.
      * </pre>
      *
-     * @param str      the String to check, may be null.
-     * @param maxWidth maximum length of result String, must be at least 4.
-     * @return abbreviated String, {@code null} if null String input.
-     * @throws IllegalArgumentException if the width is too small.
+     * @param str      the String to check, may be null
+     * @param maxWidth maximum length of result String, must be at least 4
+     * @return abbreviated String, {@code null} if null String input
+     * @throws IllegalArgumentException if the width is too small
      * @since 2.0
      */
     public static String abbreviate(final String str, final int maxWidth) {
@@ -265,11 +265,11 @@ public static String abbreviate(final String str, final int maxWidth) {
      * StringUtils.abbreviate("abcdefghij", 5, 6)        = Throws {@link IllegalArgumentException}.
      * </pre>
      *
-     * @param str      the String to check, may be null.
-     * @param offset   left edge of source String.
-     * @param maxWidth maximum length of result String, must be at least 4.
-     * @return abbreviated String, {@code null} if null String input.
-     * @throws IllegalArgumentException if the width is too small.
+     * @param str      the String to check, may be null
+     * @param offset   left edge of source String
+     * @param maxWidth maximum length of result String, must be at least 4
+     * @return abbreviated String, {@code null} if null String input
+     * @throws IllegalArgumentException if the width is too small
      * @since 2.0
      */
     public static String abbreviate(final String str, final int offset, final int maxWidth) {
@@ -303,11 +303,11 @@ public static String abbreviate(final String str, final int offset, final int ma
      * StringUtils.abbreviate("abcdefg", "...", 3) = Throws {@link IllegalArgumentException}.
      * </pre>
      *
-     * @param str          the String to check, may be null.
-     * @param abbrevMarker the String used as replacement marker.
-     * @param maxWidth     maximum length of result String, must be at least {@code abbrevMarker.length + 1}.
-     * @return abbreviated String, {@code null} if null String input.
-     * @throws IllegalArgumentException if the width is too small.
+     * @param str          the String to check, may be null
+     * @param abbrevMarker the String used as replacement marker
+     * @param maxWidth     maximum length of result String, must be at least {@code abbrevMarker.length + 1}
+     * @return abbreviated String, {@code null} if null String input
+     * @throws IllegalArgumentException if the width is too small
      * @since 3.6
      */
     public static String abbreviate(final String str, final String abbrevMarker, final int maxWidth) {
@@ -343,12 +343,12 @@ public static String abbreviate(final String str, final String abbrevMarker, fin
      * StringUtils.abbreviate("abcdefghij", "...", 5, 6)        = Throws {@link IllegalArgumentException}.
      * </pre>
      *
-     * @param str          the String to check, may be null.
-     * @param abbrevMarker the String used as replacement marker, for example "...", or Unicode HORIZONTAL ELLIPSIS, U+2026 '…'.
-     * @param offset       left edge of source String.
-     * @param maxWidth     maximum length of result String, must be at least 4.
-     * @return abbreviated String, {@code null} if null String input.
-     * @throws IllegalArgumentException if the width is too small.
+     * @param str          the String to check, may be null
+     * @param abbrevMarker the String used as replacement marker, for example "...", or Unicode HORIZONTAL ELLIPSIS, U+2026 '…'
+     * @param offset       left edge of source String
+     * @param maxWidth     maximum length of result String, must be at least 4
+     * @return abbreviated String, {@code null} if null String input
+     * @throws IllegalArgumentException if the width is too small
      * @since 3.6
      */
     public static String abbreviate(final String str, String abbrevMarker, int offset, final int maxWidth) {
@@ -406,10 +406,10 @@ public static String abbreviate(final String str, String abbrevMarker, int offse
      * StringUtils.abbreviateMiddle("abcdef", ".", 4) = "ab.f"
      * </pre>
      *
-     * @param str    the String to abbreviate, may be null.
-     * @param middle the String to replace the middle characters with, may be null.
-     * @param length the length to abbreviate {@code str} to.
-     * @return the abbreviated String if the above criteria is met, or the original String supplied for abbreviation.
+     * @param str    the String to abbreviate, may be null
+     * @param middle the String to replace the middle characters with, may be null
+     * @param length the length to abbreviate {@code str} to
+     * @return the abbreviated String if the above criteria is met, or the original String supplied for abbreviation
      * @since 2.5
      */
     public static String abbreviateMiddle(final String str, final String middle, final int length) {
@@ -450,10 +450,10 @@ public static String abbreviateMiddle(final String str, final String middle, fin
      * StringUtils.appendIfMissing("abcMNO", "xyz", "mno") = "abcMNOxyz"
      * </pre>
      *
-     * @param str      The string.
-     * @param suffix   The suffix to append to the end of the string.
-     * @param suffixes Additional suffixes that are valid terminators.
-     * @return A new String if suffix was appended, the same string otherwise.
+     * @param str      the string
+     * @param suffix   the suffix to append to the end of the string
+     * @param suffixes additional suffixes that are valid terminators
+     * @return a new String if suffix was appended, the same string otherwise
      * @since 3.2
      * @deprecated Use {@link Strings#appendIfMissing(String, CharSequence, CharSequence...) Strings.CS.appendIfMissing(String, CharSequence, CharSequence...)}.
      */
@@ -488,10 +488,10 @@ public static String appendIfMissing(final String str, final CharSequence suffix
      * StringUtils.appendIfMissingIgnoreCase("abcMNO", "xyz", "mno") = "abcMNO"
      * </pre>
      *
-     * @param str The string.
-     * @param suffix The suffix to append to the end of the string.
-     * @param suffixes Additional suffixes that are valid terminators.
-     * @return A new String if suffix was appended, the same string otherwise.
+     * @param str the string
+     * @param suffix the suffix to append to the end of the string
+     * @param suffixes additional suffixes that are valid terminators
+     * @return a new String if suffix was appended, the same string otherwise
      * @since 3.2
      * @deprecated Use {@link Strings#appendIfMissing(String, CharSequence, CharSequence...) Strings.CI.appendIfMissing(String, CharSequence, CharSequence...)}.
      */
@@ -504,9 +504,9 @@ public static String appendIfMissingIgnoreCase(final String str, final CharSeque
      * Computes the capacity required for a StringBuilder to hold {@code items} of {@code maxElementChars} characters plus the separators between them. The
      * separator is assumed to be 1 character.
      *
-     * @param count           The number of items.
-     * @param maxElementChars The maximum number of characters per item.
-     * @return A StringBuilder with the appropriate capacity.
+     * @param count           the number of items
+     * @param maxElementChars the maximum number of characters per item
+     * @return a StringBuilder with the appropriate capacity
      */
     private static StringBuilder capacity(final int count, final byte maxElementChars) {
         return new StringBuilder(count * maxElementChars + count - 1);
@@ -527,8 +527,8 @@ private static StringBuilder capacity(final int count, final byte maxElementChar
      * StringUtils.capitalize("'cat'") = "'cat'"
      * </pre>
      *
-     * @param str the String to capitalize, may be null.
-     * @return the capitalized String, {@code null} if null String input.
+     * @param str the String to capitalize, may be null
+     * @return the capitalized String, {@code null} if null String input
      * @see org.apache.commons.text.WordUtils#capitalize(String)
      * @see #uncapitalize(String)
      * @since 2.0
@@ -569,9 +569,9 @@ public static String capitalize(final String str) {
      * StringUtils.center("a", 4)    = " a  "
      * </pre>
      *
-     * @param str  the String to center, may be null.
-     * @param size the int size of new String, negative treated as zero.
-     * @return centered String, {@code null} if null String input.
+     * @param str  the String to center, may be null
+     * @param size the int size of new String, negative treated as zero
+     * @return centered String, {@code null} if null String input
      */
     public static String center(final String str, final int size) {
         return center(str, size, ' ');
@@ -594,10 +594,10 @@ public static String center(final String str, final int size) {
      * StringUtils.center("a", 4, 'y')    = "yayy"
      * </pre>
      *
-     * @param str     the String to center, may be null.
-     * @param size    the int size of new String, negative treated as zero.
-     * @param padChar the character to pad the new String with.
-     * @return centered String, {@code null} if null String input.
+     * @param str     the String to center, may be null
+     * @param size    the int size of new String, negative treated as zero
+     * @param padChar the character to pad the new String with
+     * @return centered String, {@code null} if null String input
      * @since 2.0
      */
     public static String center(String str, final int size, final char padChar) {
@@ -632,11 +632,11 @@ public static String center(String str, final int size, final char padChar) {
      * StringUtils.center("abc", 7, "")   = "  abc  "
      * </pre>
      *
-     * @param str    the String to center, may be null.
-     * @param size   the int size of new String, negative treated as zero.
-     * @param padStr the String to pad the new String with, must not be null or empty.
-     * @return centered String, {@code null} if null String input.
-     * @throws IllegalArgumentException if padStr is {@code null} or empty.
+     * @param str    the String to center, may be null
+     * @param size   the int size of new String, negative treated as zero
+     * @param padStr the String to pad the new String with, must not be null or empty
+     * @return centered String, {@code null} if null String input
+     * @throws IllegalArgumentException if padStr is {@code null} or empty
      */
     public static String center(String str, final int size, String padStr) {
         if (str == null || size <= 0) {
@@ -676,8 +676,8 @@ public static String center(String str, final int size, String padStr) {
      * StringUtils.chomp("\r\n")        = ""
      * </pre>
      *
-     * @param str the String to chomp a newline from, may be null.
-     * @return String without newline, {@code null} if null String input.
+     * @param str the String to chomp a newline from, may be null
+     * @return string without newline, {@code null} if null String input
      */
     public static String chomp(final String str) {
         if (isEmpty(str)) {
@@ -723,9 +723,9 @@ public static String chomp(final String str) {
      * StringUtils.chomp("foo", null)     = "foo"
      * </pre>
      *
-     * @param str       the String to chomp from, may be null.
-     * @param separator separator String, may be null.
-     * @return String without trailing separator, {@code null} if null String input.
+     * @param str       the String to chomp from, may be null
+     * @param separator separator String, may be null
+     * @return string without trailing separator, {@code null} if null String input
      * @deprecated This feature will be removed in Lang 4, use {@link StringUtils#removeEnd(String, String)} instead.
      */
     @Deprecated
@@ -754,8 +754,8 @@ public static String chomp(final String str, final String separator) {
      * StringUtils.chop("\r\n")        = ""
      * </pre>
      *
-     * @param str the String to chop last character from, may be null.
-     * @return String without last character, {@code null} if null String input.
+     * @param str the String to chop last character from, may be null
+     * @return string without last character, {@code null} if null String input
      */
     public static String chop(final String str) {
         if (str == null) {
@@ -805,9 +805,9 @@ public static String chop(final String str) {
      * StringUtils.compare("ab", "abc")  < 0
      * }</pre>
      *
-     * @param str1 the String to compare from.
-     * @param str2 the String to compare to.
-     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal or greater than {@code str2}.
+     * @param str1 the String to compare from
+     * @param str2 the String to compare to
+     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal or greater than {@code str2}
      * @see #compare(String, String, boolean)
      * @see String#compareTo(String)
      * @since 3.5
@@ -851,10 +851,10 @@ public static int compare(final String str1, final String str2) {
      * StringUtils.compare("ab", "abc", *)    < 0
      * }</pre>
      *
-     * @param str1       the String to compare from.
-     * @param str2       the String to compare to.
-     * @param nullIsLess whether consider {@code null} value less than non-{@code null} value.
-     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal ou greater than {@code str2}.
+     * @param str1       the String to compare from
+     * @param str2       the String to compare to
+     * @param nullIsLess whether consider {@code null} value less than non-{@code null} value
+     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal ou greater than {@code str2}
      * @see String#compareTo(String)
      * @since 3.5
      */
@@ -904,9 +904,9 @@ public static int compare(final String str1, final String str2, final boolean nu
      * StringUtils.compareIgnoreCase("ab", "ABC")  < 0
      * }</pre>
      *
-     * @param str1 the String to compare from.
-     * @param str2 the String to compare to.
-     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal ou greater than {@code str2}, ignoring case differences.
+     * @param str1 the String to compare from
+     * @param str2 the String to compare to
+     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal ou greater than {@code str2}, ignoring case differences
      * @see #compareIgnoreCase(String, String, boolean)
      * @see String#compareToIgnoreCase(String)
      * @since 3.5
@@ -952,10 +952,10 @@ public static int compareIgnoreCase(final String str1, final String str2) {
      * StringUtils.compareIgnoreCase("ab", "abc", *)    < 0
      * }</pre>
      *
-     * @param str1       the String to compare from.
-     * @param str2       the String to compare to.
-     * @param nullIsLess whether consider {@code null} value less than non-{@code null} value.
-     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal ou greater than {@code str2}, ignoring case differences.
+     * @param str1       the String to compare from
+     * @param str2       the String to compare to
+     * @param nullIsLess whether consider {@code null} value less than non-{@code null} value
+     * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal ou greater than {@code str2}, ignoring case differences
      * @see String#compareToIgnoreCase(String)
      * @since 3.5
      */
@@ -1045,9 +1045,9 @@ public static boolean contains(final CharSequence seq, final int searchChar) {
      * StringUtils.containsAny("aba", 'z])               = false
      * </pre>
      *
-     * @param cs          the CharSequence to check, may be null.
-     * @param searchChars the chars to search for, may be null.
-     * @return the {@code true} if any of the chars are found, {@code false} if no match or null input.
+     * @param cs          the CharSequence to check, may be null
+     * @param searchChars the chars to search for, may be null
+     * @return the {@code true} if any of the chars are found, {@code false} if no match or null input
      * @since 2.4
      * @since 3.0 Changed signature from containsAny(String, char[]) to containsAny(CharSequence, char...)
      */
@@ -1092,9 +1092,9 @@ public static boolean containsAny(final CharSequence cs, final char... searchCha
      * StringUtils.containsAny("aba", "z")            = false
      * </pre>
      *
-     * @param cs          the CharSequence to check, may be null.
-     * @param searchChars the chars to search for, may be null.
-     * @return the {@code true} if any of the chars are found, {@code false} if no match or null input.
+     * @param cs          the CharSequence to check, may be null
+     * @param searchChars the chars to search for, may be null
+     * @return the {@code true} if any of the chars are found, {@code false} if no match or null input
      * @since 2.4
      * @since 3.0 Changed signature from containsAny(String, String) to containsAny(CharSequence, CharSequence)
      */
@@ -1123,10 +1123,10 @@ public static boolean containsAny(final CharSequence cs, final CharSequence sear
      * StringUtils.containsAny("abc", "d", "abc")  = true
      * </pre>
      *
-     * @param cs The CharSequence to check, may be null.
-     * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be
+     * @param cs the CharSequence to check, may be null
+     * @param searchCharSequences the array of CharSequences to search for, may be null. Individual CharSequences may be
      *        null as well.
-     * @return {@code true} if any of the search CharSequences are found, {@code false} otherwise.
+     * @return {@code true} if any of the search CharSequences are found, {@code false} otherwise
      * @since 3.4
      * @deprecated Use {@link Strings#containsAny(CharSequence, CharSequence...) Strings.CS.containsAny(CharSequence, CharSequence...)}.
      */
@@ -1155,8 +1155,8 @@ public static boolean containsAny(final CharSequence cs, final CharSequence... s
      * StringUtils.containsAny("ABC", "d", "abc")  = true
      * </pre>
      *
-     * @param cs The CharSequence to check, may be null.
-     * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be
+     * @param cs the CharSequence to check, may be null
+     * @param searchCharSequences the array of CharSequences to search for, may be null. Individual CharSequences may be
      *        null as well.
      * @return {@code true} if any of the search CharSequences are found, {@code false} otherwise
      * @since 3.12.0
@@ -1186,10 +1186,10 @@ public static boolean containsAnyIgnoreCase(final CharSequence cs, final CharSeq
      * StringUtils.containsIgnoreCase("abc", "Z") = false
      * </pre>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @return true if the CharSequence contains the search CharSequence irrespective of case or false if not or {@code null} string input.
-     * @since 3.0 Changed signature from containsIgnoreCase(String, String) to containsIgnoreCase(CharSequence, CharSequence).
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @return true if the CharSequence contains the search CharSequence irrespective of case or false if not or {@code null} string input
+     * @since 3.0 Changed signature from containsIgnoreCase(String, String) to containsIgnoreCase(CharSequence, CharSequence)
      * @deprecated Use {@link Strings#contains(CharSequence, CharSequence) Strings.CI.contains(CharSequence, CharSequence)}.
      */
     @Deprecated
@@ -1215,9 +1215,9 @@ public static boolean containsIgnoreCase(final CharSequence str, final CharSeque
      * StringUtils.containsNone("abz", 'x', 'y', 'z')  = false
      * </pre>
      *
-     * @param cs          the CharSequence to check, may be null.
-     * @param searchChars an array of invalid chars, may be null.
-     * @return true if it contains none of the invalid chars, or is null.
+     * @param cs          the CharSequence to check, may be null
+     * @param searchChars an array of invalid chars, may be null
+     * @return true if it contains none of the invalid chars, or is null
      * @since 2.0
      * @since 3.0 Changed signature from containsNone(String, char[]) to containsNone(CharSequence, char...)
      */
@@ -1260,9 +1260,9 @@ public static boolean containsNone(final CharSequence cs, final char... searchCh
      * StringUtils.containsNone("abz", "xyz")  = false
      * </pre>
      *
-     * @param cs           the CharSequence to check, may be null.
-     * @param invalidChars a String of invalid chars, may be null.
-     * @return true if it contains none of the invalid chars, or is null.
+     * @param cs           the CharSequence to check, may be null
+     * @param invalidChars a String of invalid chars, may be null
+     * @return true if it contains none of the invalid chars, or is null
      * @since 2.0
      * @since 3.0 Changed signature from containsNone(String, String) to containsNone(CharSequence, String)
      */
@@ -1291,9 +1291,9 @@ public static boolean containsNone(final CharSequence cs, final String invalidCh
      * StringUtils.containsOnly("abz", 'a', 'b', 'c')  = false
      * </pre>
      *
-     * @param cs    the String to check, may be null.
-     * @param valid an array of valid chars, may be null.
-     * @return true if it only contains valid chars and is non-null.
+     * @param cs    the String to check, may be null
+     * @param valid an array of valid chars, may be null
+     * @return true if it only contains valid chars and is non-null
      * @since 3.0 Changed signature from containsOnly(String, char[]) to containsOnly(CharSequence, char...)
      */
     public static boolean containsOnly(final CharSequence cs, final char... valid) {
@@ -1328,9 +1328,9 @@ public static boolean containsOnly(final CharSequence cs, final char... valid) {
      * StringUtils.containsOnly("abz", "abc")  = false
      * </pre>
      *
-     * @param cs         the CharSequence to check, may be null.
-     * @param validChars a String of valid chars, may be null.
-     * @return true if it only contains valid chars and is non-null.
+     * @param cs         the CharSequence to check, may be null
+     * @param validChars a String of valid chars, may be null
+     * @return true if it only contains valid chars and is non-null
      * @since 2.0
      * @since 3.0 Changed signature from containsOnly(String, String) to containsOnly(CharSequence, String)
      */
@@ -1357,8 +1357,8 @@ public static boolean containsOnly(final CharSequence cs, final String validChar
      * StringUtils.containsWhitespace("ab ")      = true
      * </pre>
      *
-     * @param seq the CharSequence to check (may be {@code null}).
-     * @return {@code true} if the CharSequence is not empty and contains at least 1 (breaking) whitespace character.
+     * @param seq the CharSequence to check (may be {@code null})
+     * @return {@code true} if the CharSequence is not empty and contains at least 1 (breaking) whitespace character
      * @since 3.0
      */
     public static boolean containsWhitespace(final CharSequence seq) {
@@ -1457,9 +1457,9 @@ private static void convertRemainingAccentCharacters(final StringBuilder decompo
      * StringUtils.countMatches("abba", 'x') = 0
      * </pre>
      *
-     * @param str the CharSequence to check, may be null.
-     * @param ch  the char to count.
-     * @return the number of occurrences, 0 if the CharSequence is {@code null}.
+     * @param str the CharSequence to check, may be null
+     * @param ch  the char to count
+     * @return the number of occurrences, 0 if the CharSequence is {@code null}
      * @since 3.4
      */
     public static int countMatches(final CharSequence str, final char ch) {
@@ -1494,9 +1494,9 @@ public static int countMatches(final CharSequence str, final char ch) {
      * StringUtils.countMatches("ababa", "aba") = 1
      * </pre>
      *
-     * @param str the CharSequence to check, may be null.
-     * @param sub the substring to count, may be null.
-     * @return the number of occurrences, 0 if either CharSequence is {@code null}.
+     * @param str the CharSequence to check, may be null
+     * @param sub the substring to count, may be null
+     * @return the number of occurrences, 0 if either CharSequence is {@code null}
      * @since 3.0 Changed signature from countMatches(String, String) to countMatches(CharSequence, CharSequence)
      */
     public static int countMatches(final CharSequence str, final CharSequence sub) {
@@ -1528,11 +1528,11 @@ public static int countMatches(final CharSequence str, final CharSequence sub) {
      * StringUtils.defaultIfBlank("", null)      = null
      * </pre>
      *
-     * @param <T>        the specific kind of CharSequence.
-     * @param str        the CharSequence to check, may be null.
+     * @param <T>        the specific kind of CharSequence
+     * @param str        the CharSequence to check, may be null
      * @param defaultStr the default CharSequence to return if {@code str} is {@link #isBlank(CharSequence) blank} (whitespaces, empty ({@code ""}), or
-     *                   {@code null}); may be null.
-     * @return the passed in CharSequence, or the default.
+     *                   {@code null}); may be null
+     * @return the passed in CharSequence, or the default
      * @see StringUtils#defaultString(String, String)
      * @see #isBlank(CharSequence)
      */
@@ -1551,10 +1551,10 @@ public static <T extends CharSequence> T defaultIfBlank(final T str, final T def
      * StringUtils.defaultIfEmpty("", null)      = null
      * </pre>
      *
-     * @param <T>        the specific kind of CharSequence.
-     * @param str        the CharSequence to check, may be null.
-     * @param defaultStr the default CharSequence to return if the input is empty ("") or {@code null}, may be null.
-     * @return the passed in CharSequence, or the default.
+     * @param <T>        the specific kind of CharSequence
+     * @param str        the CharSequence to check, may be null
+     * @param defaultStr the default CharSequence to return if the input is empty ("") or {@code null}, may be null
+     * @return the passed in CharSequence, or the default
      * @see StringUtils#defaultString(String, String)
      */
     public static <T extends CharSequence> T defaultIfEmpty(final T str, final T defaultStr) {
@@ -1570,8 +1570,8 @@ public static <T extends CharSequence> T defaultIfEmpty(final T str, final T def
      * StringUtils.defaultString("bat") = "bat"
      * </pre>
      *
-     * @param str the String to check, may be null.
-     * @return the passed in String, or the empty String if it was {@code null}.
+     * @param str the String to check, may be null
+     * @return the passed in String, or the empty String if it was {@code null}
      * @see Objects#toString(Object, String)
      * @see String#valueOf(Object)
      */
@@ -1597,9 +1597,9 @@ public static String defaultString(final String str) {
      * Objects.toString("bat", "NULL") = "bat"
      * </pre>
      *
-     * @param str         the String to check, may be null.
-     * @param nullDefault the default String to return if the input is {@code null}, may be null.
-     * @return the passed in String, or the default if it was {@code null}.
+     * @param str         the String to check, may be null
+     * @param nullDefault the default String to return if the input is {@code null}, may be null
+     * @return the passed in String, or the default if it was {@code null}
      * @see Objects#toString(Object, String)
      * @see String#valueOf(Object)
      * @deprecated Use {@link Objects#toString(Object, String)}.
@@ -1619,8 +1619,8 @@ public static String defaultString(final String str, final String nullDefault) {
      * StringUtils.deleteWhitespace("   ab  c  ") = "abc"
      * </pre>
      *
-     * @param str the String to delete whitespace from, may be null.
-     * @return the String without whitespaces, {@code null} if null String input.
+     * @param str the String to delete whitespace from, may be null
+     * @return the String without whitespaces, {@code null} if null String input
      */
     public static String deleteWhitespace(final String str) {
         if (isEmpty(str)) {
@@ -1663,9 +1663,9 @@ public static String deleteWhitespace(final String str) {
      * StringUtils.difference("abcde", "xyz")   = "xyz"
      * </pre>
      *
-     * @param str1 the first String, may be null.
-     * @param str2 the second String, may be null.
-     * @return the portion of str2 where it differs from str1; returns the empty String if they are equal.
+     * @param str1 the first String, may be null
+     * @param str2 the second String, may be null
+     * @return the portion of str2 where it differs from str1; returns the empty String if they are equal
      * @see #indexOfDifference(CharSequence,CharSequence)
      * @since 2.0
      */
@@ -1700,9 +1700,9 @@ public static String difference(final String str1, final String str2) {
      * StringUtils.endsWith("ABCDEF", "")    = true
      * </pre>
      *
-     * @param str    the CharSequence to check, may be null.
-     * @param suffix the suffix to find, may be null.
-     * @return {@code true} if the CharSequence ends with the suffix, case-sensitive, or both {@code null}.
+     * @param str    the CharSequence to check, may be null
+     * @param suffix the suffix to find, may be null
+     * @return {@code true} if the CharSequence ends with the suffix, case-sensitive, or both {@code null}
      * @see String#endsWith(String)
      * @since 2.4
      * @since 3.0 Changed signature from endsWith(String, String) to endsWith(CharSequence, CharSequence)
@@ -1727,10 +1727,10 @@ public static boolean endsWith(final CharSequence str, final CharSequence suffix
      * StringUtils.endsWithAny("abcXYZ", "def", "xyz")      = false
      * </pre>
      *
-     * @param sequence      the CharSequence to check, may be null.
-     * @param searchStrings the case-sensitive CharSequences to find, may be empty or contain {@code null}.
+     * @param sequence      the CharSequence to check, may be null
+     * @param searchStrings the case-sensitive CharSequences to find, may be empty or contain {@code null}
      * @return {@code true} if the input {@code sequence} is {@code null} AND no {@code searchStrings} are provided, or the input {@code sequence} ends in any
-     *         of the provided case-sensitive {@code searchStrings}.
+     *         of the provided case-sensitive {@code searchStrings}
      * @see StringUtils#endsWith(CharSequence, CharSequence)
      * @since 3.0
      * @deprecated Use {@link Strings#endsWithAny(CharSequence, CharSequence...) Strings.CS.endsWithAny(CharSequence, CharSequence...)}.
@@ -1784,12 +1784,12 @@ public static boolean endsWithIgnoreCase(final CharSequence str, final CharSeque
      * StringUtils.equals("abc", "ABC") = false
      * </pre>
      *
-     * @param cs1 the first CharSequence, may be {@code null}.
-     * @param cs2 the second CharSequence, may be {@code null}.
-     * @return {@code true} if the CharSequences are equal (case-sensitive), or both {@code null}.
-     * @since 3.0 Changed signature from equals(String, String) to equals(CharSequence, CharSequence)
+     * @param cs1 the first CharSequence, may be {@code null}
+     * @param cs2 the second CharSequence, may be {@code null}
+     * @return {@code true} if the CharSequences are equal (case-sensitive), or both {@code null}
      * @see Object#equals(Object)
      * @see #equalsIgnoreCase(CharSequence, CharSequence)
+     * @since 3.0 Changed signature from equals(String, String) to equals(CharSequence, CharSequence)
      * @deprecated Use {@link Strings#equals(CharSequence, CharSequence) Strings.CS.equals(CharSequence, CharSequence)}.
      */
     @Deprecated
@@ -1810,10 +1810,10 @@ public static boolean equals(final CharSequence cs1, final CharSequence cs2) {
      * StringUtils.equalsAny("abc", "ABC", "DEF") = false
      * </pre>
      *
-     * @param string        to compare, may be {@code null}.
-     * @param searchStrings a vararg of strings, may be {@code null}.
+     * @param string        to compare, may be {@code null}
+     * @param searchStrings a vararg of strings, may be {@code null}
      * @return {@code true} if the string is equal (case-sensitive) to any other element of {@code searchStrings}; {@code false} if {@code searchStrings} is
-     *         null or contains no matches.
+     *         null or contains no matches
      * @since 3.5
      * @deprecated Use {@link Strings#equalsAny(CharSequence, CharSequence...) Strings.CS.equalsAny(CharSequence, CharSequence...)}.
      */
@@ -1835,10 +1835,10 @@ public static boolean equalsAny(final CharSequence string, final CharSequence...
      * StringUtils.equalsAnyIgnoreCase("abc", "ABC", "DEF") = true
      * </pre>
      *
-     * @param string to compare, may be {@code null}.
-     * @param searchStrings a vararg of strings, may be {@code null}.
+     * @param string to compare, may be {@code null}
+     * @param searchStrings a vararg of strings, may be {@code null}
      * @return {@code true} if the string is equal (case-insensitive) to any other element of {@code searchStrings};
-     * {@code false} if {@code searchStrings} is null or contains no matches.
+     * {@code false} if {@code searchStrings} is null or contains no matches
      * @since 3.5
      * @deprecated Use {@link Strings#equalsAny(CharSequence, CharSequence...) Strings.CI.equalsAny(CharSequence, CharSequence...)}.
      */
@@ -1862,11 +1862,11 @@ public static boolean equalsAnyIgnoreCase(final CharSequence string, final CharS
      * StringUtils.equalsIgnoreCase("abc", "ABC") = true
      * </pre>
      *
-     * @param cs1 the first CharSequence, may be {@code null}.
-     * @param cs2 the second CharSequence, may be {@code null}.
-     * @return {@code true} if the CharSequences are equal (case-insensitive), or both {@code null}.
-     * @since 3.0 Changed signature from equalsIgnoreCase(String, String) to equalsIgnoreCase(CharSequence, CharSequence)
+     * @param cs1 the first CharSequence, may be {@code null}
+     * @param cs2 the second CharSequence, may be {@code null}
+     * @return {@code true} if the CharSequences are equal (case-insensitive), or both {@code null}
      * @see #equals(CharSequence, CharSequence)
+     * @since 3.0 Changed signature from equalsIgnoreCase(String, String) to equalsIgnoreCase(CharSequence, CharSequence)
      * @deprecated Use {@link Strings#equals(CharSequence, CharSequence) Strings.CI.equals(CharSequence, CharSequence)}.
      */
     @Deprecated
@@ -1895,9 +1895,9 @@ public static boolean equalsIgnoreCase(final CharSequence cs1, final CharSequenc
      * StringUtils.firstNonBlank()                     = null
      * </pre>
      *
-     * @param <T>    the specific kind of CharSequence.
-     * @param values the values to test, may be {@code null} or empty.
-     * @return the first value from {@code values} which is not blank, or {@code null} if there are no non-blank values.
+     * @param <T>    the specific kind of CharSequence
+     * @param values the values to test, may be {@code null} or empty
+     * @return the first value from {@code values} which is not blank, or {@code null} if there are no non-blank values
      * @since 3.8
      */
     @SafeVarargs
@@ -1930,9 +1930,9 @@ public static <T extends CharSequence> T firstNonBlank(final T... values) {
      * StringUtils.firstNonEmpty()                   = null
      * </pre>
      *
-     * @param <T>    the specific kind of CharSequence.
-     * @param values the values to test, may be {@code null} or empty.
-     * @return the first value from {@code values} which is not empty, or {@code null} if there are no non-empty values.
+     * @param <T>    the specific kind of CharSequence
+     * @param values the values to test, may be {@code null} or empty
+     * @return the first value from {@code values} which is not empty, or {@code null} if there are no non-empty values
      * @since 3.8
      */
     @SafeVarargs
@@ -1950,9 +1950,9 @@ public static <T extends CharSequence> T firstNonEmpty(final T... values) {
     /**
      * Calls {@link String#getBytes(Charset)} in a null-safe manner.
      *
-     * @param string input string.
-     * @param charset The {@link Charset} to encode the {@link String}. If null, then use the default Charset.
-     * @return The empty byte[] if {@code string} is null, the result of {@link String#getBytes(Charset)} otherwise.
+     * @param string input string
+     * @param charset the {@link Charset} to encode the {@link String}. If null, then use the default Charset.
+     * @return the empty byte[] if {@code string} is null, the result of {@link String#getBytes(Charset)} otherwise
      * @see String#getBytes(Charset)
      * @since 3.10
      */
@@ -1963,10 +1963,10 @@ public static byte[] getBytes(final String string, final Charset charset) {
     /**
      * Calls {@link String#getBytes(String)} in a null-safe manner.
      *
-     * @param string input string.
-     * @param charset The {@link Charset} name to encode the {@link String}. If null, then use the default Charset.
-     * @return The empty byte[] if {@code string} is null, the result of {@link String#getBytes(String)} otherwise.
-     * @throws UnsupportedEncodingException Thrown when the named charset is not supported.
+     * @param string input string
+     * @param charset the {@link Charset} name to encode the {@link String}. If null, then use the default Charset.
+     * @return the empty byte[] if {@code string} is null, the result of {@link String#getBytes(String)} otherwise
+     * @throws UnsupportedEncodingException thrown when the named charset is not supported
      * @see String#getBytes(String)
      * @since 3.10
      */
@@ -2001,9 +2001,9 @@ public static byte[] getBytes(final String string, final String charset) throws
      * StringUtils.getCommonPrefix(new String[] {"i am a machine", "i am a robot"}) = "i am a "
      * </pre>
      *
-     * @param strs array of String objects, entries may be null.
+     * @param strs array of String objects, entries may be null
      * @return the initial sequence of characters that are common to all Strings in the array; empty String if the array is null, the elements are all null or
-     *         if there is no common prefix.
+     *         if there is no common prefix
      * @since 2.4
      */
     public static String getCommonPrefix(final String... strs) {
@@ -2043,8 +2043,8 @@ public static String getCommonPrefix(final String... strs) {
      * StringUtils.getDigits("\u0967\u0968\u0969") = "\u0967\u0968\u0969"
      * </pre>
      *
-     * @param str the String to extract digits from, may be null.
-     * @return String with only digits, or an empty ("") String if no digits found, or {@code null} String if {@code str} is null.
+     * @param str the String to extract digits from, may be null
+     * @return string with only digits, or an empty ("") String if no digits found, or {@code null} String if {@code str} is null
      * @since 3.6
      */
     public static String getDigits(final String str) {
@@ -2083,11 +2083,11 @@ public static String getDigits(final String str) {
      * StringUtils.getFuzzyDistance("Apache Software Foundation", "asf", Locale.ENGLISH) = 3
      * </pre>
      *
-     * @param term   a full term that should be matched against, must not be null.
-     * @param query  the query that will be matched against a term, must not be null.
-     * @param locale This string matching logic is case-insensitive. A locale is necessary to normalize both Strings to lower case.
-     * @return result score.
-     * @throws IllegalArgumentException if either String input {@code null} or Locale input {@code null}.
+     * @param term   a full term that should be matched against, must not be null
+     * @param query  the query that will be matched against a term, must not be null
+     * @param locale this string matching logic is case-insensitive. A locale is necessary to normalize both Strings to lower case.
+     * @return result score
+     * @throws IllegalArgumentException if either String input {@code null} or Locale input {@code null}
      * @since 3.4
      * @deprecated As of 3.6, use Apache Commons Text
      *             <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/FuzzyScore.html">
@@ -2159,10 +2159,10 @@ public static int getFuzzyDistance(final CharSequence term, final CharSequence q
      * StringUtils.getIfBlank("", null)             = null
      * }</pre>
      *
-     * @param <T>             the specific kind of CharSequence.
-     * @param str             the CharSequence to check, may be null.
+     * @param <T>             the specific kind of CharSequence
+     * @param str             the CharSequence to check, may be null
      * @param defaultSupplier the supplier of default CharSequence to return if the input is {@link #isBlank(CharSequence) blank} (whitespaces, empty
-     *                        ({@code ""}), or {@code null}); may be null.
+     *                        ({@code ""}), or {@code null}); may be null
      * @return the passed in CharSequence, or the default
      * @see StringUtils#defaultString(String, String)
      * @see #isBlank(CharSequence)
@@ -2190,10 +2190,10 @@ public static <T extends CharSequence> T getIfBlank(final T str, final Supplier<
      * }
      * </pre>
      *
-     * @param <T>             the specific kind of CharSequence.
-     * @param str             the CharSequence to check, may be null.
-     * @param defaultSupplier the supplier of default CharSequence to return if the input is empty ("") or {@code null}, may be null.
-     * @return the passed in CharSequence, or the default.
+     * @param <T>             the specific kind of CharSequence
+     * @param str             the CharSequence to check, may be null
+     * @param defaultSupplier the supplier of default CharSequence to return if the input is empty ("") or {@code null}, may be null
+     * @return the passed in CharSequence, or the default
      * @see StringUtils#defaultString(String, String)
      * @since 3.10
      */
@@ -2231,10 +2231,10 @@ public static <T extends CharSequence> T getIfEmpty(final T str, final Supplier<
      * StringUtils.getJaroWinklerDistance("PENNSYLVANIA", "PENNCISYLVNIA") = 0.88
      * </pre>
      *
-     * @param first  the first String, must not be null.
-     * @param second the second String, must not be null.
-     * @return result distance.
-     * @throws IllegalArgumentException if either String input {@code null}.
+     * @param first  the first String, must not be null
+     * @param second the second String, must not be null
+     * @return result distance
+     * @throws IllegalArgumentException if either String input {@code null}
      * @since 3.3
      * @deprecated As of 3.6, use Apache Commons Text
      *             <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/JaroWinklerDistance.html">
@@ -2286,10 +2286,10 @@ public static double getJaroWinklerDistance(final CharSequence first, final Char
      * StringUtils.getLevenshteinDistance("hello", "hallo")    = 1
      * </pre>
      *
-     * @param s the first String, must not be null.
-     * @param t the second String, must not be null.
-     * @return result distance.
-     * @throws IllegalArgumentException if either String input {@code null}.
+     * @param s the first String, must not be null
+     * @param t the second String, must not be null
+     * @return result distance
+     * @throws IllegalArgumentException if either String input {@code null}
      * @since 3.0 Changed signature from getLevenshteinDistance(String, String) to getLevenshteinDistance(CharSequence, CharSequence)
      * @deprecated As of 3.6, use Apache Commons Text
      *             <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/LevenshteinDistance.html">
@@ -2378,11 +2378,11 @@ public static int getLevenshteinDistance(CharSequence s, CharSequence t) {
      * StringUtils.getLevenshteinDistance("hippo", "elephant", 6) = -1
      * </pre>
      *
-     * @param s         the first String, must not be null.
-     * @param t         the second String, must not be null.
-     * @param threshold the target threshold, must not be negative.
-     * @return result distance, or {@code -1} if the distance would be greater than the threshold.
-     * @throws IllegalArgumentException if either String input {@code null} or negative threshold.
+     * @param s         the first String, must not be null
+     * @param t         the second String, must not be null
+     * @param threshold the target threshold, must not be negative
+     * @return result distance, or {@code -1} if the distance would be greater than the threshold
+     * @throws IllegalArgumentException if either String input {@code null} or negative threshold
      * @deprecated As of 3.6, use Apache Commons Text
      *             <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/LevenshteinDistance.html">
      *             LevenshteinDistance</a> instead.
@@ -2540,9 +2540,9 @@ distance is O(nm), but a bound of k allows us to reduce it to O(km) time by only
      * StringUtils.indexOf("aabaabaa", "")   = 0
      * </pre>
      *
-     * @param seq       the CharSequence to check, may be null.
-     * @param searchSeq the CharSequence to find, may be null.
-     * @return the first index of the search CharSequence, -1 if no match or {@code null} string input.
+     * @param seq       the CharSequence to check, may be null
+     * @param searchSeq the CharSequence to find, may be null
+     * @return the first index of the search CharSequence, -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from indexOf(String, String) to indexOf(CharSequence, CharSequence)
      * @deprecated Use {@link Strings#indexOf(CharSequence, CharSequence) Strings.CS.indexOf(CharSequence, CharSequence)}.
@@ -2575,10 +2575,10 @@ public static int indexOf(final CharSequence seq, final CharSequence searchSeq)
      * StringUtils.indexOf("abc", "", 9)        = 3
      * </pre>
      *
-     * @param seq       the CharSequence to check, may be null.
-     * @param searchSeq the CharSequence to find, may be null.
-     * @param startPos  the start position, negative treated as zero.
-     * @return the first index of the search CharSequence (always &ge; startPos), -1 if no match or {@code null} string input.
+     * @param seq       the CharSequence to check, may be null
+     * @param searchSeq the CharSequence to find, may be null
+     * @param startPos  the start position, negative treated as zero
+     * @return the first index of the search CharSequence (always &ge; startPos), -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from indexOf(String, String, int) to indexOf(CharSequence, CharSequence, int)
      * @deprecated Use {@link Strings#indexOf(CharSequence, CharSequence, int) Strings.CS.indexOf(CharSequence, CharSequence, int)}.
@@ -2621,9 +2621,9 @@ public static int indexOf(final CharSequence seq, final CharSequence searchSeq,
      * StringUtils.indexOf("aaaaaaaa", 'Z') = -1
      * </pre>
      *
-     * @param seq        the CharSequence to check, may be null.
-     * @param searchChar the character to find.
-     * @return the first index of the search character, -1 if no match or {@code null} string input.
+     * @param seq        the CharSequence to check, may be null
+     * @param searchChar the character to find
+     * @return the first index of the search character, -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from indexOf(String, int) to indexOf(CharSequence, int)
      * @since 3.6 Updated {@link CharSequenceUtils} call to behave more like {@link String}
@@ -2677,10 +2677,10 @@ public static int indexOf(final CharSequence seq, final int searchChar) {
      * StringUtils.indexOf("aabaabaa", 'b', -1) = 2
      * </pre>
      *
-     * @param seq        the CharSequence to check, may be null.
-     * @param searchChar the character to find.
-     * @param startPos   the start position, negative treated as zero.
-     * @return the first index of the search character (always &ge; startPos), -1 if no match or {@code null} string input.
+     * @param seq        the CharSequence to check, may be null
+     * @param searchChar the character to find
+     * @param startPos   the start position, negative treated as zero
+     * @return the first index of the search character (always &ge; startPos), -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from indexOf(String, int, int) to indexOf(CharSequence, int, int)
      * @since 3.6 Updated {@link CharSequenceUtils} call to behave more like {@link String}
@@ -2709,9 +2709,9 @@ public static int indexOf(final CharSequence seq, final int searchChar, final in
      * StringUtils.indexOfAny("aba", 'z')               = -1
      * </pre>
      *
-     * @param cs          the CharSequence to check, may be null.
-     * @param searchChars the chars to search for, may be null.
-     * @return the index of any of the chars, -1 if no match or null input.
+     * @param cs          the CharSequence to check, may be null
+     * @param searchChars the chars to search for, may be null
+     * @return the index of any of the chars, -1 if no match or null input
      * @since 2.0
      * @since 3.0 Changed signature from indexOfAny(String, char[]) to indexOfAny(CharSequence, char...)
      */
@@ -2741,9 +2741,9 @@ public static int indexOfAny(final CharSequence cs, final char... searchChars) {
      * StringUtils.indexOfAny("", "a")                    = -1
      * </pre>
      *
-     * @param str        the CharSequence to check, may be null.
-     * @param searchStrs the CharSequences to search for, may be null.
-     * @return the first index of any of the searchStrs in str, -1 if no match.
+     * @param str        the CharSequence to check, may be null
+     * @param searchStrs the CharSequences to search for, may be null
+     * @return the first index of any of the searchStrs in str, -1 if no match
      * @since 3.0 Changed signature from indexOfAny(String, String[]) to indexOfAny(CharSequence, CharSequence...)
      */
     public static int indexOfAny(final CharSequence str, final CharSequence... searchStrs) {
@@ -2787,10 +2787,10 @@ public static int indexOfAny(final CharSequence str, final CharSequence... searc
      * StringUtils.indexOfAny("aba", 0, ['z'])             = -1
      * </pre>
      *
-     * @param cs          the CharSequence to check, may be null.
-     * @param csStart Start searching the input {@code cs} at this index.
-     * @param searchChars the chars to search for, may be null.
-     * @return the index of any of the chars, -1 if no match or null input.
+     * @param cs          the CharSequence to check, may be null
+     * @param csStart start searching the input {@code cs} at this index
+     * @param searchChars the chars to search for, may be null
+     * @return the index of any of the chars, -1 if no match or null input
      * @since 2.0
      * @since 3.0 Changed signature from indexOfAny(String, char[]) to indexOfAny(CharSequence, char...)
      */
@@ -2833,9 +2833,9 @@ public static int indexOfAny(final CharSequence cs, final int csStart, final cha
      * StringUtils.indexOfAny("aba", "z")         = -1
      * </pre>
      *
-     * @param cs          the CharSequence to check, may be null.
-     * @param searchChars the chars to search for, may be null.
-     * @return the index of any of the chars, -1 if no match or null input.
+     * @param cs          the CharSequence to check, may be null
+     * @param searchChars the chars to search for, may be null
+     * @return the index of any of the chars, -1 if no match or null input
      * @since 2.0
      * @since 3.0 Changed signature from indexOfAny(String, String) to indexOfAny(CharSequence, String)
      */
@@ -2864,9 +2864,9 @@ public static int indexOfAny(final CharSequence cs, final String searchChars) {
      * StringUtils.indexOfAnyBut("aba", new char[] {'a', 'b'} )        = -1
      * </pre>
      *
-     * @param cs          the CharSequence to check, may be null.
-     * @param searchChars the chars to search for, may be null.
-     * @return the index of any of the chars, -1 if no match or null input.
+     * @param cs          the CharSequence to check, may be null
+     * @param searchChars the chars to search for, may be null
+     * @return the index of any of the chars, -1 if no match or null input
      * @since 2.0
      * @since 3.0 Changed signature from indexOfAnyBut(String, char[]) to indexOfAnyBut(CharSequence, char...)
      */
@@ -2895,9 +2895,9 @@ public static int indexOfAnyBut(final CharSequence cs, final char... searchChars
      * StringUtils.indexOfAnyBut("aba", "ab")        = -1
      * </pre>
      *
-     * @param seq         the CharSequence to check, may be null.
-     * @param searchChars the chars to search for, may be null.
-     * @return the index of any of the chars, -1 if no match or null input.
+     * @param seq         the CharSequence to check, may be null
+     * @param searchChars the chars to search for, may be null
+     * @return the index of any of the chars, -1 if no match or null input
      * @since 2.0
      * @since 3.0 Changed signature from indexOfAnyBut(String, String) to indexOfAnyBut(CharSequence, CharSequence)
      */
@@ -2945,8 +2945,8 @@ public static int indexOfAnyBut(final CharSequence seq, final CharSequence searc
      * StringUtils.indexOfDifference(new String[] {"i am a machine", "i am a robot"}) = 7
      * </pre>
      *
-     * @param css array of CharSequences, entries may be null.
-     * @return the index where the strings begin to differ; -1 if they are all equal.
+     * @param css array of CharSequences, entries may be null
+     * @return the index where the strings begin to differ; -1 if they are all equal
      * @since 2.4
      * @since 3.0 Changed signature from indexOfDifference(String...) to indexOfDifference(CharSequence...)
      */
@@ -3021,9 +3021,9 @@ public static int indexOfDifference(final CharSequence... css) {
      * StringUtils.indexOfDifference("abcde", "xyz")   = 0
      * </pre>
      *
-     * @param cs1 the first CharSequence, may be null.
-     * @param cs2 the second CharSequence, may be null.
-     * @return the index where cs1 and cs2 begin to differ; -1 if they are equal.
+     * @param cs1 the first CharSequence, may be null
+     * @param cs2 the second CharSequence, may be null
+     * @return the index where cs1 and cs2 begin to differ; -1 if they are equal
      * @since 2.0
      * @since 3.0 Changed signature from indexOfDifference(String, String) to indexOfDifference(CharSequence, CharSequence)
      */
@@ -3064,9 +3064,9 @@ public static int indexOfDifference(final CharSequence cs1, final CharSequence c
      * StringUtils.indexOfIgnoreCase("aabaabaa", "ab") = 1
      * </pre>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @return the first index of the search CharSequence, -1 if no match or {@code null} string input.
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @return the first index of the search CharSequence, -1 if no match or {@code null} string input
      * @since 2.5
      * @since 3.0 Changed signature from indexOfIgnoreCase(String, String) to indexOfIgnoreCase(CharSequence, CharSequence)
      * @deprecated Use {@link Strings#indexOf(CharSequence, CharSequence) Strings.CI.indexOf(CharSequence, CharSequence)}.
@@ -3098,10 +3098,10 @@ public static int indexOfIgnoreCase(final CharSequence str, final CharSequence s
      * StringUtils.indexOfIgnoreCase("abc", "", 9)        = -1
      * </pre>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @param startPos  the start position, negative treated as zero.
-     * @return the first index of the search CharSequence (always &ge; startPos), -1 if no match or {@code null} string input.
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @param startPos  the start position, negative treated as zero
+     * @return the first index of the search CharSequence (always &ge; startPos), -1 if no match or {@code null} string input
      * @since 2.5
      * @since 3.0 Changed signature from indexOfIgnoreCase(String, String, int) to indexOfIgnoreCase(CharSequence, CharSequence, int)
      * @deprecated Use {@link Strings#indexOf(CharSequence, CharSequence, int) Strings.CI.indexOf(CharSequence, CharSequence, int)}.
@@ -3130,8 +3130,8 @@ public static int indexOfIgnoreCase(final CharSequence str, final CharSequence s
      * StringUtils.isAllBlank(new String[] {})  = true
      * </pre>
      *
-     * @param css the CharSequences to check, may be null or empty.
-     * @return {@code true} if all of the CharSequences are empty or null or whitespace only.
+     * @param css the CharSequences to check, may be null or empty
+     * @return {@code true} if all of the CharSequences are empty or null or whitespace only
      * @since 3.6
      */
     public static boolean isAllBlank(final CharSequence... css) {
@@ -3161,8 +3161,8 @@ public static boolean isAllBlank(final CharSequence... css) {
      * StringUtils.isAllEmpty("foo", "bar")     = false
      * </pre>
      *
-     * @param css the CharSequences to check, may be null or empty.
-     * @return {@code true} if all of the CharSequences are empty or null.
+     * @param css the CharSequences to check, may be null or empty
+     * @return {@code true} if all of the CharSequences are empty or null
      * @since 3.6
      */
     public static boolean isAllEmpty(final CharSequence... css) {
@@ -3195,8 +3195,8 @@ public static boolean isAllEmpty(final CharSequence... css) {
      * StringUtils.isAllLowerCase("ab/c") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains lowercase characters, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains lowercase characters, and is non-null
      * @since 2.5
      * @since 3.0 Changed signature from isAllLowerCase(String) to isAllLowerCase(CharSequence)
      */
@@ -3230,8 +3230,8 @@ public static boolean isAllLowerCase(final CharSequence cs) {
      * StringUtils.isAllUpperCase("A/C")  = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains uppercase characters, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains uppercase characters, and is non-null
      * @since 2.5
      * @since 3.0 Changed signature from isAllUpperCase(String) to isAllUpperCase(CharSequence)
      */
@@ -3264,8 +3264,8 @@ public static boolean isAllUpperCase(final CharSequence cs) {
      * StringUtils.isAlpha("ab-c") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains letters, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains letters, and is non-null
      * @since 3.0 Changed signature from isAlpha(String) to isAlpha(CharSequence)
      * @since 3.0 Changed "" to return false and not true
      */
@@ -3299,8 +3299,8 @@ public static boolean isAlpha(final CharSequence cs) {
      * StringUtils.isAlphanumeric("ab-c") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains letters or digits, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains letters or digits, and is non-null
      * @since 3.0 Changed signature from isAlphanumeric(String) to isAlphanumeric(CharSequence)
      * @since 3.0 Changed "" to return false and not true
      */
@@ -3334,8 +3334,8 @@ public static boolean isAlphanumeric(final CharSequence cs) {
      * StringUtils.isAlphanumericSpace("ab-c") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains letters, digits or space, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains letters, digits or space, and is non-null
      * @since 3.0 Changed signature from isAlphanumericSpace(String) to isAlphanumericSpace(CharSequence)
      */
     public static boolean isAlphanumericSpace(final CharSequence cs) {
@@ -3369,8 +3369,8 @@ public static boolean isAlphanumericSpace(final CharSequence cs) {
      * StringUtils.isAlphaSpace("ab-c") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains letters and space, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains letters and space, and is non-null
      * @since 3.0 Changed signature from isAlphaSpace(String) to isAlphaSpace(CharSequence)
      */
     public static boolean isAlphaSpace(final CharSequence cs) {
@@ -3408,8 +3408,8 @@ public static boolean isAlphaSpace(final CharSequence cs) {
      * StringUtils.isAnyBlank("foo", "bar")     = false
      * </pre>
      *
-     * @param css the CharSequences to check, may be null or empty.
-     * @return {@code true} if any of the CharSequences are {@link #isBlank(CharSequence) blank} (whitespaces, empty ({@code ""}), or {@code null}).
+     * @param css the CharSequences to check, may be null or empty
+     * @return {@code true} if any of the CharSequences are {@link #isBlank(CharSequence) blank} (whitespaces, empty ({@code ""}), or {@code null})
      * @see #isBlank(CharSequence)
      * @since 3.2
      */
@@ -3441,8 +3441,8 @@ public static boolean isAnyBlank(final CharSequence... css) {
      * StringUtils.isAnyEmpty(new String[]{""}) = true
      * </pre>
      *
-     * @param css  the CharSequences to check, may be null or empty.
-     * @return {@code true} if any of the CharSequences are empty or null.
+     * @param css  the CharSequences to check, may be null or empty
+     * @return {@code true} if any of the CharSequences are empty or null
      * @since 3.2
      */
     public static boolean isAnyEmpty(final CharSequence... css) {
@@ -3478,8 +3478,8 @@ public static boolean isAnyEmpty(final CharSequence... css) {
      * StringUtils.isAsciiPrintable("Ceki G\u00fclc\u00fc") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if every character is in the range 32 through 126.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if every character is in the range 32 through 126
      * @since 2.1
      * @since 3.0 Changed signature from isAsciiPrintable(String) to isAsciiPrintable(CharSequence)
      */
@@ -3507,8 +3507,8 @@ public static boolean isAsciiPrintable(final CharSequence cs) {
      * StringUtils.isBlank("  bob  ") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if the CharSequence is null, empty or whitespace only.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if the CharSequence is null, empty or whitespace only
      * @since 2.0
      * @since 3.0 Changed signature from isBlank(String) to isBlank(CharSequence)
      */
@@ -3537,8 +3537,8 @@ public static boolean isBlank(final CharSequence cs) {
      * NOTE: This method changed in Lang version 2.0. It no longer trims the CharSequence. That functionality is available in isBlank().
      * </p>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if the CharSequence is empty or null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if the CharSequence is empty or null
      * @since 3.0 Changed signature from isEmpty(String) to isEmpty(CharSequence)
      */
     public static boolean isEmpty(final CharSequence cs) {
@@ -3565,8 +3565,8 @@ public static boolean isEmpty(final CharSequence cs) {
      * StringUtils.isMixedCase("aC\t")  = true
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if the CharSequence contains both uppercase and lowercase characters.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if the CharSequence contains both uppercase and lowercase characters
      * @since 3.5
      */
     public static boolean isMixedCase(final CharSequence cs) {
@@ -3611,8 +3611,8 @@ public static boolean isMixedCase(final CharSequence cs) {
      * StringUtils.isNoneBlank("foo", "bar")     = true
      * </pre>
      *
-     * @param css the CharSequences to check, may be null or empty.
-     * @return {@code true} if none of the CharSequences are empty or null or whitespace only.
+     * @param css the CharSequences to check, may be null or empty
+     * @return {@code true} if none of the CharSequences are empty or null or whitespace only
      * @since 3.2
      */
     public static boolean isNoneBlank(final CharSequence... css) {
@@ -3635,8 +3635,8 @@ public static boolean isNoneBlank(final CharSequence... css) {
      * StringUtils.isNoneEmpty("foo", "bar")     = true
      * </pre>
      *
-     * @param css  the CharSequences to check, may be null or empty.
-     * @return {@code true} if none of the CharSequences are empty or null.
+     * @param css  the CharSequences to check, may be null or empty
+     * @return {@code true} if none of the CharSequences are empty or null
      * @since 3.2
      */
     public static boolean isNoneEmpty(final CharSequence... css) {
@@ -3658,8 +3658,8 @@ public static boolean isNoneEmpty(final CharSequence... css) {
      * StringUtils.isNotBlank("  bob  ") = true
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if the CharSequence is not {@link #isBlank(CharSequence) blank} (whitespaces, empty ({@code ""}), or {@code null}).
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if the CharSequence is not {@link #isBlank(CharSequence) blank} (whitespaces, empty ({@code ""}), or {@code null})
      * @see #isBlank(CharSequence)
      * @since 2.0
      * @since 3.0 Changed signature from isNotBlank(String) to isNotBlank(CharSequence)
@@ -3679,8 +3679,8 @@ public static boolean isNotBlank(final CharSequence cs) {
      * StringUtils.isNotEmpty("  bob  ") = true
      * </pre>
      *
-     * @param cs  the CharSequence to check, may be null.
-     * @return {@code true} if the CharSequence is not empty and not null.
+     * @param cs  the CharSequence to check, may be null
+     * @return {@code true} if the CharSequence is not empty and not null
      * @since 3.0 Changed signature from isNotEmpty(String) to isNotEmpty(CharSequence)
      */
     public static boolean isNotEmpty(final CharSequence cs) {
@@ -3713,8 +3713,8 @@ public static boolean isNotEmpty(final CharSequence cs) {
      * StringUtils.isNumeric("+123") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains digits, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains digits, and is non-null
      * @since 3.0 Changed signature from isNumeric(String) to isNumeric(CharSequence)
      * @since 3.0 Changed "" to return false and not true
      */
@@ -3751,8 +3751,8 @@ public static boolean isNumeric(final CharSequence cs) {
      * StringUtils.isNumericSpace("12.3") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains digits or space, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains digits or space, and is non-null
      * @since 3.0 Changed signature from isNumericSpace(String) to isNumericSpace(CharSequence)
      */
     public static boolean isNumericSpace(final CharSequence cs) {
@@ -3789,8 +3789,8 @@ public static boolean isNumericSpace(final CharSequence cs) {
      * StringUtils.isWhitespace("ab-c") = false
      * </pre>
      *
-     * @param cs the CharSequence to check, may be null.
-     * @return {@code true} if only contains whitespace, and is non-null.
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if only contains whitespace, and is non-null
      * @since 2.0
      * @since 3.0 Changed signature from isWhitespace(String) to isWhitespace(CharSequence)
      */
@@ -3821,9 +3821,9 @@ public static boolean isWhitespace(final CharSequence cs) {
      * StringUtils.join([false, false], ';') = "false;false"
      * </pre>
      *
-     * @param array     the array of values to join together, may be null.
-     * @param delimiter the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     * @param array     the array of values to join together, may be null
+     * @param delimiter the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 3.12.0
      */
     public static String join(final boolean[] array, final char delimiter) {
@@ -3849,16 +3849,16 @@ public static String join(final boolean[] array, final char delimiter) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.12.0
      */
     public static String join(final boolean[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -3896,10 +3896,10 @@ public static String join(final boolean[] array, final char delimiter, final int
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     *            the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final byte[] array, final char delimiter) {
@@ -3926,16 +3926,16 @@ public static String join(final byte[] array, final char delimiter) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final byte[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -3973,10 +3973,10 @@ public static String join(final byte[] array, final char delimiter, final int st
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     *            the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final char[] array, final char delimiter) {
@@ -4003,16 +4003,16 @@ public static String join(final char[] array, final char delimiter) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final char[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -4050,10 +4050,10 @@ public static String join(final char[] array, final char delimiter, final int st
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     *            the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final double[] array, final char delimiter) {
@@ -4080,16 +4080,16 @@ public static String join(final double[] array, final char delimiter) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final double[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -4127,9 +4127,9 @@ public static String join(final double[] array, final char delimiter, final int
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
@@ -4157,16 +4157,16 @@ public static String join(final float[] array, final char delimiter) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final float[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -4204,10 +4204,10 @@ public static String join(final float[] array, final char delimiter, final int s
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param separator
-     *            the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     *            the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final int[] array, final char separator) {
@@ -4234,16 +4234,16 @@ public static String join(final int[] array, final char separator) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final int[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -4275,9 +4275,9 @@ public static String join(final int[] array, final char delimiter, final int sta
      * See the examples here: {@link #join(Object[],char)}.
      * </p>
      *
-     * @param iterable  the {@link Iterable} providing the values to join together, may be null.
-     * @param separator the separator character to use.
-     * @return the joined String, {@code null} if null iterator input.
+     * @param iterable  the {@link Iterable} providing the values to join together, may be null
+     * @param separator the separator character to use
+     * @return the joined String, {@code null} if null iterator input
      * @since 2.3
      */
     public static String join(final Iterable<?> iterable, final char separator) {
@@ -4295,9 +4295,9 @@ public static String join(final Iterable<?> iterable, final char separator) {
      * See the examples here: {@link #join(Object[],String)}.
      * </p>
      *
-     * @param iterable  the {@link Iterable} providing the values to join together, may be null.
-     * @param separator the separator character to use, null treated as "".
-     * @return the joined String, {@code null} if null iterator input.
+     * @param iterable  the {@link Iterable} providing the values to join together, may be null
+     * @param separator the separator character to use, null treated as ""
+     * @return the joined String, {@code null} if null iterator input
      * @since 2.3
      */
     public static String join(final Iterable<?> iterable, final String separator) {
@@ -4315,9 +4315,9 @@ public static String join(final Iterable<?> iterable, final String separator) {
      * See the examples here: {@link #join(Object[],char)}.
      * </p>
      *
-     * @param iterator  the {@link Iterator} of values to join together, may be null.
-     * @param separator the separator character to use.
-     * @return the joined String, {@code null} if null iterator input.
+     * @param iterator  the {@link Iterator} of values to join together, may be null
+     * @param separator the separator character to use
+     * @return the joined String, {@code null} if null iterator input
      * @since 2.0
      */
     public static String join(final Iterator<?> iterator, final char separator) {
@@ -4342,9 +4342,9 @@ public static String join(final Iterator<?> iterator, final char separator) {
      * See the examples here: {@link #join(Object[],String)}.
      * </p>
      *
-     * @param iterator  the {@link Iterator} of values to join together, may be null.
-     * @param separator the separator character to use, null treated as "".
-     * @return the joined String, {@code null} if null iterator input.
+     * @param iterator  the {@link Iterator} of values to join together, may be null
+     * @param separator the separator character to use, null treated as ""
+     * @return the joined String, {@code null} if null iterator input
      */
     public static String join(final Iterator<?> iterator, final String separator) {
         // handle null, zero and one elements before building a buffer
@@ -4373,11 +4373,11 @@ public static String join(final Iterator<?> iterator, final String separator) {
      * StringUtils.join([null, "", "a"], ';')  = ";;a"
      * </pre>
      *
-     * @param list       the {@link List} of values to join together, may be null.
-     * @param separator  the separator character to use.
+     * @param list       the {@link List} of values to join together, may be null
+     * @param separator  the separator character to use
      * @param startIndex the first index to start joining from. It is an error to pass in a start index past the end of the list.
      * @param endIndex   the index to stop joining from (exclusive). It is an error to pass in an end index past the end of the list.
-     * @return the joined String, {@code null} if null list input.
+     * @return the joined String, {@code null} if null list input
      * @since 3.8
      */
     public static String join(final List<?> list, final char separator, final int startIndex, final int endIndex) {
@@ -4408,11 +4408,11 @@ public static String join(final List<?> list, final char separator, final int st
      * StringUtils.join([null, "", "a"], ';')  = ";;a"
      * </pre>
      *
-     * @param list       the {@link List} of values to join together, may be null.
-     * @param separator  the separator character to use.
+     * @param list       the {@link List} of values to join together, may be null
+     * @param separator  the separator character to use
      * @param startIndex the first index to start joining from. It is an error to pass in a start index past the end of the list.
      * @param endIndex   the index to stop joining from (exclusive). It is an error to pass in an end index past the end of the list.
-     * @return the joined String, {@code null} if null list input.
+     * @return the joined String, {@code null} if null list input
      * @since 3.8
      */
     public static String join(final List<?> list, final String separator, final int startIndex, final int endIndex) {
@@ -4444,10 +4444,10 @@ public static String join(final List<?> list, final String separator, final int
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param separator
-     *            the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     *            the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final long[] array, final char separator) {
@@ -4474,16 +4474,16 @@ public static String join(final long[] array, final char separator) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final long[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -4520,9 +4520,9 @@ public static String join(final long[] array, final char delimiter, final int st
      * StringUtils.join([null, "", "a"], ';')  = ";;a"
      * </pre>
      *
-     * @param array     the array of values to join together, may be null.
-     * @param delimiter the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     * @param array     the array of values to join together, may be null
+     * @param delimiter the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 2.0
      */
     public static String join(final Object[] array, final char delimiter) {
@@ -4548,11 +4548,11 @@ public static String join(final Object[] array, final char delimiter) {
      * StringUtils.join([null, "", "a"], ';')  = ";;a"
      * </pre>
      *
-     * @param array      the array of values to join together, may be null.
-     * @param delimiter  the separator character to use.
+     * @param array      the array of values to join together, may be null
+     * @param delimiter  the separator character to use
      * @param startIndex the first index to start joining from. It is an error to pass in a start index past the end of the array.
      * @param endIndex   the index to stop joining from (exclusive). It is an error to pass in an end index past the end of the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 2.0
      */
     public static String join(final Object[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -4577,9 +4577,9 @@ public static String join(final Object[] array, final char delimiter, final int
      * StringUtils.join([null, "", "a"], ',')   = ",,a"
      * </pre>
      *
-     * @param array     the array of values to join together, may be null.
-     * @param delimiter the separator character to use, null treated as "".
-     * @return the joined String, {@code null} if null array input.
+     * @param array     the array of values to join together, may be null
+     * @param delimiter the separator character to use, null treated as ""
+     * @return the joined String, {@code null} if null array input
      */
     public static String join(final Object[] array, final String delimiter) {
         return array != null ? join(array, ObjectUtils.toString(delimiter), 0, array.length) : null;
@@ -4606,10 +4606,10 @@ public static String join(final Object[] array, final String delimiter) {
      * StringUtils.join([null, "", "a"], ',', 0, 3)   = ",,a"
      * </pre>
      *
-     * @param array      the array of values to join together, may be null.
-     * @param delimiter  the separator character to use, null treated as "".
-     * @param startIndex the first index to start joining from.
-     * @param endIndex   the index to stop joining from (exclusive).
+     * @param array      the array of values to join together, may be null
+     * @param delimiter  the separator character to use, null treated as ""
+     * @param startIndex the first index to start joining from
+     * @param endIndex   the index to stop joining from (exclusive)
      * @return the joined String, {@code null} if null array input; or the empty string if {@code endIndex - startIndex <= 0}. The number of joined entries is
      *         given by {@code endIndex - startIndex}.
      * @throws ArrayIndexOutOfBoundsException ife<br>
@@ -4640,10 +4640,10 @@ public static String join(final Object[] array, final String delimiter, final in
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
-     * @return the joined String, {@code null} if null array input.
+     *            the separator character to use
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final short[] array, final char delimiter) {
@@ -4670,16 +4670,16 @@ public static String join(final short[] array, final char delimiter) {
      * </pre>
      *
      * @param array
-     *            the array of values to join together, may be null.
+     *            the array of values to join together, may be null
      * @param delimiter
-     *            the separator character to use.
+     *            the separator character to use
      * @param startIndex
      *            the first index to start joining from. It is an error to pass in a start index past the end of the
      *            array.
      * @param endIndex
      *            the index to stop joining from (exclusive). It is an error to pass in an end index past the end of
      *            the array.
-     * @return the joined String, {@code null} if null array input.
+     * @return the joined String, {@code null} if null array input
      * @since 3.2
      */
     public static String join(final short[] array, final char delimiter, final int startIndex, final int endIndex) {
@@ -4715,9 +4715,9 @@ public static String join(final short[] array, final char delimiter, final int s
      * StringUtils.join(null, "", "a")   = "a"
      * </pre>
      *
-     * @param <T>      the specific type of values to join together.
-     * @param elements the values to join together, may be null.
-     * @return the joined String, {@code null} if null array input.
+     * @param <T>      the specific type of values to join together
+     * @param elements the values to join together, may be null
+     * @return the joined String, {@code null} if null array input
      * @since 2.0
      * @since 3.0 Changed signature to use varargs
      */
@@ -4740,10 +4740,10 @@ public static <T> String join(final T... elements) {
      * StringUtils.joinWith(null, "a", "b")       = "ab"
      * </pre>
      *
-     * @param delimiter the separator character to use, null treated as "".
+     * @param delimiter the separator character to use, null treated as ""
      * @param array     the varargs providing the values to join together. {@code null} elements are treated as "".
-     * @return the joined String.
-     * @throws IllegalArgumentException if a null varargs is provided.
+     * @return the joined String
+     * @throws IllegalArgumentException if a null varargs is provided
      * @since 3.5
      */
     public static String joinWith(final String delimiter, final Object... array) {
@@ -4770,9 +4770,9 @@ public static String joinWith(final String delimiter, final Object... array) {
      * StringUtils.lastIndexOf("aabaabaa", "")   = 8
      * </pre>
      *
-     * @param seq       the CharSequence to check, may be null.
-     * @param searchSeq the CharSequence to find, may be null.
-     * @return the last index of the search String, -1 if no match or {@code null} string input.
+     * @param seq       the CharSequence to check, may be null
+     * @param searchSeq the CharSequence to find, may be null
+     * @return the last index of the search String, -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from lastIndexOf(String, String) to lastIndexOf(CharSequence, CharSequence)
      * @deprecated Use {@link Strings#lastIndexOf(CharSequence, CharSequence) Strings.CS.lastIndexOf(CharSequence, CharSequence)}.
@@ -4806,10 +4806,10 @@ public static int lastIndexOf(final CharSequence seq, final CharSequence searchS
      * StringUtils.lastIndexOf("aabaabaa", "ba", 2)  = 2
      * </pre>
      *
-     * @param seq       the CharSequence to check, may be null.
-     * @param searchSeq the CharSequence to find, may be null.
-     * @param startPos  the start position, negative treated as zero.
-     * @return the last index of the search CharSequence (always &le; startPos), -1 if no match or {@code null} string input.
+     * @param seq       the CharSequence to check, may be null
+     * @param searchSeq the CharSequence to find, may be null
+     * @param startPos  the start position, negative treated as zero
+     * @return the last index of the search CharSequence (always &le; startPos), -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from lastIndexOf(String, String, int) to lastIndexOf(CharSequence, CharSequence, int)
      * @deprecated Use {@link Strings#lastIndexOf(CharSequence, CharSequence, int) Strings.CS.lastIndexOf(CharSequence, CharSequence, int)}.
@@ -4847,9 +4847,9 @@ public static int lastIndexOf(final CharSequence seq, final CharSequence searchS
      * StringUtils.lastIndexOf("aabaabaa", 'b') = 5
      * </pre>
      *
-     * @param seq        the {@link CharSequence} to check, may be null.
-     * @param searchChar the character to find.
-     * @return the last index of the search character, -1 if no match or {@code null} string input.
+     * @param seq        the {@link CharSequence} to check, may be null
+     * @param searchChar the character to find
+     * @return the last index of the search character, -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from lastIndexOf(String, int) to lastIndexOf(CharSequence, int)
      * @since 3.6 Updated {@link CharSequenceUtils} call to behave more like {@link String}
@@ -4898,10 +4898,10 @@ public static int lastIndexOf(final CharSequence seq, final int searchChar) {
      * StringUtils.lastIndexOf("aabaabaa", 'a', 0)  = 0
      * </pre>
      *
-     * @param seq        the CharSequence to check, may be null.
-     * @param searchChar the character to find.
-     * @param startPos   the start position.
-     * @return the last index of the search character (always &le; startPos), -1 if no match or {@code null} string input.
+     * @param seq        the CharSequence to check, may be null
+     * @param searchChar the character to find
+     * @param startPos   the start position
+     * @return the last index of the search character (always &le; startPos), -1 if no match or {@code null} string input
      * @since 2.0
      * @since 3.0 Changed signature from lastIndexOf(String, int, int) to lastIndexOf(CharSequence, int, int)
      */
@@ -4933,9 +4933,9 @@ public static int lastIndexOf(final CharSequence seq, final int searchChar, fina
      * StringUtils.lastIndexOfAny("zzabyycdxx", ["mn", ""])   = 10
      * </pre>
      *
-     * @param str        the CharSequence to check, may be null.
-     * @param searchStrs the CharSequences to search for, may be null.
-     * @return the last index of any of the CharSequences, -1 if no match.
+     * @param str        the CharSequence to check, may be null
+     * @param searchStrs the CharSequences to search for, may be null
+     * @return the last index of any of the CharSequences, -1 if no match
      * @since 3.0 Changed signature from lastIndexOfAny(String, String[]) to lastIndexOfAny(CharSequence, CharSequence)
      */
     public static int lastIndexOfAny(final CharSequence str, final CharSequence... searchStrs) {
@@ -4972,9 +4972,9 @@ public static int lastIndexOfAny(final CharSequence str, final CharSequence... s
      * StringUtils.lastIndexOfIgnoreCase("aabaabaa", "AB") = 4
      * </pre>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @return the first index of the search CharSequence, -1 if no match or {@code null} string input.
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @return the first index of the search CharSequence, -1 if no match or {@code null} string input
      * @since 2.5
      * @since 3.0 Changed signature from lastIndexOfIgnoreCase(String, String) to lastIndexOfIgnoreCase(CharSequence, CharSequence)
      * @deprecated Use {@link Strings#lastIndexOf(CharSequence, CharSequence) Strings.CI.lastIndexOf(CharSequence, CharSequence)}.
@@ -5005,10 +5005,10 @@ public static int lastIndexOfIgnoreCase(final CharSequence str, final CharSequen
      * StringUtils.lastIndexOfIgnoreCase("aabaabaa", "B", 0)  = -1
      * </pre>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @param startPos  the start position.
-     * @return the last index of the search CharSequence (always &le; startPos), -1 if no match or {@code null} input.
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @param startPos  the start position
+     * @return the last index of the search CharSequence (always &le; startPos), -1 if no match or {@code null} input
      * @since 2.5
      * @since 3.0 Changed signature from lastIndexOfIgnoreCase(String, String, int) to lastIndexOfIgnoreCase(CharSequence, CharSequence, int)
      * @deprecated Use {@link Strings#lastIndexOf(CharSequence, CharSequence, int) Strings.CI.lastIndexOf(CharSequence, CharSequence, int)}.
@@ -5047,10 +5047,10 @@ public static int lastIndexOfIgnoreCase(final CharSequence str, final CharSequen
      * str.substring(lastOrdinalIndexOf(str, "\n", n) + 1)
      * </pre>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @param ordinal   the n-th last {@code searchStr} to find.
-     * @return the n-th last index of the search CharSequence, {@code -1} ({@code INDEX_NOT_FOUND}) if no match or {@code null} string input.
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @param ordinal   the n-th last {@code searchStr} to find
+     * @return the n-th last index of the search CharSequence, {@code -1} ({@code INDEX_NOT_FOUND}) if no match or {@code null} string input
      * @since 2.5
      * @since 3.0 Changed signature from lastOrdinalIndexOf(String, String, int) to lastOrdinalIndexOf(CharSequence, CharSequence, int)
      */
@@ -5075,9 +5075,9 @@ public static int lastOrdinalIndexOf(final CharSequence str, final CharSequence
      * StringUtils.left("abc", 4)   = "abc"
      * </pre>
      *
-     * @param str the String to get the leftmost characters from, may be null.
-     * @param len the length of the required String.
-     * @return the leftmost characters, {@code null} if null String input.
+     * @param str the String to get the leftmost characters from, may be null
+     * @param len the length of the required String
+     * @return the leftmost characters, {@code null} if null String input
      */
     public static String left(final String str, final int len) {
         if (str == null) {
@@ -5108,9 +5108,9 @@ public static String left(final String str, final int len) {
      * StringUtils.leftPad("bat", -1) = "bat"
      * </pre>
      *
-     * @param str  the String to pad out, may be null.
-     * @param size the size to pad to.
-     * @return left padded String or original String if no padding is necessary, {@code null} if null String input.
+     * @param str  the String to pad out, may be null
+     * @param size the size to pad to
+     * @return left padded String or original String if no padding is necessary, {@code null} if null String input
      */
     public static String leftPad(final String str, final int size) {
         return leftPad(str, size, ' ');
@@ -5132,10 +5132,10 @@ public static String leftPad(final String str, final int size) {
      * StringUtils.leftPad("bat", -1, 'z') = "bat"
      * </pre>
      *
-     * @param str     the String to pad out, may be null.
-     * @param size    the size to pad to.
-     * @param padChar the character to pad with.
-     * @return left padded String or original String if no padding is necessary, {@code null} if null String input.
+     * @param str     the String to pad out, may be null
+     * @param size    the size to pad to
+     * @param padChar the character to pad with
+     * @return left padded String or original String if no padding is necessary, {@code null} if null String input
      * @since 2.0
      */
     public static String leftPad(final String str, final int size, final char padChar) {
@@ -5171,10 +5171,10 @@ public static String leftPad(final String str, final int size, final char padCha
      * StringUtils.leftPad("bat", 5, "")    = "  bat"
      * </pre>
      *
-     * @param str    the String to pad out, may be null.
-     * @param size   the size to pad to.
-     * @param padStr the String to pad with, null or empty treated as single space.
-     * @return left padded String or original String if no padding is necessary, {@code null} if null String input.
+     * @param str    the String to pad out, may be null
+     * @param size   the size to pad to
+     * @param padStr the String to pad with, null or empty treated as single space
+     * @return left padded String or original String if no padding is necessary, {@code null} if null String input
      */
     public static String leftPad(final String str, final int size, String padStr) {
         if (str == null) {
@@ -5209,8 +5209,8 @@ public static String leftPad(final String str, final int size, String padStr) {
     /**
      * Gets a CharSequence length or {@code 0} if the CharSequence is {@code null}.
      *
-     * @param cs a CharSequence or {@code null}.
-     * @return CharSequence length or {@code 0} if the CharSequence is {@code null}.
+     * @param cs a CharSequence or {@code null}
+     * @return CharSequence length or {@code 0} if the CharSequence is {@code null}
      * @since 2.4
      * @since 3.0 Changed signature from length(String) to length(CharSequence)
      */
@@ -5237,8 +5237,8 @@ public static int length(final CharSequence cs) {
      * {@link Locale#ENGLISH}).
      * </p>
      *
-     * @param str the String to lower case, may be null.
-     * @return the lower cased String, {@code null} if null String input.
+     * @param str the String to lower case, may be null
+     * @return the lower cased String, {@code null} if null String input
      */
     public static String lowerCase(final String str) {
         if (str == null) {
@@ -5260,9 +5260,9 @@ public static String lowerCase(final String str) {
      * StringUtils.lowerCase("aBc", Locale.ENGLISH) = "abc"
      * </pre>
      *
-     * @param str    the String to lower case, may be null.
-     * @param locale the locale that defines the case transformation rules, must not be null.
-     * @return the lower cased String, {@code null} if null String input.
+     * @param str    the String to lower case, may be null
+     * @param locale the locale that defines the case transformation rules, must not be null
+     * @return the lower cased String, {@code null} if null String input
      * @since 2.5
      */
     public static String lowerCase(final String str, final Locale locale) {
@@ -5346,10 +5346,10 @@ private static int[] matches(final CharSequence first, final CharSequence second
      * StringUtils.mid("abc", -2, 2)  = "ab"
      * </pre>
      *
-     * @param str the String to get the characters from, may be null.
-     * @param pos the position to start from, negative treated as zero.
-     * @param len the length of the required String.
-     * @return the middle characters, {@code null} if null String input.
+     * @param str the String to get the characters from, may be null
+     * @param pos the position to start from, negative treated as zero
+     * @param len the length of the required String
+     * @return the middle characters, {@code null} if null String input
      */
     public static String mid(final String str, int pos, final int len) {
         if (str == null) {
@@ -5396,8 +5396,8 @@ public static String mid(final String str, int pos, final int len) {
      * #trim(String)}} removes control characters (char &lt;= 32) from both ends of this String.
      * </p>
      *
-     * @param str the source String to normalize whitespaces from, may be null.
-     * @return the modified string with whitespace normalized, {@code null} if null String input.
+     * @param str the source String to normalize whitespaces from, may be null
+     * @return the modified string with whitespace normalized, {@code null} if null String input
      * @see Pattern
      * @see #trim(String)
      * @see <a href="https://www.w3.org/TR/xpath/#function-normalize-space">https://www.w3.org/TR/xpath/#function-normalize-space</a>
@@ -5482,10 +5482,10 @@ public static String normalizeSpace(final String str) {
      * str.substring(0, lastOrdinalIndexOf(str, "\n", n))
      * </pre>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @param ordinal   the n-th {@code searchStr} to find.
-     * @return the n-th index of the search CharSequence, {@code -1} ({@code INDEX_NOT_FOUND}) if no match or {@code null} string input.
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @param ordinal   the n-th {@code searchStr} to find
+     * @return the n-th index of the search CharSequence, {@code -1} ({@code INDEX_NOT_FOUND}) if no match or {@code null} string input
      * @since 2.1
      * @since 3.0 Changed signature from ordinalIndexOf(String, String, int) to ordinalIndexOf(CharSequence, CharSequence, int)
      */
@@ -5503,11 +5503,11 @@ public static int ordinalIndexOf(final CharSequence str, final CharSequence sear
      * A {@code null} CharSequence will return {@code -1}.
      * </p>
      *
-     * @param str       the CharSequence to check, may be null.
-     * @param searchStr the CharSequence to find, may be null.
-     * @param ordinal   the n-th {@code searchStr} to find, overlapping matches are allowed.
-     * @param lastIndex true if lastOrdinalIndexOf() otherwise false if ordinalIndexOf().
-     * @return the n-th index of the search CharSequence, {@code -1} ({@code INDEX_NOT_FOUND}) if no match or {@code null} string input.
+     * @param str       the CharSequence to check, may be null
+     * @param searchStr the CharSequence to find, may be null
+     * @param ordinal   the n-th {@code searchStr} to find, overlapping matches are allowed
+     * @param lastIndex true if lastOrdinalIndexOf() otherwise false if ordinalIndexOf()
+     * @return the n-th index of the search CharSequence, {@code -1} ({@code INDEX_NOT_FOUND}) if no match or {@code null} string input
      */
     // Shared code between ordinalIndexOf(String, String, int) and lastOrdinalIndexOf(String, String, int)
     private static int ordinalIndexOf(final CharSequence str, final CharSequence searchStr, final int ordinal, final boolean lastIndex) {
@@ -5557,11 +5557,11 @@ private static int ordinalIndexOf(final CharSequence str, final CharSequence sea
      * StringUtils.overlay("abcdef", "zzzz", 8, 10)  = "abcdefzzzz"
      * </pre>
      *
-     * @param str     the String to do overlaying in, may be null.
-     * @param overlay the String to overlay, may be null.
-     * @param start   the position to start overlaying at.
-     * @param end     the position to stop overlaying before.
-     * @return overlayed String, {@code null} if null String input.
+     * @param str     the String to do overlaying in, may be null
+     * @param overlay the String to overlay, may be null
+     * @param start   the position to start overlaying at
+     * @param end     the position to stop overlaying before
+     * @return overlayed String, {@code null} if null String input
      * @since 2.0
      */
     public static String overlay(final String str, String overlay, int start, int end) {
@@ -5620,10 +5620,10 @@ public static String overlay(final String str, String overlay, int start, int en
      * StringUtils.prependIfMissing("MNOabc", "xyz", "mno") = "xyzMNOabc"
      * </pre>
      *
-     * @param str      The string.
-     * @param prefix   The prefix to prepend to the start of the string.
-     * @param prefixes Additional prefixes that are valid.
-     * @return A new String if prefix was prepended, the same string otherwise.
+     * @param str      the string
+     * @param prefix   the prefix to prepend to the start of the string
+     * @param prefixes additional prefixes that are valid
+     * @return a new String if prefix was prepended, the same string otherwise
      * @since 3.2
      * @deprecated Use {@link Strings#prependIfMissing(String, CharSequence, CharSequence...) Strings.CS.prependIfMissing(String, CharSequence,
      *             CharSequence...)}.
@@ -5661,10 +5661,10 @@ public static String prependIfMissing(final String str, final CharSequence prefi
      * StringUtils.prependIfMissingIgnoreCase("MNOabc", "xyz", "mno") = "MNOabc"
      * </pre>
      *
-     * @param str      The string.
-     * @param prefix   The prefix to prepend to the start of the string.
-     * @param prefixes Additional prefixes that are valid (optional).
-     * @return A new String if prefix was prepended, the same string otherwise.
+     * @param str      the string
+     * @param prefix   the prefix to prepend to the start of the string
+     * @param prefixes additional prefixes that are valid (optional)
+     * @return a new String if prefix was prepended, the same string otherwise
      * @since 3.2
      * @deprecated Use {@link Strings#prependIfMissing(String, CharSequence, CharSequence...) Strings.CI.prependIfMissing(String, CharSequence,
      *             CharSequence...)}.
@@ -5688,9 +5688,9 @@ public static String prependIfMissingIgnoreCase(final String str, final CharSequ
      * StringUtils.remove("queued", 'z') = "queued"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the char to search for and remove, may be null.
-     * @return the substring with the char removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the char to search for and remove, may be null
+     * @return the substring with the char removed if found, {@code null} if null String input
      * @since 2.1
      */
     public static String remove(final String str, final char remove) {
@@ -5724,9 +5724,9 @@ public static String remove(final String str, final char remove) {
      * StringUtils.remove("queued", "zz") = "queued"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the String to search for and remove, may be null.
-     * @return the substring with the string removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the String to search for and remove, may be null
+     * @return the substring with the string removed if found, {@code null} if null String input
      * @since 2.1
      * @deprecated Use {@link Strings#remove(String, String) Strings.CS.remove(String, String)}.
      */
@@ -5765,10 +5765,10 @@ public static String remove(final String str, final String remove) {
      * StringUtils.removeAll("ABCabc123abc", "[a-z]")     = "ABC123"
      * }</pre>
      *
-     * @param text  text to remove from, may be null.
-     * @param regex the regular expression to which this string is to be matched.
-     * @return the text with any removes processed, {@code null} if null String input.
-     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid.
+     * @param text  text to remove from, may be null
+     * @param regex the regular expression to which this string is to be matched
+     * @return the text with any removes processed, {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid
      * @see #replaceAll(String, String, String)
      * @see #removePattern(String, String)
      * @see String#replaceAll(String, String)
@@ -5800,9 +5800,9 @@ public static String removeAll(final String text, final String regex) {
      * StringUtils.removeEnd("abc", "")    = "abc"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the String to search for and remove, may be null.
-     * @return the substring with the string removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the String to search for and remove, may be null
+     * @return the substring with the string removed if found, {@code null} if null String input
      * @since 2.1
      * @deprecated Use {@link Strings#removeEnd(String, CharSequence) Strings.CS.removeEnd(String, CharSequence)}.
      */
@@ -5831,9 +5831,9 @@ public static String removeEnd(final String str, final String remove) {
      * StringUtils.removeEndIgnoreCase("www.domain.COM", ".com") = "www.domain"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the String to search for (case-insensitive) and remove, may be null.
-     * @return the substring with the string removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the String to search for (case-insensitive) and remove, may be null
+     * @return the substring with the string removed if found, {@code null} if null String input
      * @since 2.4
      * @deprecated Use {@link Strings#removeEnd(String, CharSequence) Strings.CI.removeEnd(String, CharSequence)}.
      */
@@ -5873,10 +5873,10 @@ public static String removeEndIgnoreCase(final String str, final String remove)
      * StringUtils.removeFirst("ABCabc123abc", "[a-z]+")      = "ABC123abc"
      * }</pre>
      *
-     * @param text  text to remove from, may be null.
-     * @param regex the regular expression to which this string is to be matched.
-     * @return the text with the first replacement processed, {@code null} if null String input.
-     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid.
+     * @param text  text to remove from, may be null
+     * @param regex the regular expression to which this string is to be matched
+     * @return the text with the first replacement processed, {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid
      * @see #replaceFirst(String, String, String)
      * @see String#replaceFirst(String, String)
      * @see java.util.regex.Pattern
@@ -5908,9 +5908,9 @@ public static String removeFirst(final String text, final String regex) {
      * StringUtils.removeIgnoreCase("queued", "zZ") = "queued"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the String to search for (case-insensitive) and remove, may be null.
-     * @return the substring with the string removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the String to search for (case-insensitive) and remove, may be null
+     * @return the substring with the string removed if found, {@code null} if null String input
      * @since 3.5
      * @deprecated Use {@link Strings#remove(String, String) Strings.CI.remove(String, String)}.
      */
@@ -5939,14 +5939,14 @@ public static String removeIgnoreCase(final String str, final String remove) {
      * StringUtils.removePattern("ABCabc123", "[a-z]")    = "ABC123"
      * }</pre>
      *
-     * @param source the source string.
-     * @param regex  the regular expression to which this string is to be matched.
-     * @return The resulting {@link String}.
+     * @param source the source string
+     * @param regex  the regular expression to which this string is to be matched
+     * @return the resulting {@link String}
      * @see #replacePattern(String, String, String)
      * @see String#replaceAll(String, String)
      * @see Pattern#DOTALL
      * @since 3.2
-     * @since 3.5 Changed {@code null} reference passed to this method is a no-op.
+     * @since 3.5 Changed {@code null} reference passed to this method is a no-op
      * @deprecated Use {@link RegExUtils#removePattern(CharSequence, String)}.
      */
     @Deprecated
@@ -5971,9 +5971,9 @@ public static String removePattern(final String source, final String regex) {
      * StringUtils.removeStart("path", 0)    = "path"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the char to search for and remove.
-     * @return the substring with the char removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the char to search for and remove
+     * @return the substring with the char removed if found, {@code null} if null String input
      * @since 3.13.0
      */
     public static String removeStart(final String str, final char remove) {
@@ -6001,9 +6001,9 @@ public static String removeStart(final String str, final char remove) {
      * StringUtils.removeStart("abc", "")                  = "abc"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the String to search for and remove, may be null.
-     * @return the substring with the string removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the String to search for and remove, may be null
+     * @return the substring with the string removed if found, {@code null} if null String input
      * @since 2.1
      * @deprecated Use {@link Strings#removeStart(String, CharSequence) Strings.CS.removeStart(String, CharSequence)}.
      */
@@ -6031,9 +6031,9 @@ public static String removeStart(final String str, final String remove) {
      * StringUtils.removeStartIgnoreCase("abc", "")                  = "abc"
      * </pre>
      *
-     * @param str    the source String to search, may be null.
-     * @param remove the String to search for (case-insensitive) and remove, may be null.
-     * @return the substring with the string removed if found, {@code null} if null String input.
+     * @param str    the source String to search, may be null
+     * @param remove the String to search for (case-insensitive) and remove, may be null
+     * @return the substring with the string removed if found, {@code null} if null String input
      * @since 2.4
      * @deprecated Use {@link Strings#removeStart(String, CharSequence) Strings.CI.removeStart(String, CharSequence)}.
      */
@@ -6057,9 +6057,9 @@ public static String removeStartIgnoreCase(final String str, final String remove
      * {@link #repeat(String, int)} instead.
      * </p>
      *
-     * @param repeat character to repeat.
-     * @param count  number of times to repeat char, negative treated as zero.
-     * @return String with repeated character.
+     * @param repeat character to repeat
+     * @param count  number of times to repeat char, negative treated as zero
+     * @return string with repeated character
      * @see #repeat(String, int)
      */
     public static String repeat(final char repeat, final int count) {
@@ -6081,9 +6081,9 @@ public static String repeat(final char repeat, final int count) {
      * StringUtils.repeat("a", -2) = ""
      * </pre>
      *
-     * @param repeat the String to repeat, may be null.
-     * @param count  number of times to repeat str, negative treated as zero.
-     * @return a new String consisting of the original String repeated, {@code null} if null String input.
+     * @param repeat the String to repeat, may be null
+     * @param count  number of times to repeat str, negative treated as zero
+     * @return a new String consisting of the original String repeated, {@code null} if null String input
      */
     public static String repeat(final String repeat, final int count) {
         // Performance tuned for 2.0 (JDK1.4)
@@ -6134,10 +6134,10 @@ public static String repeat(final String repeat, final int count) {
      * StringUtils.repeat("?", ", ", 3)  = "?, ?, ?"
      * </pre>
      *
-     * @param repeat    the String to repeat, may be null.
-     * @param separator the String to inject, may be null.
-     * @param count     number of times to repeat str, negative treated as zero.
-     * @return a new String consisting of the original String repeated, {@code null} if null String input.
+     * @param repeat    the String to repeat, may be null
+     * @param separator the String to inject, may be null
+     * @param count     number of times to repeat str, negative treated as zero
+     * @return a new String consisting of the original String repeated, {@code null} if null String input
      * @since 2.5
      */
     public static String repeat(final String repeat, final String separator, final int count) {
@@ -6167,10 +6167,10 @@ public static String repeat(final String repeat, final String separator, final i
      * StringUtils.replace("aba", "a", "z")   = "zbz"
      * </pre>
      *
-     * @param text         text to search and replace in, may be null.
-     * @param searchString the String to search for, may be null.
-     * @param replacement  the String to replace it with, may be null.
-     * @return the text with any replacements processed, {@code null} if null String input.
+     * @param text         text to search and replace in, may be null
+     * @param searchString the String to search for, may be null
+     * @param replacement  the String to replace it with, may be null
+     * @return the text with any replacements processed, {@code null} if null String input
      * @see #replace(String text, String searchString, String replacement, int max)
      * @deprecated Use {@link Strings#replace(String, String, String) Strings.CS.replace(String, String, String)}.
      */
@@ -6201,11 +6201,11 @@ public static String replace(final String text, final String searchString, final
      * StringUtils.replace("abaa", "a", "z", -1)  = "zbzz"
      * </pre>
      *
-     * @param text         text to search and replace in, may be null.
-     * @param searchString the String to search for, may be null.
-     * @param replacement  the String to replace it with, may be null.
-     * @param max          maximum number of values to replace, or {@code -1} if no maximum.
-     * @return the text with any replacements processed, {@code null} if null String input.
+     * @param text         text to search and replace in, may be null
+     * @param searchString the String to search for, may be null
+     * @param replacement  the String to replace it with, may be null
+     * @param max          maximum number of values to replace, or {@code -1} if no maximum
+     * @return the text with any replacements processed, {@code null} if null String input
      * @deprecated Use {@link Strings#replace(String, String, String, int) Strings.CS.replace(String, String, String, int)}.
      */
     @Deprecated
@@ -6247,11 +6247,11 @@ public static String replace(final String text, final String searchString, final
      * StringUtils.replaceAll("Lorem ipsum  dolor   sit", "( +)([a-z]+)", "_$2")  = "Lorem_ipsum_dolor_sit"
      * }</pre>
      *
-     * @param text        text to search and replace in, may be null.
-     * @param regex       the regular expression to which this string is to be matched.
-     * @param replacement the string to be substituted for each match.
-     * @return the text with any replacements processed, {@code null} if null String input.
-     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid.
+     * @param text        text to search and replace in, may be null
+     * @param regex       the regular expression to which this string is to be matched
+     * @param replacement the string to be substituted for each match
+     * @return the text with any replacements processed, {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid
      * @see #replacePattern(String, String, String)
      * @see String#replaceAll(String, String)
      * @see java.util.regex.Pattern
@@ -6278,10 +6278,10 @@ public static String replaceAll(final String text, final String regex, final Str
      * StringUtils.replaceChars("abcba", 'z', 'y') = "abcba"
      * </pre>
      *
-     * @param str         String to replace characters in, may be null.
-     * @param searchChar  the character to search for, may be null.
-     * @param replaceChar the character to replace, may be null.
-     * @return modified String, {@code null} if null string input.
+     * @param str         string to replace characters in, may be null
+     * @param searchChar  the character to search for, may be null
+     * @param replaceChar the character to replace, may be null
+     * @return modified String, {@code null} if null string input
      * @since 2.0
      */
     public static String replaceChars(final String str, final char searchChar, final char replaceChar) {
@@ -6323,10 +6323,10 @@ public static String replaceChars(final String str, final char searchChar, final
      * StringUtils.replaceChars("abcba", "bc", "yzx") = "ayzya"
      * </pre>
      *
-     * @param str          String to replace characters in, may be null.
-     * @param searchChars  a set of characters to search for, may be null.
-     * @param replaceChars a set of characters to replace, may be null.
-     * @return modified String, {@code null} if null string input.
+     * @param str          string to replace characters in, may be null
+     * @param searchChars  a set of characters to search for, may be null
+     * @param replaceChars a set of characters to replace, may be null
+     * @return modified String, {@code null} if null string input
      * @since 2.0
      */
     public static String replaceChars(final String str, final String searchChars, String replaceChars) {
@@ -6378,11 +6378,11 @@ public static String replaceChars(final String str, final String searchChars, St
      *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"})  = "dcte"
      * </pre>
      *
-     * @param text            text to search and replace in, no-op if null.
-     * @param searchList      the Strings to search for, no-op if null.
-     * @param replacementList the Strings to replace them with, no-op if null.
-     * @return the text with any replacements processed, {@code null} if null String input.
-     * @throws IllegalArgumentException if the lengths of the arrays are not the same (null is ok, and/or size 0).
+     * @param text            text to search and replace in, no-op if null
+     * @param searchList      the Strings to search for, no-op if null
+     * @param replacementList the Strings to replace them with, no-op if null
+     * @return the text with any replacements processed, {@code null} if null String input
+     * @throws IllegalArgumentException if the lengths of the arrays are not the same (null is ok, and/or size 0)
      * @since 2.4
      */
     public static String replaceEach(final String text, final String[] searchList, final String[] replacementList) {
@@ -6413,14 +6413,14 @@ public static String replaceEach(final String text, final String[] searchList, f
      *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"}, *, *)      = Throws {@link IllegalStateException}
      * </pre>
      *
-     * @param text            text to search and replace in, no-op if null.
-     * @param searchList      the Strings to search for, no-op if null.
-     * @param replacementList the Strings to replace them with, no-op if null.
-     * @param repeat          if true, then replace repeatedly until there are no more possible replacements or timeToLive < 0.
-     * @param timeToLive      if less than 0 then there is a circular reference and endless loop.
-     * @return the text with any replacements processed, {@code null} if null String input.
-     * @throws IllegalStateException    if the search is repeating and there is an endless loop due to outputs of one being inputs to another.
-     * @throws IllegalArgumentException if the lengths of the arrays are not the same (null is ok, and/or size 0).
+     * @param text            text to search and replace in, no-op if null
+     * @param searchList      the Strings to search for, no-op if null
+     * @param replacementList the Strings to replace them with, no-op if null
+     * @param repeat          if true, then replace repeatedly until there are no more possible replacements or timeToLive < 0
+     * @param timeToLive      if less than 0 then there is a circular reference and endless loop
+     * @return the text with any replacements processed, {@code null} if null String input
+     * @throws IllegalArgumentException if the lengths of the arrays are not the same (null is ok, and/or size 0)
+     * @throws IllegalStateException    if the search is repeating and there is an endless loop due to outputs of one being inputs to another
      * @since 2.4
      */
     private static String replaceEach(
@@ -6564,12 +6564,12 @@ private static String replaceEach(
      *  StringUtils.replaceEachRepeatedly("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"}) = Throws {@link IllegalStateException}
      * </pre>
      *
-     * @param text            text to search and replace in, no-op if null.
-     * @param searchList      the Strings to search for, no-op if null.
-     * @param replacementList the Strings to replace them with, no-op if null.
-     * @return the text with any replacements processed, {@code null} if null String input.
-     * @throws IllegalStateException    if the search is repeating and there is an endless loop due to outputs of one being inputs to another.
-     * @throws IllegalArgumentException if the lengths of the arrays are not the same (null is ok, and/or size 0).
+     * @param text            text to search and replace in, no-op if null
+     * @param searchList      the Strings to search for, no-op if null
+     * @param replacementList the Strings to replace them with, no-op if null
+     * @return the text with any replacements processed, {@code null} if null String input
+     * @throws IllegalArgumentException if the lengths of the arrays are not the same (null is ok, and/or size 0)
+     * @throws IllegalStateException    if the search is repeating and there is an endless loop due to outputs of one being inputs to another
      * @since 2.4
      */
     public static String replaceEachRepeatedly(final String text, final String[] searchList, final String[] replacementList) {
@@ -6611,11 +6611,11 @@ public static String replaceEachRepeatedly(final String text, final String[] sea
      * StringUtils.replaceFirst("Lorem ipsum  dolor   sit", "( +)([a-z]+)", "_$2")  = "Lorem_ipsum  dolor   sit"
      * }</pre>
      *
-     * @param text        text to search and replace in, may be null.
-     * @param regex       the regular expression to which this string is to be matched.
-     * @param replacement the string to be substituted for the first match.
-     * @return the text with the first replacement processed, {@code null} if null String input.
-     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid.
+     * @param text        text to search and replace in, may be null
+     * @param regex       the regular expression to which this string is to be matched
+     * @param replacement the string to be substituted for the first match
+     * @return the text with the first replacement processed, {@code null} if null String input
+     * @throws java.util.regex.PatternSyntaxException if the regular expression's syntax is invalid
      * @see String#replaceFirst(String, String)
      * @see java.util.regex.Pattern
      * @see java.util.regex.Pattern#DOTALL
@@ -6645,10 +6645,10 @@ public static String replaceFirst(final String text, final String regex, final S
      * StringUtils.replaceIgnoreCase("aba", "A", "z")   = "zbz"
      * </pre>
      *
-     * @param text         text to search and replace in, may be null.
-     * @param searchString the String to search for (case-insensitive), may be null.
-     * @param replacement  the String to replace it with, may be null.
-     * @return the text with any replacements processed, {@code null} if null String input.
+     * @param text         text to search and replace in, may be null
+     * @param searchString the String to search for (case-insensitive), may be null
+     * @param replacement  the String to replace it with, may be null
+     * @return the text with any replacements processed, {@code null} if null String input
      * @see #replaceIgnoreCase(String text, String searchString, String replacement, int max)
      * @since 3.5
      * @deprecated Use {@link Strings#replace(String, String, String) Strings.CI.replace(String, String, String)}.
@@ -6680,11 +6680,11 @@ public static String replaceIgnoreCase(final String text, final String searchStr
      * StringUtils.replaceIgnoreCase("abAa", "a", "z", -1)  = "zbzz"
      * </pre>
      *
-     * @param text         text to search and replace in, may be null.
-     * @param searchString the String to search for (case-insensitive), may be null.
-     * @param replacement  the String to replace it with, may be null.
-     * @param max          maximum number of values to replace, or {@code -1} if no maximum.
-     * @return the text with any replacements processed, {@code null} if null String input.
+     * @param text         text to search and replace in, may be null
+     * @param searchString the String to search for (case-insensitive), may be null
+     * @param replacement  the String to replace it with, may be null
+     * @param max          maximum number of values to replace, or {@code -1} if no maximum
+     * @return the text with any replacements processed, {@code null} if null String input
      * @since 3.5
      * @deprecated Use {@link Strings#replace(String, String, String, int) Strings.CI.replace(String, String, String, int)}.
      */
@@ -6711,10 +6711,10 @@ public static String replaceIgnoreCase(final String text, final String searchStr
      * StringUtils.replaceOnce("aba", "a", "z")   = "zba"
      * </pre>
      *
-     * @param text         text to search and replace in, may be null.
-     * @param searchString the String to search for, may be null.
-     * @param replacement  the String to replace with, may be null.
-     * @return the text with any replacements processed, {@code null} if null String input.
+     * @param text         text to search and replace in, may be null
+     * @param searchString the String to search for, may be null
+     * @param replacement  the String to replace with, may be null
+     * @return the text with any replacements processed, {@code null} if null String input
      * @see #replace(String text, String searchString, String replacement, int max)
      * @deprecated Use {@link Strings#replaceOnce(String, String, String) Strings.CS.replaceOnce(String, String, String)}.
      */
@@ -6742,10 +6742,10 @@ public static String replaceOnce(final String text, final String searchString, f
      * StringUtils.replaceOnceIgnoreCase("FoOFoofoo", "foo", "") = "Foofoo"
      * </pre>
      *
-     * @param text         text to search and replace in, may be null.
-     * @param searchString the String to search for (case-insensitive), may be null.
-     * @param replacement  the String to replace with, may be null.
-     * @return the text with any replacements processed, {@code null} if null String input.
+     * @param text         text to search and replace in, may be null
+     * @param searchString the String to search for (case-insensitive), may be null
+     * @param replacement  the String to replace with, may be null
+     * @return the text with any replacements processed, {@code null} if null String input
      * @see #replaceIgnoreCase(String text, String searchString, String replacement, int max)
      * @since 3.5
      * @deprecated Use {@link Strings#replaceOnce(String, String, String) Strings.CI.replaceOnce(String, String, String)}.
@@ -6783,15 +6783,15 @@ public static String replaceOnceIgnoreCase(final String text, final String searc
      * StringUtils.replacePattern("Lorem ipsum  dolor   sit", "( +)([a-z]+)", "_$2")  = "Lorem_ipsum_dolor_sit"
      * }</pre>
      *
-     * @param source      the source string.
-     * @param regex       the regular expression to which this string is to be matched.
-     * @param replacement the string to be substituted for each match.
-     * @return The resulting {@link String}.
+     * @param source      the source string
+     * @param regex       the regular expression to which this string is to be matched
+     * @param replacement the string to be substituted for each match
+     * @return the resulting {@link String}
      * @see #replaceAll(String, String, String)
      * @see String#replaceAll(String, String)
      * @see Pattern#DOTALL
      * @since 3.2
-     * @since 3.5 Changed {@code null} reference passed to this method is a no-op.
+     * @since 3.5 Changed {@code null} reference passed to this method is a no-op
      * @deprecated Use {@link RegExUtils#replacePattern(CharSequence, String, String)}.
      */
     @Deprecated
@@ -6812,8 +6812,8 @@ public static String replacePattern(final String source, final String regex, fin
      * StringUtils.reverse("bat") = "tab"
      * </pre>
      *
-     * @param str the String to reverse, may be null.
-     * @return the reversed String, {@code null} if null String input.
+     * @param str the String to reverse, may be null
+     * @return the reversed String, {@code null} if null String input
      */
     public static String reverse(final String str) {
         if (str == null) {
@@ -6836,9 +6836,9 @@ public static String reverse(final String str) {
      * StringUtils.reverseDelimited("a.b.c", ".") = "c.b.a"
      * </pre>
      *
-     * @param str           the String to reverse, may be null.
-     * @param separatorChar the separator character to use.
-     * @return the reversed String, {@code null} if null String input.
+     * @param str           the String to reverse, may be null
+     * @param separatorChar the separator character to use
+     * @return the reversed String, {@code null} if null String input
      * @since 2.0
      */
     public static String reverseDelimited(final String str, final char separatorChar) {
@@ -6864,9 +6864,9 @@ public static String reverseDelimited(final String str, final char separatorChar
      * StringUtils.right("abc", 4)   = "abc"
      * </pre>
      *
-     * @param str the String to get the rightmost characters from, may be null.
-     * @param len the length of the required String.
-     * @return the rightmost characters, {@code null} if null String input.
+     * @param str the String to get the rightmost characters from, may be null
+     * @param len the length of the required String
+     * @return the rightmost characters, {@code null} if null String input
      */
     public static String right(final String str, final int len) {
         if (str == null) {
@@ -6897,9 +6897,9 @@ public static String right(final String str, final int len) {
      * StringUtils.rightPad("bat", -1) = "bat"
      * </pre>
      *
-     * @param str  the String to pad out, may be null.
-     * @param size the size to pad to.
-     * @return right padded String or original String if no padding is necessary, {@code null} if null String input.
+     * @param str  the String to pad out, may be null
+     * @param size the size to pad to
+     * @return right padded String or original String if no padding is necessary, {@code null} if null String input
      */
     public static String rightPad(final String str, final int size) {
         return rightPad(str, size, ' ');
@@ -6921,10 +6921,10 @@ public static String rightPad(final String str, final int size) {
      * StringUtils.rightPad("bat", -1, 'z') = "bat"
      * </pre>
      *
-     * @param str     the String to pad out, may be null.
-     * @param size    the size to pad to.
-     * @param padChar the character to pad with.
-     * @return right padded String or original String if no padding is necessary, {@code null} if null String input.
+     * @param str     the String to pad out, may be null
+     * @param size    the size to pad to
+     * @param padChar the character to pad with
+     * @return right padded String or original String if no padding is necessary, {@code null} if null String input
      * @since 2.0
      */
     public static String rightPad(final String str, final int size, final char padChar) {
@@ -6960,10 +6960,10 @@ public static String rightPad(final String str, final int size, final char padCh
      * StringUtils.rightPad("bat", 5, "")    = "bat  "
      * </pre>
      *
-     * @param str    the String to pad out, may be null.
-     * @param size   the size to pad to.
-     * @param padStr the String to pad with, null or empty treated as single space.
-     * @return right padded String or original String if no padding is necessary, {@code null} if null String input.
+     * @param str    the String to pad out, may be null
+     * @param size   the size to pad to
+     * @param padStr the String to pad with, null or empty treated as single space
+     * @return right padded String or original String if no padding is necessary, {@code null} if null String input
      */
     public static String rightPad(final String str, final int size, String padStr) {
         if (str == null) {
@@ -7014,9 +7014,9 @@ public static String rightPad(final String str, final int size, String padStr) {
      * StringUtils.rotate("abcdefg", -9)  = "cdefgab"
      * </pre>
      *
-     * @param str   the String to rotate, may be null.
-     * @param shift number of time to shift (positive : right shift, negative : left shift).
-     * @return the rotated String, or the original String if {@code shift == 0}, or {@code null} if null String input.
+     * @param str   the String to rotate, may be null
+     * @param shift number of time to shift (positive : right shift, negative : left shift)
+     * @return the rotated String, or the original String if {@code shift == 0}, or {@code null} if null String input
      * @since 3.5
      */
     public static String rotate(final String str, final int shift) {
@@ -7054,8 +7054,8 @@ public static String rotate(final String str, final int shift) {
      * StringUtils.split(" abc ")    = ["abc"]
      * </pre>
      *
-     * @param str the String to parse, may be null.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str the String to parse, may be null
+     * @return an array of parsed Strings, {@code null} if null String input
      */
     public static String[] split(final String str) {
         return split(str, null, -1);
@@ -7082,9 +7082,9 @@ public static String[] split(final String str) {
      * StringUtils.split("a b c", ' ')    = ["a", "b", "c"]
      * </pre>
      *
-     * @param str           the String to parse, may be null.
-     * @param separatorChar the character used as the delimiter.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str           the String to parse, may be null
+     * @param separatorChar the character used as the delimiter
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.0
      */
     public static String[] split(final String str, final char separatorChar) {
@@ -7112,9 +7112,9 @@ public static String[] split(final String str, final char separatorChar) {
      * StringUtils.split("ab:cd:ef", ":") = ["ab", "cd", "ef"]
      * </pre>
      *
-     * @param str            the String to parse, may be null.
-     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str            the String to parse, may be null
+     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace
+     * @return an array of parsed Strings, {@code null} if null String input
      */
     public static String[] split(final String str, final String separatorChars) {
         return splitWorker(str, separatorChars, -1, false);
@@ -7145,10 +7145,10 @@ public static String[] split(final String str, final String separatorChars) {
      * StringUtils.split("ab:cd:ef", ":", 2)    = ["ab", "cd:ef"]
      * </pre>
      *
-     * @param str            the String to parse, may be null.
-     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace.
+     * @param str            the String to parse, may be null
+     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace
      * @param max            the maximum number of elements to include in the array. A zero or negative value implies no limit.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @return an array of parsed Strings, {@code null} if null String input
      */
     public static String[] split(final String str, final String separatorChars, final int max) {
         return splitWorker(str, separatorChars, max, false);
@@ -7170,8 +7170,8 @@ public static String[] split(final String str, final String separatorChars, fina
      * StringUtils.splitByCharacterType("ASFRules")   = ["ASFR", "ules"]
      * </pre>
      *
-     * @param str the String to split, may be {@code null}.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str the String to split, may be {@code null}
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.4
      */
     public static String[] splitByCharacterType(final String str) {
@@ -7184,9 +7184,9 @@ public static String[] splitByCharacterType(final String str) {
      * immediately preceding a token of type {@code Character.LOWERCASE_LETTER} will belong to the following token rather than to the preceding, if any,
      * {@code Character.UPPERCASE_LETTER} token.
      *
-     * @param str       the String to split, may be {@code null}.
-     * @param camelCase whether to use so-called "camel-case" for letter types.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str       the String to split, may be {@code null}
+     * @param camelCase whether to use so-called "camel-case" for letter types
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.4
      */
     private static String[] splitByCharacterType(final String str, final boolean camelCase) {
@@ -7238,8 +7238,8 @@ private static String[] splitByCharacterType(final String str, final boolean cam
      * StringUtils.splitByCharacterTypeCamelCase("ASFRules")   = ["ASF", "Rules"]
      * </pre>
      *
-     * @param str the String to split, may be {@code null}.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str the String to split, may be {@code null}
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.4
      */
     public static String[] splitByCharacterTypeCamelCase(final String str) {
@@ -7266,9 +7266,9 @@ public static String[] splitByCharacterTypeCamelCase(final String str) {
      * StringUtils.splitByWholeSeparator("ab-!-cd-!-ef", "-!-") = ["ab", "cd", "ef"]
      * </pre>
      *
-     * @param str       the String to parse, may be null.
-     * @param separator String containing the String to be used as a delimiter, {@code null} splits on whitespace.
-     * @return an array of parsed Strings, {@code null} if null String was input.
+     * @param str       the String to parse, may be null
+     * @param separator string containing the String to be used as a delimiter, {@code null} splits on whitespace
+     * @return an array of parsed Strings, {@code null} if null String was input
      */
     public static String[] splitByWholeSeparator(final String str, final String separator) {
         return splitByWholeSeparatorWorker(str, separator, -1, false);
@@ -7295,10 +7295,10 @@ public static String[] splitByWholeSeparator(final String str, final String sepa
      * StringUtils.splitByWholeSeparator("ab-!-cd-!-ef", "-!-", 2) = ["ab", "cd-!-ef"]
      * </pre>
      *
-     * @param str       the String to parse, may be null.
-     * @param separator String containing the String to be used as a delimiter, {@code null} splits on whitespace.
+     * @param str       the String to parse, may be null
+     * @param separator string containing the String to be used as a delimiter, {@code null} splits on whitespace
      * @param max       the maximum number of elements to include in the returned array. A zero or negative value implies no limit.
-     * @return an array of parsed Strings, {@code null} if null String was input.
+     * @return an array of parsed Strings, {@code null} if null String was input
      */
     public static String[] splitByWholeSeparator(final String str, final String separator, final int max) {
         return splitByWholeSeparatorWorker(str, separator, max, false);
@@ -7325,9 +7325,9 @@ public static String[] splitByWholeSeparator(final String str, final String sepa
      * StringUtils.splitByWholeSeparatorPreserveAllTokens("ab-!-cd-!-ef", "-!-") = ["ab", "cd", "ef"]
      * </pre>
      *
-     * @param str       the String to parse, may be null.
-     * @param separator String containing the String to be used as a delimiter, {@code null} splits on whitespace.
-     * @return an array of parsed Strings, {@code null} if null String was input.
+     * @param str       the String to parse, may be null
+     * @param separator string containing the String to be used as a delimiter, {@code null} splits on whitespace
+     * @return an array of parsed Strings, {@code null} if null String was input
      * @since 2.4
      */
     public static String[] splitByWholeSeparatorPreserveAllTokens(final String str, final String separator) {
@@ -7356,10 +7356,10 @@ public static String[] splitByWholeSeparatorPreserveAllTokens(final String str,
      * StringUtils.splitByWholeSeparatorPreserveAllTokens("ab-!-cd-!-ef", "-!-", 2) = ["ab", "cd-!-ef"]
      * </pre>
      *
-     * @param str       the String to parse, may be null.
-     * @param separator String containing the String to be used as a delimiter, {@code null} splits on whitespace.
+     * @param str       the String to parse, may be null
+     * @param separator string containing the String to be used as a delimiter, {@code null} splits on whitespace
      * @param max       the maximum number of elements to include in the returned array. A zero or negative value implies no limit.
-     * @return an array of parsed Strings, {@code null} if null String was input.
+     * @return an array of parsed Strings, {@code null} if null String was input
      * @since 2.4
      */
     public static String[] splitByWholeSeparatorPreserveAllTokens(final String str, final String separator, final int max) {
@@ -7369,12 +7369,12 @@ public static String[] splitByWholeSeparatorPreserveAllTokens(final String str,
     /**
      * Performs the logic for the {@code splitByWholeSeparatorPreserveAllTokens} methods.
      *
-     * @param str               the String to parse, may be {@code null}.
-     * @param separator         String containing the String to be used as a delimiter, {@code null} splits on whitespace.
+     * @param str               the String to parse, may be {@code null}
+     * @param separator         string containing the String to be used as a delimiter, {@code null} splits on whitespace
      * @param max               the maximum number of elements to include in the returned array. A zero or negative value implies no limit.
      * @param preserveAllTokens if {@code true}, adjacent separators are treated as empty token separators; if {@code false}, adjacent separators are treated as
-     *                          one separator.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     *                          one separator
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.4
      */
     private static String[] splitByWholeSeparatorWorker(final String str, final String separator, final int max, final boolean preserveAllTokens) {
@@ -7454,8 +7454,8 @@ private static String[] splitByWholeSeparatorWorker(final String str, final Stri
      * StringUtils.splitPreserveAllTokens(" abc ")    = ["", "abc", ""]
      * </pre>
      *
-     * @param str the String to parse, may be {@code null}.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str the String to parse, may be {@code null}
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.1
      */
     public static String[] splitPreserveAllTokens(final String str) {
@@ -7490,9 +7490,9 @@ public static String[] splitPreserveAllTokens(final String str) {
      * StringUtils.splitPreserveAllTokens(" a b c ", ' ')  = ["", "a", "b", "c", ""]
      * </pre>
      *
-     * @param str           the String to parse, may be {@code null}.
-     * @param separatorChar the character used as the delimiter, {@code null} splits on whitespace.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str           the String to parse, may be {@code null}
+     * @param separatorChar the character used as the delimiter, {@code null} splits on whitespace
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.1
      */
     public static String[] splitPreserveAllTokens(final String str, final char separatorChar) {
@@ -7527,9 +7527,9 @@ public static String[] splitPreserveAllTokens(final String str, final char separ
      * StringUtils.splitPreserveAllTokens(":cd:ef:", ":")    = ["", "cd", "ef", ""]
      * </pre>
      *
-     * @param str            the String to parse, may be {@code null}.
-     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @param str            the String to parse, may be {@code null}
+     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.1
      */
     public static String[] splitPreserveAllTokens(final String str, final String separatorChars) {
@@ -7566,10 +7566,10 @@ public static String[] splitPreserveAllTokens(final String str, final String sep
      * StringUtils.splitPreserveAllTokens("ab   de fg", null, 4) = ["ab", "", "", "de fg"]
      * </pre>
      *
-     * @param str            the String to parse, may be {@code null}.
-     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace.
+     * @param str            the String to parse, may be {@code null}
+     * @param separatorChars the characters used as the delimiters, {@code null} splits on whitespace
      * @param max            the maximum number of elements to include in the array. A zero or negative value implies no limit.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     * @return an array of parsed Strings, {@code null} if null String input
      * @since 2.1
      */
     public static String[] splitPreserveAllTokens(final String str, final String separatorChars, final int max) {
@@ -7579,11 +7579,11 @@ public static String[] splitPreserveAllTokens(final String str, final String sep
     /**
      * Performs the logic for the {@code split} and {@code splitPreserveAllTokens} methods that do not return a maximum array length.
      *
-     * @param str               the String to parse, may be {@code null}.
-     * @param separatorChar     the separate character.
+     * @param str               the String to parse, may be {@code null}
+     * @param separatorChar     the separate character
      * @param preserveAllTokens if {@code true}, adjacent separators are treated as empty token separators; if {@code false}, adjacent separators are treated as
-     *                          one separator.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     *                          one separator
+     * @return an array of parsed Strings, {@code null} if null String input
      */
     private static String[] splitWorker(final String str, final char separatorChar, final boolean preserveAllTokens) {
         // Performance tuned for 2.0 (JDK1.4)
@@ -7622,12 +7622,12 @@ private static String[] splitWorker(final String str, final char separatorChar,
     /**
      * Performs the logic for the {@code split} and {@code splitPreserveAllTokens} methods that return a maximum array length.
      *
-     * @param str               the String to parse, may be {@code null}.
-     * @param separatorChars    the separate character.
+     * @param str               the String to parse, may be {@code null}
+     * @param separatorChars    the separate character
      * @param max               the maximum number of elements to include in the array. A zero or negative value implies no limit.
      * @param preserveAllTokens if {@code true}, adjacent separators are treated as empty token separators; if {@code false}, adjacent separators are treated as
-     *                          one separator.
-     * @return an array of parsed Strings, {@code null} if null String input.
+     *                          one separator
+     * @return an array of parsed Strings, {@code null} if null String input
      */
     private static String[] splitWorker(final String str, final String separatorChars, final int max, final boolean preserveAllTokens) {
         // Performance tuned for 2.0 (JDK1.4)
@@ -7729,9 +7729,9 @@ private static String[] splitWorker(final String str, final String separatorChar
      * StringUtils.startsWith("ABCDEF", "abc") = false
      * </pre>
      *
-     * @param str    the CharSequence to check, may be null.
-     * @param prefix the prefix to find, may be null.
-     * @return {@code true} if the CharSequence starts with the prefix, case-sensitive, or both {@code null}.
+     * @param str    the CharSequence to check, may be null
+     * @param prefix the prefix to find, may be null
+     * @return {@code true} if the CharSequence starts with the prefix, case-sensitive, or both {@code null}
      * @see String#startsWith(String)
      * @since 2.4
      * @since 3.0 Changed signature from startsWith(String, String) to startsWith(CharSequence, CharSequence)
@@ -7756,10 +7756,10 @@ public static boolean startsWith(final CharSequence str, final CharSequence pref
      * StringUtils.startsWithAny("ABCXYZ", null, "xyz", "abc") = false
      * </pre>
      *
-     * @param sequence      the CharSequence to check, may be null.
-     * @param searchStrings the case-sensitive CharSequence prefixes, may be empty or contain {@code null}.
+     * @param sequence      the CharSequence to check, may be null
+     * @param searchStrings the case-sensitive CharSequence prefixes, may be empty or contain {@code null}
      * @return {@code true} if the input {@code sequence} is {@code null} AND no {@code searchStrings} are provided, or the input {@code sequence} begins with
-     *         any of the provided case-sensitive {@code searchStrings}.
+     *         any of the provided case-sensitive {@code searchStrings}
      * @see StringUtils#startsWith(CharSequence, CharSequence)
      * @since 2.5
      * @since 3.0 Changed signature from startsWithAny(String, String[]) to startsWithAny(CharSequence, CharSequence...)
@@ -7785,9 +7785,9 @@ public static boolean startsWithAny(final CharSequence sequence, final CharSeque
      * StringUtils.startsWithIgnoreCase("ABCDEF", "abc") = true
      * </pre>
      *
-     * @param str    the CharSequence to check, may be null.
-     * @param prefix the prefix to find, may be null.
-     * @return {@code true} if the CharSequence starts with the prefix, case-insensitive, or both {@code null}.
+     * @param str    the CharSequence to check, may be null
+     * @param prefix the prefix to find, may be null
+     * @return {@code true} if the CharSequence starts with the prefix, case-insensitive, or both {@code null}
      * @see String#startsWith(String)
      * @since 2.4
      * @since 3.0 Changed signature from startsWithIgnoreCase(String, String) to startsWithIgnoreCase(CharSequence, CharSequence)
@@ -7820,8 +7820,8 @@ public static boolean startsWithIgnoreCase(final CharSequence str, final CharSeq
      * StringUtils.strip(" ab c ") = "ab c"
      * </pre>
      *
-     * @param str the String to remove whitespace from, may be null.
-     * @return the stripped String, {@code null} if null String input.
+     * @param str the String to remove whitespace from, may be null
+     * @return the stripped String, {@code null} if null String input
      */
     public static String strip(final String str) {
         return strip(str, null);
@@ -7850,9 +7850,9 @@ public static String strip(final String str) {
      * StringUtils.strip("  abcyx", "xyz") = "  abc"
      * </pre>
      *
-     * @param str        the String to remove characters from, may be null.
-     * @param stripChars the characters to remove, null treated as whitespace.
-     * @return the stripped String, {@code null} if null String input.
+     * @param str        the String to remove characters from, may be null
+     * @param stripChars the characters to remove, null treated as whitespace
+     * @return the stripped String, {@code null} if null String input
      */
     public static String strip(String str, final String stripChars) {
         str = stripStart(str, stripChars);
@@ -7880,8 +7880,8 @@ public static String strip(String str, final String stripChars) {
      * See also <a href="https://www.unicode.org/unicode/reports/tr15/tr15-23.html">Unicode Standard Annex #15 Unicode Normalization Forms</a>.
      * </p>
      *
-     * @param input String to be stripped.
-     * @return input text with diacritics removed.
+     * @param input string to be stripped
+     * @return input text with diacritics removed
      * @since 3.0
      */
     // See also Lucene's ASCIIFoldingFilter (Lucene 2.9) that replaces accented characters by their unaccented equivalent (and uncommitted bug fix:
@@ -7910,8 +7910,8 @@ public static String stripAccents(final String input) {
      * StringUtils.stripAll(["abc  ", null])  = ["abc", null]
      * </pre>
      *
-     * @param strs the array to remove whitespace from, may be null.
-     * @return the stripped Strings, {@code null} if null array input.
+     * @param strs the array to remove whitespace from, may be null
+     * @return the stripped Strings, {@code null} if null array input
      */
     public static String[] stripAll(final String... strs) {
         return stripAll(strs, null);
@@ -7937,9 +7937,9 @@ public static String[] stripAll(final String... strs) {
      * StringUtils.stripAll(["yabcz", null], "yz")  = ["abc", null]
      * </pre>
      *
-     * @param strs       the array to remove characters from, may be null.
-     * @param stripChars the characters to remove, null treated as whitespace.
-     * @return the stripped Strings, {@code null} if null array input.
+     * @param strs       the array to remove characters from, may be null
+     * @param stripChars the characters to remove, null treated as whitespace
+     * @return the stripped Strings, {@code null} if null array input
      */
     public static String[] stripAll(final String[] strs, final String stripChars) {
         final int strsLen = ArrayUtils.getLength(strs);
@@ -7972,9 +7972,9 @@ public static String[] stripAll(final String[] strs, final String stripChars) {
      * StringUtils.stripEnd("120.00", ".0")   = "12"
      * </pre>
      *
-     * @param str        the String to remove characters from, may be null.
-     * @param stripChars the set of characters to remove, null treated as whitespace.
-     * @return the stripped String, {@code null} if null String input.
+     * @param str        the String to remove characters from, may be null
+     * @param stripChars the set of characters to remove, null treated as whitespace
+     * @return the stripped String, {@code null} if null String input
      */
     public static String stripEnd(final String str, final String stripChars) {
         int end = length(str);
@@ -8017,9 +8017,9 @@ public static String stripEnd(final String str, final String stripChars) {
      * StringUtils.stripStart("yxabc  ", "xyz") = "abc  "
      * </pre>
      *
-     * @param str        the String to remove characters from, may be null.
-     * @param stripChars the characters to remove, null treated as whitespace.
-     * @return the stripped String, {@code null} if null String input.
+     * @param str        the String to remove characters from, may be null
+     * @param stripChars the characters to remove, null treated as whitespace
+     * @return the stripped String, {@code null} if null String input
      */
     public static String stripStart(final String str, final String stripChars) {
         final int strLen = length(str);
@@ -8059,8 +8059,8 @@ public static String stripStart(final String str, final String stripChars) {
      * StringUtils.stripToEmpty(" ab c ") = "ab c"
      * </pre>
      *
-     * @param str the String to be stripped, may be null.
-     * @return the trimmed String, or an empty String if {@code null} input.
+     * @param str the String to be stripped, may be null
+     * @return the trimmed String, or an empty String if {@code null} input
      * @since 2.0
      */
     public static String stripToEmpty(final String str) {
@@ -8085,8 +8085,8 @@ public static String stripToEmpty(final String str) {
      * StringUtils.stripToNull(" ab c ") = "ab c"
      * </pre>
      *
-     * @param str the String to be stripped, may be null.
-     * @return the stripped String, {@code null} if whitespace, empty or null String input.
+     * @param str the String to be stripped, may be null
+     * @return the stripped String, {@code null} if whitespace, empty or null String input
      * @since 2.0
      */
     public static String stripToNull(String str) {
@@ -8118,9 +8118,9 @@ public static String stripToNull(String str) {
      * StringUtils.substring("abc", -4) = "abc"
      * </pre>
      *
-     * @param str   the String to get the substring from, may be null.
-     * @param start the position to start from, negative means count back from the end of the String by this many characters.
-     * @return substring from start position, {@code null} if null String input.
+     * @param str   the String to get the substring from, may be null
+     * @param start the position to start from, negative means count back from the end of the String by this many characters
+     * @return substring from start position, {@code null} if null String input
      */
     public static String substring(final String str, int start) {
         if (str == null) {
@@ -8168,10 +8168,10 @@ public static String substring(final String str, int start) {
      * StringUtils.substring("abc", -4, 2)  = "ab"
      * </pre>
      *
-     * @param str   the String to get the substring from, may be null.
-     * @param start the position to start from, negative means count back from the end of the String by this many characters.
-     * @param end   the position to end at (exclusive), negative means count back from the end of the String by this many characters.
-     * @return substring from start position to end position, {@code null} if null String input.
+     * @param str   the String to get the substring from, may be null
+     * @param start the position to start from, negative means count back from the end of the String by this many characters
+     * @param end   the position to end at (exclusive), negative means count back from the end of the String by this many characters
+     * @return substring from start position to end position, {@code null} if null String input
      */
     public static String substring(final String str, int start, int end) {
         if (str == null) {
@@ -8222,9 +8222,9 @@ public static String substring(final String str, int start, int end) {
      * StringUtils.substringAfter(" abc", 32)   = "abc"
      * </pre>
      *
-     * @param str       the String to get a substring from, may be null.
-     * @param find the character (Unicode code point) to find.
-     * @return the substring after the first occurrence of the specified character, {@code null} if null String input.
+     * @param str       the String to get a substring from, may be null
+     * @param find the character (Unicode code point) to find
+     * @return the substring after the first occurrence of the specified character, {@code null} if null String input
      * @since 3.11
      */
     public static String substringAfter(final String str, final int find) {
@@ -8261,9 +8261,9 @@ public static String substringAfter(final String str, final int find) {
      * StringUtils.substringAfter("abc", "")    = "abc"
      * </pre>
      *
-     * @param str       the String to get a substring from, may be null.
-     * @param find the String to find, may be null.
-     * @return the substring after the first occurrence of the specified string, {@code null} if null String input.
+     * @param str       the String to get a substring from, may be null
+     * @param find the String to find, may be null
+     * @return the substring after the first occurrence of the specified string, {@code null} if null String input
      * @since 2.0
      */
     public static String substringAfter(final String str, final String find) {
@@ -8302,9 +8302,9 @@ public static String substringAfter(final String str, final String find) {
      * StringUtils.substringAfterLast("a", 'z')     = ""
      * </pre>
      *
-     * @param str       the String to get a substring from, may be null.
-     * @param find the character (Unicode code point) to find.
-     * @return the substring after the last occurrence of the specified character, {@code null} if null String input.
+     * @param str       the String to get a substring from, may be null
+     * @param find the character (Unicode code point) to find
+     * @return the substring after the last occurrence of the specified character, {@code null} if null String input
      * @since 3.11
      */
     public static String substringAfterLast(final String str, final int find) {
@@ -8342,9 +8342,9 @@ public static String substringAfterLast(final String str, final int find) {
      * StringUtils.substringAfterLast("a", "z")     = ""
      * </pre>
      *
-     * @param str       the String to get a substring from, may be null.
-     * @param find the String to find, may be null.
-     * @return the substring after the last occurrence of the specified string, {@code null} if null String input.
+     * @param str       the String to get a substring from, may be null
+     * @param find the String to find, may be null
+     * @return the substring after the last occurrence of the specified string, {@code null} if null String input
      * @since 2.0
      */
     public static String substringAfterLast(final String str, final String find) {
@@ -8381,9 +8381,9 @@ public static String substringAfterLast(final String str, final String find) {
      * StringUtils.substringBefore("abc", 'd')   = "abc"
      * </pre>
      *
-     * @param str       the String to get a substring from, may be null.
-     * @param find the character (Unicode code point) to find.
-     * @return the substring before the first occurrence of the specified character, {@code null} if null String input.
+     * @param str       the String to get a substring from, may be null
+     * @param find the character (Unicode code point) to find
+     * @return the substring before the first occurrence of the specified character, {@code null} if null String input
      * @since 3.12.0
      */
     public static String substringBefore(final String str, final int find) {
@@ -8420,9 +8420,9 @@ public static String substringBefore(final String str, final int find) {
      * StringUtils.substringBefore("abc", null)  = "abc"
      * </pre>
      *
-     * @param str       the String to get a substring from, may be null.
-     * @param find the String to find, may be null.
-     * @return the substring before the first occurrence of the specified string, {@code null} if null String input.
+     * @param str       the String to get a substring from, may be null
+     * @param find the String to find, may be null
+     * @return the substring before the first occurrence of the specified string, {@code null} if null String input
      * @since 2.0
      */
     public static String substringBefore(final String str, final String find) {
@@ -8462,9 +8462,9 @@ public static String substringBefore(final String str, final String find) {
      * StringUtils.substringBeforeLast("a", "")      = "a"
      * </pre>
      *
-     * @param str       the String to get a substring from, may be null.
-     * @param find the String to find, may be null.
-     * @return the substring before the last occurrence of the specified string, {@code null} if null String input.
+     * @param str       the String to get a substring from, may be null
+     * @param find the String to find, may be null
+     * @return the substring before the last occurrence of the specified string, {@code null} if null String input
      * @since 2.0
      */
     public static String substringBeforeLast(final String str, final String find) {
@@ -8494,9 +8494,9 @@ public static String substringBeforeLast(final String str, final String find) {
      * StringUtils.substringBetween("tagabctag", "tag") = "abc"
      * </pre>
      *
-     * @param str the String containing the substring, may be null.
-     * @param tag the String before and after the substring, may be null.
-     * @return the substring, {@code null} if no match.
+     * @param str the String containing the substring, may be null
+     * @param tag the String before and after the substring, may be null
+     * @return the substring, {@code null} if no match
      * @since 2.0
      */
     public static String substringBetween(final String str, final String tag) {
@@ -8524,10 +8524,10 @@ public static String substringBetween(final String str, final String tag) {
      * StringUtils.substringBetween("yabczyabcz", "y", "z")   = "abc"
      * </pre>
      *
-     * @param str   the String containing the substring, may be null.
-     * @param open  the String before the substring, may be null.
-     * @param close the String after the substring, may be null.
-     * @return the substring, {@code null} if no match.
+     * @param str   the String containing the substring, may be null
+     * @param open  the String before the substring, may be null
+     * @param close the String after the substring, may be null
+     * @return the substring, {@code null} if no match
      * @since 2.0
      */
     public static String substringBetween(final String str, final String open, final String close) {
@@ -8560,10 +8560,10 @@ public static String substringBetween(final String str, final String open, final
      * StringUtils.substringsBetween("", "[", "]")          = []
      * </pre>
      *
-     * @param str   the String containing the substrings, null returns null, empty returns empty.
-     * @param open  the String identifying the start of the substring, empty returns null.
-     * @param close the String identifying the end of the substring, empty returns null.
-     * @return a String Array of substrings, or {@code null} if no match.
+     * @param str   the String containing the substrings, null returns null, empty returns empty
+     * @param open  the String identifying the start of the substring, empty returns null
+     * @param close the String identifying the end of the substring, empty returns null
+     * @return a String Array of substrings, or {@code null} if no match
      * @since 2.3
      */
     public static String[] substringsBetween(final String str, final String open, final String close) {
@@ -8621,8 +8621,8 @@ public static String[] substringsBetween(final String str, final String open, fi
      * functionality is available in org.apache.commons.lang3.text.WordUtils.
      * </p>
      *
-     * @param str the String to swap case, may be null.
-     * @return the changed String, {@code null} if null String input.
+     * @param str the String to swap case, may be null
+     * @return the changed String, {@code null} if null String input
      */
     public static String swapCase(final String str) {
         if (isEmpty(str)) {
@@ -8660,8 +8660,8 @@ public static String swapCase(final String str) {
      * StringUtils.toCodePoints("")     =  []  // empty array
      * </pre>
      *
-     * @param cs the character sequence to convert.
-     * @return an array of code points.
+     * @param cs the character sequence to convert
+     * @return an array of code points
      * @since 3.6
      */
     public static int[] toCodePoints(final CharSequence cs) {
@@ -8677,12 +8677,12 @@ public static int[] toCodePoints(final CharSequence cs) {
     /**
      * Converts a {@code byte[]} to a String using the specified character encoding.
      *
-     * @param bytes   the byte array to read from.
-     * @param charset the encoding to use, if null then use the platform default.
-     * @return a new String.
+     * @param bytes   the byte array to read from
+     * @param charset the encoding to use, if null then use the platform default
+     * @return a new String
      * @throws NullPointerException if {@code bytes} is null
      * @since 3.2
-     * @since 3.3 No longer throws {@link UnsupportedEncodingException}.
+     * @since 3.3 No longer throws {@link UnsupportedEncodingException}
      */
     public static String toEncodedString(final byte[] bytes, final Charset charset) {
         return new String(bytes, Charsets.toCharset(charset));
@@ -8691,8 +8691,8 @@ public static String toEncodedString(final byte[] bytes, final Charset charset)
     /**
      * Converts the given source String as a lower-case using the {@link Locale#ROOT} locale in a null-safe manner.
      *
-     * @param source A source String or null.
-     * @return the given source String as a lower-case using the {@link Locale#ROOT} locale or null.
+     * @param source a source String or null
+     * @return the given source String as a lower-case using the {@link Locale#ROOT} locale or null
      * @since 3.10
      */
     public static String toRootLowerCase(final String source) {
@@ -8702,8 +8702,8 @@ public static String toRootLowerCase(final String source) {
     /**
      * Converts the given source String as an upper-case using the {@link Locale#ROOT} locale in a null-safe manner.
      *
-     * @param source A source String or null.
-     * @return the given source String as an upper-case using the {@link Locale#ROOT} locale or null.
+     * @param source a source String or null
+     * @return the given source String as an upper-case using the {@link Locale#ROOT} locale or null
      * @since 3.10
      */
     public static String toRootUpperCase(final String source) {
@@ -8713,10 +8713,10 @@ public static String toRootUpperCase(final String source) {
     /**
      * Converts a {@code byte[]} to a String using the specified character encoding.
      *
-     * @param bytes       the byte array to read from.
-     * @param charsetName the encoding to use, if null then use the platform default.
-     * @return a new String.
-     * @throws NullPointerException if the input is null.
+     * @param bytes       the byte array to read from
+     * @param charsetName the encoding to use, if null then use the platform default
+     * @return a new String
+     * @throws NullPointerException if the input is null
      * @since 3.1
      * @deprecated Use {@link StringUtils#toEncodedString(byte[], Charset)} instead of String constants in your code.
      */
@@ -8744,8 +8744,8 @@ public static String toString(final byte[] bytes, final String charsetName) {
      * StringUtils.trim("    abc    ") = "abc"
      * </pre>
      *
-     * @param str the String to be trimmed, may be null.
-     * @return the trimmed string, {@code null} if null String input.
+     * @param str the String to be trimmed, may be null
+     * @return the trimmed string, {@code null} if null String input
      */
     public static String trim(final String str) {
         return str == null ? null : str.trim();
@@ -8767,8 +8767,8 @@ public static String trim(final String str) {
      * StringUtils.trimToEmpty("    abc    ") = "abc"
      * </pre>
      *
-     * @param str the String to be trimmed, may be null.
-     * @return the trimmed String, or an empty String if {@code null} input.
+     * @param str the String to be trimmed, may be null
+     * @return the trimmed String, or an empty String if {@code null} input
      * @since 2.0
      */
     public static String trimToEmpty(final String str) {
@@ -8791,8 +8791,8 @@ public static String trimToEmpty(final String str) {
      * StringUtils.trimToNull("    abc    ") = "abc"
      * </pre>
      *
-     * @param str the String to be trimmed, may be null.
-     * @return the trimmed String, {@code null} if only chars &lt;= 32, empty or null String input.
+     * @param str the String to be trimmed, may be null
+     * @return the trimmed String, {@code null} if only chars &lt;= 32, empty or null String input
      * @since 2.0
      */
     public static String trimToNull(final String str) {
@@ -8824,10 +8824,10 @@ public static String trimToNull(final String str) {
      * StringUtils.truncate("abcdefg", -1) = throws an IllegalArgumentException
      * </pre>
      *
-     * @param str      the String to truncate, may be null.
-     * @param maxWidth maximum length of result String, must be non-negative.
-     * @return truncated String, {@code null} if null String input.
-     * @throws IllegalArgumentException If {@code maxWidth} is less than {@code 0}.
+     * @param str      the String to truncate, may be null
+     * @param maxWidth maximum length of result String, must be non-negative
+     * @return truncated String, {@code null} if null String input
+     * @throws IllegalArgumentException if {@code maxWidth} is less than {@code 0}
      * @since 3.5
      */
     public static String truncate(final String str, final int maxWidth) {
@@ -8885,11 +8885,11 @@ public static String truncate(final String str, final int maxWidth) {
      * StringUtils.truncate("abcdefghij", -2, 4) = throws an IllegalArgumentException
      * </pre>
      *
-     * @param str      the String to truncate, may be null.
-     * @param offset   left edge of source String.
-     * @param maxWidth maximum length of result String, must be non-negative.
-     * @return truncated String, {@code null} if null String input.
-     * @throws IllegalArgumentException If {@code offset} or {@code maxWidth} is less than {@code 0}.
+     * @param str      the String to truncate, may be null
+     * @param offset   left edge of source String
+     * @param maxWidth maximum length of result String, must be non-negative
+     * @return truncated String, {@code null} if null String input
+     * @throws IllegalArgumentException if {@code offset} or {@code maxWidth} is less than {@code 0}
      * @since 3.5
      */
     public static String truncate(final String str, final int offset, final int maxWidth) {
@@ -8923,8 +8923,8 @@ public static String truncate(final String str, final int offset, final int maxW
      * StringUtils.uncapitalize("CAT") = "cAT"
      * </pre>
      *
-     * @param str the String to uncapitalize, may be null.
-     * @return the uncapitalized String, {@code null} if null String input.
+     * @param str the String to uncapitalize, may be null
+     * @return the uncapitalized String, {@code null} if null String input
      * @see org.apache.commons.text.WordUtils#uncapitalize(String)
      * @see #capitalize(String)
      * @since 2.0
@@ -8961,9 +8961,9 @@ public static String uncapitalize(final String str) {
      * StringUtils.unwrap("A#", '#')          = "A#"
      * </pre>
      *
-     * @param str      the String to be unwrapped, can be null.
-     * @param wrapChar the character used to unwrap.
-     * @return unwrapped String or the original string if it is not quoted properly with the wrapChar.
+     * @param str      the String to be unwrapped, can be null
+     * @param wrapChar the character used to unwrap
+     * @return unwrapped String or the original string if it is not quoted properly with the wrapChar
      * @since 3.6
      */
     public static String unwrap(final String str, final char wrapChar) {
@@ -8995,9 +8995,9 @@ public static String unwrap(final String str, final char wrapChar) {
      * StringUtils.unwrap("A#", "#")          = "A#"
      * </pre>
      *
-     * @param str       the String to be unwrapped, can be null.
-     * @param wrapToken the String used to unwrap.
-     * @return unwrapped String or the original string if it is not quoted properly with the wrapToken.
+     * @param str       the String to be unwrapped, can be null
+     * @param wrapToken the String used to unwrap
+     * @return unwrapped String or the original string if it is not quoted properly with the wrapToken
      * @since 3.6
      */
     public static String unwrap(final String str, final String wrapToken) {
@@ -9029,8 +9029,8 @@ public static String unwrap(final String str, final String wrapToken) {
      * {@link Locale#ENGLISH}).
      * </p>
      *
-     * @param str the String to upper case, may be null.
-     * @return the upper-cased String, {@code null} if null String input.
+     * @param str the String to upper case, may be null
+     * @return the upper-cased String, {@code null} if null String input
      */
     public static String upperCase(final String str) {
         if (str == null) {
@@ -9052,9 +9052,9 @@ public static String upperCase(final String str) {
      * StringUtils.upperCase("aBc", Locale.ENGLISH) = "ABC"
      * </pre>
      *
-     * @param str    the String to upper case, may be null.
-     * @param locale the locale that defines the case transformation rules, must not be null.
-     * @return the upper-cased String, {@code null} if null String input.
+     * @param str    the String to upper case, may be null
+     * @param locale the locale that defines the case transformation rules, must not be null
+     * @return the upper-cased String, {@code null} if null String input
      * @since 2.5
      */
     public static String upperCase(final String str, final Locale locale) {
@@ -9067,8 +9067,8 @@ public static String upperCase(final String str, final Locale locale) {
     /**
      * Returns the string representation of the {@code char} array or null.
      *
-     * @param value the character array.
-     * @return a String or null.
+     * @param value the character array
+     * @return a String or null
      * @see String#valueOf(char[])
      * @since 3.9
      */
@@ -9088,9 +9088,9 @@ public static String valueOf(final char[] value) {
      * StringUtils.wrap("\"ab\"", '\"') = "\"\"ab\"\""
      * </pre>
      *
-     * @param str      the string to be wrapped, may be {@code null}.
-     * @param wrapWith the char that will wrap {@code str}.
-     * @return the wrapped string, or {@code null} if {@code str == null}.
+     * @param str      the string to be wrapped, may be {@code null}
+     * @param wrapWith the char that will wrap {@code str}
+     * @return the wrapped string, or {@code null} if {@code str == null}
      * @since 3.4
      */
     public static String wrap(final String str, final char wrapWith) {
@@ -9120,9 +9120,9 @@ public static String wrap(final String str, final char wrapWith) {
      * StringUtils.wrap("'abcd'", "\"")  = "\"'abcd'\""
      * </pre>
      *
-     * @param str      the String to be wrapper, may be null.
-     * @param wrapWith the String that will wrap str.
-     * @return wrapped String, {@code null} if null String input.
+     * @param str      the String to be wrapper, may be null
+     * @param wrapWith the String that will wrap str
+     * @return wrapped String, {@code null} if null String input
      * @since 3.4
      */
     public static String wrap(final String str, final String wrapWith) {
@@ -9152,9 +9152,9 @@ public static String wrap(final String str, final String wrapWith) {
      * StringUtils.wrapIfMissing("a/b/c/", '/')  = "/a/b/c/"
      * </pre>
      *
-     * @param str      the string to be wrapped, may be {@code null}.
-     * @param wrapWith the char that will wrap {@code str}.
-     * @return the wrapped string, or {@code null} if {@code str == null}.
+     * @param str      the string to be wrapped, may be {@code null}
+     * @param wrapWith the char that will wrap {@code str}
+     * @return the wrapped string, or {@code null} if {@code str == null}
      * @since 3.5
      */
     public static String wrapIfMissing(final String str, final char wrapWith) {
@@ -9201,9 +9201,9 @@ public static String wrapIfMissing(final String str, final char wrapWith) {
      * StringUtils.wrapIfMissing("a/b/c/", "/")  = "/a/b/c/"
      * </pre>
      *
-     * @param str      the string to be wrapped, may be {@code null}.
-     * @param wrapWith the string that will wrap {@code str}.
-     * @return the wrapped string, or {@code null} if {@code str == null}.
+     * @param str      the string to be wrapped, may be {@code null}
+     * @param wrapWith the string that will wrap {@code str}
+     * @return the wrapped string, or {@code null} if {@code str == null}
      * @since 3.5
      */
     public static String wrapIfMissing(final String str, final String wrapWith) {
diff --git a/src/main/java/org/apache/commons/lang3/Strings.java b/src/main/java/org/apache/commons/lang3/Strings.java
index ad724e560c7..c2d537fbb5b 100644
--- a/src/main/java/org/apache/commons/lang3/Strings.java
+++ b/src/main/java/org/apache/commons/lang3/Strings.java
@@ -64,8 +64,8 @@ public Strings get() {
         /**
          * Sets the ignoreCase property for new Strings instances.
          *
-         * @param ignoreCase the ignoreCase property for new Strings instances.
-         * @return {@code this} instance.
+         * @param ignoreCase the ignoreCase property for new Strings instances
+         * @return {@code this} instance
          */
         public Builder setIgnoreCase(final boolean ignoreCase) {
             this.ignoreCase = ignoreCase;
@@ -75,8 +75,8 @@ public Builder setIgnoreCase(final boolean ignoreCase) {
         /**
          * Sets the nullIsLess property for new Strings instances.
          *
-         * @param nullIsLess the nullIsLess property for new Strings instances.
-         * @return {@code this} instance.
+         * @param nullIsLess the nullIsLess property for new Strings instances
+         * @return {@code this} instance
          */
         public Builder setNullIsLess(final boolean nullIsLess) {
             this.nullIsLess = nullIsLess;
@@ -275,7 +275,7 @@ public int lastIndexOf(final CharSequence seq, final CharSequence searchSeq, fin
     /**
      * Constructs a new {@link Builder} instance.
      *
-     * @return a new {@link Builder} instance.
+     * @return a new {@link Builder} instance
      */
     public static final Builder builder() {
         return new Builder();
@@ -288,8 +288,8 @@ public static final Builder builder() {
      * A {@code null} {@code cs} CharSequence will return {@code false}. A {@code null} or zero length search array will return {@code false}.
      * </p>
      *
-     * @param cs                  The CharSequence to check, may be null
-     * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be null as well.
+     * @param cs                  the CharSequence to check, may be null
+     * @param searchCharSequences the array of CharSequences to search for, may be null. Individual CharSequences may be null as well.
      * @return {@code true} if any of the search CharSequences are found, {@code false} otherwise
      */
     private static boolean containsAny(final ToBooleanBiFunction<CharSequence, CharSequence> test, final CharSequence cs,
@@ -327,8 +327,8 @@ private static boolean eq(final Object o1, final Object o2) {
     /**
      * Constructs a new instance.
      *
-     * @param ignoreCase Ignores case when possible.
-     * @param nullIsLess Compares null as less when possible.
+     * @param ignoreCase ignores case when possible
+     * @param nullIsLess compares null as less when possible
      */
     private Strings(final boolean ignoreCase, final boolean nullIsLess) {
         this.ignoreCase = ignoreCase;
@@ -396,10 +396,10 @@ private Strings(final boolean ignoreCase, final boolean nullIsLess) {
      * Strings.CI.appendIfMissing("abcMNO", "xyz", "mno") = "abcMNO"
      * </pre>
      *
-     * @param str      The string.
-     * @param suffix   The suffix to append to the end of the string.
-     * @param suffixes Additional suffixes that are valid terminators (optional).
-     * @return A new String if suffix was appended, the same string otherwise.
+     * @param str      the string
+     * @param suffix   the suffix to append to the end of the string
+     * @param suffixes additional suffixes that are valid terminators (optional)
+     * @return a new String if suffix was appended, the same string otherwise
      */
     public String appendIfMissing(final String str, final CharSequence suffix, final CharSequence... suffixes) {
         if (str == null || StringUtils.isEmpty(suffix) || endsWith(str, suffix)) {
@@ -469,10 +469,10 @@ public String appendIfMissing(final String str, final CharSequence suffix, final
      * Strings.CI.compare("ab", "ABC")  < 0
      * }</pre>
      *
-     * @see String#compareTo(String)
      * @param str1 the String to compare from
      * @param str2 the String to compare to
      * @return &lt; 0, 0, &gt; 0, if {@code str1} is respectively less, equal or greater than {@code str2}
+     * @see String#compareTo(String)
      */
     public abstract int compare(String str1, String str2);
 
@@ -552,8 +552,8 @@ public String appendIfMissing(final String str, final CharSequence suffix, final
      * Strings.CI.containsAny("ABC", "d", "abc")  = true
      * </pre>
      *
-     * @param cs                  The CharSequence to check, may be null
-     * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be null as well.
+     * @param cs                  the CharSequence to check, may be null
+     * @param searchCharSequences the array of CharSequences to search for, may be null. Individual CharSequences may be null as well.
      * @return {@code true} if any of the search CharSequences are found, {@code false} otherwise
      */
     public boolean containsAny(final CharSequence cs, final CharSequence... searchCharSequences) {
@@ -590,9 +590,9 @@ public boolean containsAny(final CharSequence cs, final CharSequence... searchCh
      * Strings.CI.endsWith("ABCDEF", "cde") = false
      * </pre>
      *
-     * @param str    the CharSequence to check, may be null.
-     * @param suffix the suffix to find, may be null.
-     * @return {@code true} if the CharSequence starts with the prefix or both {@code null}.
+     * @param str    the CharSequence to check, may be null
+     * @param suffix the suffix to find, may be null
+     * @return {@code true} if the CharSequence starts with the prefix or both {@code null}
      * @see String#endsWith(String)
      */
     public boolean endsWith(final CharSequence str, final CharSequence suffix) {
@@ -626,9 +626,9 @@ public boolean endsWith(final CharSequence str, final CharSequence suffix) {
      *
      * @param sequence      the CharSequence to check, may be null
      * @param searchStrings the CharSequence suffixes to find, may be empty or contain {@code null}
-     * @see Strings#endsWith(CharSequence, CharSequence)
      * @return {@code true} if the input {@code sequence} is {@code null} AND no {@code searchStrings} are provided, or the input {@code sequence} ends in any
-     *         of the provided {@code searchStrings}.
+     *         of the provided {@code searchStrings}
+     * @see Strings#endsWith(CharSequence, CharSequence)
      */
     public boolean endsWithAny(final CharSequence sequence, final CharSequence... searchStrings) {
         if (StringUtils.isEmpty(sequence) || ArrayUtils.isEmpty(searchStrings)) {
@@ -749,10 +749,10 @@ public boolean endsWithAny(final CharSequence sequence, final CharSequence... se
      * Strings.CI.equalsAny("abc", "ABC", "DEF") = true
      * </pre>
      *
-     * @param string        to compare, may be {@code null}.
-     * @param searchStrings a vararg of strings, may be {@code null}.
+     * @param string        to compare, may be {@code null}
+     * @param searchStrings a vararg of strings, may be {@code null}
      * @return {@code true} if the string is equal (case-sensitive) to any other element of {@code searchStrings}; {@code false} if {@code searchStrings} is
-     *         null or contains no matches.
+     *         null or contains no matches
      */
     public boolean equalsAny(final CharSequence string, final CharSequence... searchStrings) {
         if (ArrayUtils.isNotEmpty(searchStrings)) {
@@ -862,7 +862,7 @@ public int indexOf(final CharSequence seq, final CharSequence searchSeq) {
     /**
      * Tests whether to ignore case.
      *
-     * @return whether to ignore case.
+     * @return whether to ignore case
      */
     public boolean isCaseSensitive() {
         return !ignoreCase;
@@ -871,7 +871,7 @@ public boolean isCaseSensitive() {
     /**
      * Tests whether null is less when comparing.
      *
-     * @return whether null is less when comparing.
+     * @return whether null is less when comparing
      */
     boolean isNullIsLess() {
         return nullIsLess;
@@ -1031,10 +1031,10 @@ public int lastIndexOf(final CharSequence str, final CharSequence searchStr) {
      * Strings.CI.prependIfMissing("MNOabc", "xyz", "mno") = "MNOabc"
      * </pre>
      *
-     * @param str      The string.
-     * @param prefix   The prefix to prepend to the start of the string.
-     * @param prefixes Additional prefixes that are valid.
-     * @return A new String if prefix was prepended, the same string otherwise.
+     * @param str      the string
+     * @param prefix   the prefix to prepend to the start of the string
+     * @param prefixes additional prefixes that are valid
+     * @return a new String if prefix was prepended, the same string otherwise
      */
     public String prependIfMissing(final String str, final CharSequence prefix, final CharSequence... prefixes) {
         if (str == null || StringUtils.isEmpty(prefix) || startsWith(str, prefix)) {
@@ -1228,11 +1228,11 @@ public String removeStart(final String str, final CharSequence remove) {
      * Strings.CI.replace("aba", "A", "z")   = "zbz"
      * </pre>
      *
-     * @see #replace(String text, String searchString, String replacement, int max)
      * @param text         text to search and replace in, may be null
      * @param searchString the String to search for (case-insensitive), may be null
      * @param replacement  the String to replace it with, may be null
      * @return the text with any replacements processed, {@code null} if null String input
+     * @see #replace(String text, String searchString, String replacement, int max)
      */
     public String replace(final String text, final String searchString, final String replacement) {
         return replace(text, searchString, replacement, -1);
@@ -1354,11 +1354,11 @@ public String replace(final String text, String searchString, final String repla
      * Strings.CI.replaceOnce("FoOFoofoo", "foo", "") = "Foofoo"
      * </pre>
      *
-     * @see #replace(String text, String searchString, String replacement, int max)
      * @param text         text to search and replace in, may be null
      * @param searchString the String to search for, may be null
      * @param replacement  the String to replace with, may be null
      * @return the text with any replacements processed, {@code null} if null String input
+     * @see #replace(String text, String searchString, String replacement, int max)
      */
     public String replaceOnce(final String text, final String searchString, final String replacement) {
         return replace(text, searchString, replacement, 1);
@@ -1395,10 +1395,10 @@ public String replaceOnce(final String text, final String searchString, final St
      * Strings.CI.startsWith("ABCDEF", "abc") = true
      * </pre>
      *
-     * @see String#startsWith(String)
      * @param str    the CharSequence to check, may be null
      * @param prefix the prefix to find, may be null
      * @return {@code true} if the CharSequence starts with the prefix, case-sensitive, or both {@code null}
+     * @see String#startsWith(String)
      */
     public boolean startsWith(final CharSequence str, final CharSequence prefix) {
         if (str == null || prefix == null) {
@@ -1446,9 +1446,9 @@ public boolean startsWith(final CharSequence str, final CharSequence prefix) {
      *
      * @param sequence      the CharSequence to check, may be null
      * @param searchStrings the CharSequence prefixes, may be empty or contain {@code null}
-     * @see Strings#startsWith(CharSequence, CharSequence)
      * @return {@code true} if the input {@code sequence} is {@code null} AND no {@code searchStrings} are provided, or the input {@code sequence} begins with
-     *         any of the provided {@code searchStrings}.
+     *         any of the provided {@code searchStrings}
+     * @see Strings#startsWith(CharSequence, CharSequence)
      */
     public boolean startsWithAny(final CharSequence sequence, final CharSequence... searchStrings) {
         if (StringUtils.isEmpty(sequence) || ArrayUtils.isEmpty(searchStrings)) {
diff --git a/src/main/java/org/apache/commons/lang3/SystemProperties.java b/src/main/java/org/apache/commons/lang3/SystemProperties.java
index ee200f095d1..802386e7e44 100644
--- a/src/main/java/org/apache/commons/lang3/SystemProperties.java
+++ b/src/main/java/org/apache/commons/lang3/SystemProperties.java
@@ -1575,7 +1575,7 @@ public final class SystemProperties {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getAppleAwtEnableTemplateImages() {
@@ -1588,7 +1588,7 @@ public static String getAppleAwtEnableTemplateImages() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @see #AWT_TOOLKIT
      * @deprecated Deprecated without replacement.
@@ -1604,10 +1604,10 @@ public static String getAwtToolkit() {
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param clazz           The Class to use for the SimpleClassName.
-     * @param key             The subkey.
-     * @param defaultIfAbsent The default value.
-     * @return an int or {@code defaultIfAbsent}'s value.
+     * @param clazz           the Class to use for the SimpleClassName
+     * @param key             the subkey
+     * @param defaultIfAbsent the default value
+     * @return an int or {@code defaultIfAbsent}'s value
      * @see Class#getSimpleName()
      * @since 3.19.0
      */
@@ -1621,9 +1621,9 @@ public static boolean getBoolean(final Class<?> clazz, final String key, final B
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param key             The key.
-     * @param defaultIfAbsent The default value.
-     * @return a {@code boolean} or {@code defaultIfAbsent}'s value.
+     * @param key             the key
+     * @param defaultIfAbsent the default value
+     * @return a {@code boolean} or {@code defaultIfAbsent}'s value
      */
     public static boolean getBoolean(final String key, final BooleanSupplier defaultIfAbsent) {
         final String str = getProperty(key);
@@ -1636,7 +1636,7 @@ public static boolean getBoolean(final String key, final BooleanSupplier default
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getComSunJndiLdapObjectTrustSerialData() {
@@ -1649,7 +1649,7 @@ public static String getComSunJndiLdapObjectTrustSerialData() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getComSunNetHttpServerHttpServerProvider() {
@@ -1665,7 +1665,7 @@ public static String getComSunNetHttpServerHttpServerProvider() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getFileEncoding() {
         return getProperty(FILE_ENCODING);
@@ -1677,7 +1677,7 @@ public static String getFileEncoding() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getFileSeparator() {
         return getProperty(FILE_SEPARATOR);
@@ -1689,7 +1689,7 @@ public static String getFileSeparator() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getFtpNonProxyHost() {
@@ -1702,7 +1702,7 @@ public static String getFtpNonProxyHost() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getFtpProxyHost() {
@@ -1715,7 +1715,7 @@ public static String getFtpProxyHost() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getFtpProxyPort() {
@@ -1728,7 +1728,7 @@ public static String getFtpProxyPort() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpAgent() {
@@ -1741,7 +1741,7 @@ public static String getHttpAgent() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpAuthDigestCnonceRepeat() {
@@ -1754,7 +1754,7 @@ public static String getHttpAuthDigestCnonceRepeat() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpAuthDigestReenabledAlgorithms() {
@@ -1767,7 +1767,7 @@ public static String getHttpAuthDigestReenabledAlgorithms() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpAuthDigestValidateProxy() {
@@ -1780,7 +1780,7 @@ public static String getHttpAuthDigestValidateProxy() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpAuthDigestValidateServer() {
@@ -1793,7 +1793,7 @@ public static String getHttpAuthDigestValidateServer() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpAuthNtlmDomain() {
@@ -1806,7 +1806,7 @@ public static String getHttpAuthNtlmDomain() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpKeepAlive() {
@@ -1819,7 +1819,7 @@ public static String getHttpKeepAlive() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpKeepAliveTimeProxy() {
@@ -1832,7 +1832,7 @@ public static String getHttpKeepAliveTimeProxy() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpKeepAliveTimeServer() {
@@ -1845,7 +1845,7 @@ public static String getHttpKeepAliveTimeServer() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpMaxConnections() {
@@ -1858,7 +1858,7 @@ public static String getHttpMaxConnections() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpMaxRedirects() {
@@ -1871,7 +1871,7 @@ public static String getHttpMaxRedirects() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpNonProxyHosts() {
@@ -1884,7 +1884,7 @@ public static String getHttpNonProxyHosts() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpProxyHost() {
@@ -1897,7 +1897,7 @@ public static String getHttpProxyHost() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpProxyPort() {
@@ -1910,7 +1910,7 @@ public static String getHttpProxyPort() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpsProxyHost() {
@@ -1923,7 +1923,7 @@ public static String getHttpsProxyHost() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getHttpsProxyPort() {
@@ -1936,10 +1936,10 @@ public static String getHttpsProxyPort() {
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param clazz           The Class to use for the SimpleClassName.
-     * @param key             The subkey.
-     * @param defaultIfAbsent The default value.
-     * @return an int or {@code defaultIfAbsent}'s value.
+     * @param clazz           the Class to use for the SimpleClassName
+     * @param key             the subkey
+     * @param defaultIfAbsent the default value
+     * @return an int or {@code defaultIfAbsent}'s value
      * @see Class#getSimpleName()
      * @since 3.19.0
      */
@@ -1953,9 +1953,9 @@ public static int getInt(final Class<?> clazz, final String key, final IntSuppli
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param key             The key.
-     * @param defaultIfAbsent The default value.
-     * @return an {@code int} or {@code defaultIfAbsent}'s value.
+     * @param key             the key
+     * @param defaultIfAbsent the default value
+     * @return an {@code int} or {@code defaultIfAbsent}'s value
      */
     public static int getInt(final String key, final IntSupplier defaultIfAbsent) {
         final String str = getProperty(key);
@@ -1968,7 +1968,7 @@ public static int getInt(final String key, final IntSupplier defaultIfAbsent) {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @see #JAVA_AWT_FONTS
      * @deprecated Deprecated without replacement.
@@ -1984,7 +1984,7 @@ public static String getJavaAwtFonts() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @deprecated Deprecated without replacement.
      */
@@ -1999,7 +1999,7 @@ public static String getJavaAwtGraphicsenv() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @see #JAVA_AWT_HEADLESS
      * @deprecated Deprecated without replacement.
@@ -2015,7 +2015,7 @@ public static String getJavaAwtHeadless() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @see #JAVA_AWT_PRINTERJOB
      * @deprecated Deprecated without replacement.
@@ -2031,7 +2031,7 @@ public static String getJavaAwtPrinterjob() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">java.class.path</a>
      * @see #JAVA_CLASS_PATH
      */
@@ -2045,7 +2045,7 @@ public static String getJavaClassPath() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaClassVersion() {
         return getProperty(JAVA_CLASS_VERSION);
@@ -2057,7 +2057,7 @@ public static String getJavaClassVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://bugs.openjdk.org/browse/JDK-8305998">JDK-8305998</a>
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @deprecated Deprecated without replacement.
@@ -2073,7 +2073,7 @@ public static String getJavaCompiler() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaContentHandlerPkgs() {
@@ -2086,7 +2086,7 @@ public static String getJavaContentHandlerPkgs() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @deprecated Deprecated without replacement.
      */
@@ -2101,7 +2101,7 @@ public static String getJavaEndorsedDirs() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @see <a href="https://docs.oracle.com/en/java/javase/25/docs/api/system-properties.html">System Properties</a>
      * @see #JAVA_EXT_DIRS
      * @deprecated Deprecated without replacement.
@@ -2117,7 +2117,7 @@ public static String getJavaExtDirs() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaHome() {
         return getProperty(JAVA_HOME);
@@ -2129,7 +2129,7 @@ public static String getJavaHome() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaIoTmpdir() {
         return getProperty(JAVA_IO_TMPDIR);
@@ -2141,7 +2141,7 @@ public static String getJavaIoTmpdir() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaLibraryPath() {
         return getProperty(JAVA_LIBRARY_PATH);
@@ -2156,7 +2156,7 @@ public static String getJavaLibraryPath() {
      * Java 9 and above.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaLocaleProviders() {
         return getProperty(JAVA_LOCALE_PROVIDERS);
@@ -2168,7 +2168,7 @@ public static String getJavaLocaleProviders() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaLocaleUseOldIsoCodes() {
@@ -2181,7 +2181,7 @@ public static String getJavaLocaleUseOldIsoCodes() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNetPreferIpv4Stack() {
@@ -2194,7 +2194,7 @@ public static String getJavaNetPreferIpv4Stack() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNetPreferIpv6Addresses() {
@@ -2207,7 +2207,7 @@ public static String getJavaNetPreferIpv6Addresses() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNetSocksPassword() {
@@ -2220,7 +2220,7 @@ public static String getJavaNetSocksPassword() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNetSocksUserName() {
@@ -2233,7 +2233,7 @@ public static String getJavaNetSocksUserName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNetUseSystemProxies() {
@@ -2246,7 +2246,7 @@ public static String getJavaNetUseSystemProxies() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNioChannelsDefaultThreadPoolInitialSize() {
@@ -2259,7 +2259,7 @@ public static String getJavaNioChannelsDefaultThreadPoolInitialSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNioChannelsDefaultThreadPoolThreadFactory() {
@@ -2272,7 +2272,7 @@ public static String getJavaNioChannelsDefaultThreadPoolThreadFactory() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNioChannelsSpiAsynchronousChannelProvider() {
@@ -2285,7 +2285,7 @@ public static String getJavaNioChannelsSpiAsynchronousChannelProvider() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNioChannelsSpiSelectorProvider() {
@@ -2298,7 +2298,7 @@ public static String getJavaNioChannelsSpiSelectorProvider() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaNioFileSpiDefaultFileSystemProvider() {
@@ -2311,7 +2311,7 @@ public static String getJavaNioFileSpiDefaultFileSystemProvider() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaPropertiesDate() {
@@ -2324,7 +2324,7 @@ public static String getJavaPropertiesDate() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaProtocolHandlerPkgs() {
@@ -2337,7 +2337,7 @@ public static String getJavaProtocolHandlerPkgs() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaRmiServerCodebase() {
@@ -2350,7 +2350,7 @@ public static String getJavaRmiServerCodebase() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaRmiServerHostName() {
@@ -2363,7 +2363,7 @@ public static String getJavaRmiServerHostName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaRmiServerRandomIds() {
@@ -2376,7 +2376,7 @@ public static String getJavaRmiServerRandomIds() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaRmiServerRmiClassLoaderSpi() {
@@ -2389,7 +2389,7 @@ public static String getJavaRmiServerRmiClassLoaderSpi() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaRuntimeName() {
         return getProperty(JAVA_RUNTIME_NAME);
@@ -2401,7 +2401,7 @@ public static String getJavaRuntimeName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaRuntimeVersion() {
         return getProperty(JAVA_RUNTIME_VERSION);
@@ -2413,7 +2413,7 @@ public static String getJavaRuntimeVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaSecurityAuthLoginConfig() {
@@ -2426,7 +2426,7 @@ public static String getJavaSecurityAuthLoginConfig() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaSecurityManager() {
@@ -2439,7 +2439,7 @@ public static String getJavaSecurityManager() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaSpecificationMaintenanceVersion() {
@@ -2452,7 +2452,7 @@ public static String getJavaSpecificationMaintenanceVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaSpecificationName() {
         return getProperty(JAVA_SPECIFICATION_NAME);
@@ -2464,7 +2464,7 @@ public static String getJavaSpecificationName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaSpecificationVendor() {
         return getProperty(JAVA_SPECIFICATION_VENDOR);
@@ -2476,7 +2476,7 @@ public static String getJavaSpecificationVendor() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaSpecificationVersion() {
         return getProperty(JAVA_SPECIFICATION_VERSION);
@@ -2488,8 +2488,8 @@ public static String getJavaSpecificationVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @param defaultValue get this Supplier when the property is empty or throws SecurityException.
-     * @return The system property value or {@code defaultValue} if the property is absent or a security problem occurs.
+     * @param defaultValue get this Supplier when the property is empty or throws SecurityException
+     * @return the system property value or {@code defaultValue} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaSpecificationVersion(final String defaultValue) {
@@ -2502,7 +2502,7 @@ public static String getJavaSpecificationVersion(final String defaultValue) {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaSystemClassLoader() {
@@ -2515,7 +2515,7 @@ public static String getJavaSystemClassLoader() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaTimeZoneDefaultZoneRulesProvider() {
@@ -2528,7 +2528,7 @@ public static String getJavaTimeZoneDefaultZoneRulesProvider() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilConcurrentForkJoinPoolCommonExceptionHandler() {
@@ -2541,7 +2541,7 @@ public static String getJavaUtilConcurrentForkJoinPoolCommonExceptionHandler() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilConcurrentForkJoinPoolCommonMaximumSpares() {
@@ -2554,7 +2554,7 @@ public static String getJavaUtilConcurrentForkJoinPoolCommonMaximumSpares() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilConcurrentForkJoinPoolCommonParallelism() {
@@ -2567,7 +2567,7 @@ public static String getJavaUtilConcurrentForkJoinPoolCommonParallelism() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilConcurrentForkJoinPoolCommonThreadFactory() {
@@ -2580,7 +2580,7 @@ public static String getJavaUtilConcurrentForkJoinPoolCommonThreadFactory() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilCurrencyData() {
@@ -2593,7 +2593,7 @@ public static String getJavaUtilCurrencyData() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilLoggingConfigClass() {
@@ -2606,7 +2606,7 @@ public static String getJavaUtilLoggingConfigClass() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilLoggingConfigFile() {
@@ -2619,7 +2619,7 @@ public static String getJavaUtilLoggingConfigFile() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilLoggingSimpleFormatterFormat() {
@@ -2632,7 +2632,7 @@ public static String getJavaUtilLoggingSimpleFormatterFormat() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaUtilPrefsPreferencesFactory() {
         return getProperty(JAVA_UTIL_PREFS_PREFERENCES_FACTORY);
@@ -2644,7 +2644,7 @@ public static String getJavaUtilPrefsPreferencesFactory() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaUtilPropertyResourceBundleEncoding() {
@@ -2657,7 +2657,7 @@ public static String getJavaUtilPropertyResourceBundleEncoding() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVendor() {
         return getProperty(JAVA_VENDOR);
@@ -2669,7 +2669,7 @@ public static String getJavaVendor() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVendorUrl() {
         return getProperty(JAVA_VENDOR_URL);
@@ -2681,7 +2681,7 @@ public static String getJavaVendorUrl() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaVendorVersion() {
@@ -2694,7 +2694,7 @@ public static String getJavaVendorVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVersion() {
         return getProperty(JAVA_VERSION);
@@ -2706,7 +2706,7 @@ public static String getJavaVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaVersionDate() {
@@ -2719,7 +2719,7 @@ public static String getJavaVersionDate() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVmInfo() {
         return getProperty(JAVA_VM_INFO);
@@ -2731,7 +2731,7 @@ public static String getJavaVmInfo() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVmName() {
         return getProperty(JAVA_VM_NAME);
@@ -2743,7 +2743,7 @@ public static String getJavaVmName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVmSpecificationName() {
         return getProperty(JAVA_VM_SPECIFICATION_NAME);
@@ -2755,7 +2755,7 @@ public static String getJavaVmSpecificationName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVmSpecificationVendor() {
         return getProperty(JAVA_VM_SPECIFICATION_VENDOR);
@@ -2767,7 +2767,7 @@ public static String getJavaVmSpecificationVendor() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVmSpecificationVersion() {
         return getProperty(JAVA_VM_SPECIFICATION_VERSION);
@@ -2779,7 +2779,7 @@ public static String getJavaVmSpecificationVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVmVendor() {
         return getProperty(JAVA_VM_VENDOR);
@@ -2791,7 +2791,7 @@ public static String getJavaVmVendor() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getJavaVmVersion() {
         return getProperty(JAVA_VM_VERSION);
@@ -2803,7 +2803,7 @@ public static String getJavaVmVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaxAccessibilityAssistiveTechnologies() {
@@ -2816,7 +2816,7 @@ public static String getJavaxAccessibilityAssistiveTechnologies() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaXmlConfigFile() {
@@ -2829,7 +2829,7 @@ public static String getJavaXmlConfigFile() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaxNetSslSessionCacheSize() {
@@ -2842,7 +2842,7 @@ public static String getJavaxNetSslSessionCacheSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaxRmiSslClientEnabledCipherSuites() {
@@ -2855,7 +2855,7 @@ public static String getJavaxRmiSslClientEnabledCipherSuites() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaxRmiSslClientEnabledProtocols() {
@@ -2868,7 +2868,7 @@ public static String getJavaxRmiSslClientEnabledProtocols() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaxSecurityAuthUseSubjectCredsOnly() {
@@ -2881,7 +2881,7 @@ public static String getJavaxSecurityAuthUseSubjectCredsOnly() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJavaxSmartCardIoTerminalFactoryDefaultType() {
@@ -2894,7 +2894,7 @@ public static String getJavaxSmartCardIoTerminalFactoryDefaultType() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdbcDrivers() {
@@ -2907,7 +2907,7 @@ public static String getJdbcDrivers() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpAuthProxyingDisabledSchemes() {
@@ -2920,7 +2920,7 @@ public static String getJdkHttpAuthProxyingDisabledSchemes() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpAuthTunnelingDisabledSchemes() {
@@ -2933,7 +2933,7 @@ public static String getJdkHttpAuthTunnelingDisabledSchemes() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientAllowRestrictedHeaders() {
@@ -2946,7 +2946,7 @@ public static String getJdkHttpClientAllowRestrictedHeaders() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientAuthRetryLimit() {
@@ -2959,7 +2959,7 @@ public static String getJdkHttpClientAuthRetryLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientBufSize() {
@@ -2972,7 +2972,7 @@ public static String getJdkHttpClientBufSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientConnectionPoolSize() {
@@ -2985,7 +2985,7 @@ public static String getJdkHttpClientConnectionPoolSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientConnectionWindowSize() {
@@ -2998,7 +2998,7 @@ public static String getJdkHttpClientConnectionWindowSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientDisableRetryConnect() {
@@ -3011,7 +3011,7 @@ public static String getJdkHttpClientDisableRetryConnect() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientEnableAllMethodRetry() {
@@ -3024,7 +3024,7 @@ public static String getJdkHttpClientEnableAllMethodRetry() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientEnablePush() {
@@ -3037,7 +3037,7 @@ public static String getJdkHttpClientEnablePush() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientHpackMaxHeaderTableSize() {
@@ -3050,7 +3050,7 @@ public static String getJdkHttpClientHpackMaxHeaderTableSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientHttpClientLog() {
@@ -3063,7 +3063,7 @@ public static String getJdkHttpClientHttpClientLog() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientKeepAliveTimeout() {
@@ -3076,7 +3076,7 @@ public static String getJdkHttpClientKeepAliveTimeout() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientKeepAliveTimeoutH2() {
@@ -3089,7 +3089,7 @@ public static String getJdkHttpClientKeepAliveTimeoutH2() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientMaxFrameSize() {
@@ -3102,7 +3102,7 @@ public static String getJdkHttpClientMaxFrameSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientMaxStreams() {
@@ -3115,7 +3115,7 @@ public static String getJdkHttpClientMaxStreams() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientReceiveBufferSize() {
@@ -3128,7 +3128,7 @@ public static String getJdkHttpClientReceiveBufferSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientRedirectsRetryLimit() {
@@ -3141,7 +3141,7 @@ public static String getJdkHttpClientRedirectsRetryLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientSendBufferSize() {
@@ -3154,7 +3154,7 @@ public static String getJdkHttpClientSendBufferSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientWebSocketWriteBufferSize() {
@@ -3167,7 +3167,7 @@ public static String getJdkHttpClientWebSocketWriteBufferSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpClientWindowSize() {
@@ -3180,7 +3180,7 @@ public static String getJdkHttpClientWindowSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpServerMaxConnections() {
@@ -3193,7 +3193,7 @@ public static String getJdkHttpServerMaxConnections() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkHttpsNegotiateCbt() {
@@ -3206,7 +3206,7 @@ public static String getJdkHttpsNegotiateCbt() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkIncludeInExceptions() {
@@ -3219,7 +3219,7 @@ public static String getJdkIncludeInExceptions() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkInternalHttpClientDisableHostNameVerification() {
@@ -3232,7 +3232,7 @@ public static String getJdkInternalHttpClientDisableHostNameVerification() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkIoPermissionsUseCanonicalPath() {
@@ -3245,7 +3245,7 @@ public static String getJdkIoPermissionsUseCanonicalPath() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkJndiLdapObjectFactoriesFilter() {
@@ -3258,7 +3258,7 @@ public static String getJdkJndiLdapObjectFactoriesFilter() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkJndiObjectFactoriesFilter() {
@@ -3271,7 +3271,7 @@ public static String getJdkJndiObjectFactoriesFilter() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkJndiRmiObjectFactoriesFilter() {
@@ -3284,7 +3284,7 @@ public static String getJdkJndiRmiObjectFactoriesFilter() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkModuleMain() {
@@ -3297,7 +3297,7 @@ public static String getJdkModuleMain() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkModuleMainClass() {
@@ -3310,7 +3310,7 @@ public static String getJdkModuleMainClass() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkModulePath() {
@@ -3323,7 +3323,7 @@ public static String getJdkModulePath() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkModuleUpgradePath() {
@@ -3336,7 +3336,7 @@ public static String getJdkModuleUpgradePath() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkNetUnixDomainTmpDir() {
@@ -3349,7 +3349,7 @@ public static String getJdkNetUnixDomainTmpDir() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkNetUrlClassPathShowIgnoredClassPathEntries() {
@@ -3362,7 +3362,7 @@ public static String getJdkNetUrlClassPathShowIgnoredClassPathEntries() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkSerialFilter() {
@@ -3375,7 +3375,7 @@ public static String getJdkSerialFilter() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkSerialFilterFactory() {
@@ -3388,7 +3388,7 @@ public static String getJdkSerialFilterFactory() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkTlsClientSignatureSchemes() {
@@ -3401,7 +3401,7 @@ public static String getJdkTlsClientSignatureSchemes() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkTlsNamedGroups() {
@@ -3414,7 +3414,7 @@ public static String getJdkTlsNamedGroups() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkTlsServerSignatureSchemes() {
@@ -3427,7 +3427,7 @@ public static String getJdkTlsServerSignatureSchemes() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkVirtualThreadSchedulerMaxPoolSize() {
@@ -3440,7 +3440,7 @@ public static String getJdkVirtualThreadSchedulerMaxPoolSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkVirtualThreadSchedulerParallelism() {
@@ -3453,7 +3453,7 @@ public static String getJdkVirtualThreadSchedulerParallelism() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlCdataChunkSize() {
@@ -3466,7 +3466,7 @@ public static String getJdkXmlCdataChunkSize() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlDtdSupport() {
@@ -3479,7 +3479,7 @@ public static String getJdkXmlDtdSupport() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlElementAttributeLimit() {
@@ -3492,7 +3492,7 @@ public static String getJdkXmlElementAttributeLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlEnableExtensionFunctions() {
@@ -3505,7 +3505,7 @@ public static String getJdkXmlEnableExtensionFunctions() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlEntityExpansionLimit() {
@@ -3518,7 +3518,7 @@ public static String getJdkXmlEntityExpansionLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlEntityReplacementLimit() {
@@ -3531,7 +3531,7 @@ public static String getJdkXmlEntityReplacementLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlIsStandalone() {
@@ -3544,7 +3544,7 @@ public static String getJdkXmlIsStandalone() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlJdkCatalogResolve() {
@@ -3557,7 +3557,7 @@ public static String getJdkXmlJdkCatalogResolve() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlMaxElementDepth() {
@@ -3570,7 +3570,7 @@ public static String getJdkXmlMaxElementDepth() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlMaxGeneralEntitySizeLimit() {
@@ -3583,7 +3583,7 @@ public static String getJdkXmlMaxGeneralEntitySizeLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlMaxOccurLimit() {
@@ -3596,7 +3596,7 @@ public static String getJdkXmlMaxOccurLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlMaxParameterEntitySizeLimit() {
@@ -3609,7 +3609,7 @@ public static String getJdkXmlMaxParameterEntitySizeLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlMaxXmlNameLimit() {
@@ -3622,7 +3622,7 @@ public static String getJdkXmlMaxXmlNameLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlOverrideDefaultParser() {
@@ -3635,7 +3635,7 @@ public static String getJdkXmlOverrideDefaultParser() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlResetSymbolTable() {
@@ -3648,7 +3648,7 @@ public static String getJdkXmlResetSymbolTable() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlTotalEntitySizeLimit() {
@@ -3661,7 +3661,7 @@ public static String getJdkXmlTotalEntitySizeLimit() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getJdkXmlXsltcIsStandalone() {
@@ -3674,7 +3674,7 @@ public static String getJdkXmlXsltcIsStandalone() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getLineSeparator() {
         return getProperty(LINE_SEPARATOR);
@@ -3686,8 +3686,8 @@ public static String getLineSeparator() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @param defaultIfAbsent get this Supplier when the property is empty or throws SecurityException.
-     * @return the current value from the system properties map.
+     * @param defaultIfAbsent get this Supplier when the property is empty or throws SecurityException
+     * @return the current value from the system properties map
      * @since 3.15.0
      */
     public static String getLineSeparator(final Supplier<String> defaultIfAbsent) {
@@ -3700,10 +3700,10 @@ public static String getLineSeparator(final Supplier<String> defaultIfAbsent) {
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param clazz           The Class to use for the SimpleClassName.
-     * @param key             The subkey.
-     * @param defaultIfAbsent The default value.
-     * @return a long or {@code defaultIfAbsent}'s value.
+     * @param clazz           the Class to use for the SimpleClassName
+     * @param key             the subkey
+     * @param defaultIfAbsent the default value
+     * @return a long or {@code defaultIfAbsent}'s value
      * @see Class#getSimpleName()
      * @since 3.19.0
      */
@@ -3717,9 +3717,9 @@ public static long getLong(final Class<?> clazz, final String key, final LongSup
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param key             The key.
-     * @param defaultIfAbsent The default value.
-     * @return a {@code long} or {@code defaultIfAbsent}'s value.
+     * @param key             the key
+     * @param defaultIfAbsent the default value
+     * @return a {@code long} or {@code defaultIfAbsent}'s value
      */
     public static long getLong(final String key, final LongSupplier defaultIfAbsent) {
         final String str = getProperty(key);
@@ -3732,7 +3732,7 @@ public static long getLong(final String key, final LongSupplier defaultIfAbsent)
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getNativeEncoding() {
@@ -3745,7 +3745,7 @@ public static String getNativeEncoding() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getNetworkAddressCacheNegativeTtl() {
@@ -3758,7 +3758,7 @@ public static String getNetworkAddressCacheNegativeTtl() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getNetworkAddressCacheStaleTtl() {
@@ -3771,7 +3771,7 @@ public static String getNetworkAddressCacheStaleTtl() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getNetworkAddressCacheTtl() {
@@ -3784,7 +3784,7 @@ public static String getNetworkAddressCacheTtl() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getOrgJcpXmlDsigSecureValidation() {
@@ -3797,7 +3797,7 @@ public static String getOrgJcpXmlDsigSecureValidation() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getOrgOpenJdkJavaUtilStreamTripwire() {
@@ -3810,7 +3810,7 @@ public static String getOrgOpenJdkJavaUtilStreamTripwire() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getOsArch() {
         return getProperty(OS_ARCH);
@@ -3822,7 +3822,7 @@ public static String getOsArch() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getOsName() {
         return getProperty(OS_NAME);
@@ -3834,7 +3834,7 @@ public static String getOsName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getOsVersion() {
         return getProperty(OS_VERSION);
@@ -3846,9 +3846,9 @@ public static String getOsVersion() {
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param key             The key.
-     * @param defaultIfAbsent The default value.
-     * @return a {@link Path} or {@code defaultIfAbsent}'s value.
+     * @param key             the key
+     * @param defaultIfAbsent the default value
+     * @return a {@link Path} or {@code defaultIfAbsent}'s value
      * @since 3.20.0
      */
     public static Path getPath(final String key, final Supplier<Path> defaultIfAbsent) {
@@ -3862,7 +3862,7 @@ public static Path getPath(final String key, final Supplier<Path> defaultIfAbsen
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getPathSeparator() {
         return getProperty(PATH_SEPARATOR);
@@ -3874,8 +3874,8 @@ public static String getPathSeparator() {
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param property The system property name.
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @param property the system property name
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getProperty(final String property) {
         return getProperty(property, Suppliers.nul());
@@ -3887,9 +3887,9 @@ public static String getProperty(final String property) {
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param property        the system property name.
-     * @param defaultIfAbsent use this value when the property is empty or throws SecurityException.
-     * @return the system property value or {@code null} if a security problem occurs.
+     * @param property        the system property name
+     * @param defaultIfAbsent use this value when the property is empty or throws SecurityException
+     * @return the system property value or {@code null} if a security problem occurs
      */
     static String getProperty(final String property, final String defaultIfAbsent) {
         return getProperty(property, () -> defaultIfAbsent);
@@ -3901,9 +3901,9 @@ static String getProperty(final String property, final String defaultIfAbsent) {
      * If a {@link SecurityException} is caught, the return value is {@code null}.
      * </p>
      *
-     * @param property        the system property name.
-     * @param defaultIfAbsent get this Supplier when the property is empty or throws SecurityException.
-     * @return the system property value or {@code null} if a security problem occurs.
+     * @param property        the system property name
+     * @param defaultIfAbsent get this Supplier when the property is empty or throws SecurityException
+     * @return the system property value or {@code null} if a security problem occurs
      */
     static String getProperty(final String property, final Supplier<String> defaultIfAbsent) {
         try {
@@ -3926,7 +3926,7 @@ static String getProperty(final String property, final Supplier<String> defaultI
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSocksProxyHost() {
@@ -3939,7 +3939,7 @@ public static String getSocksProxyHost() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSocksProxyPort() {
@@ -3952,7 +3952,7 @@ public static String getSocksProxyPort() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSocksProxyVersion() {
@@ -3965,7 +3965,7 @@ public static String getSocksProxyVersion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getStdErrEncoding() {
@@ -3978,7 +3978,7 @@ public static String getStdErrEncoding() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getStdOutEncoding() {
@@ -3991,7 +3991,7 @@ public static String getStdOutEncoding() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunNetHttpServerDrainAmount() {
@@ -4004,7 +4004,7 @@ public static String getSunNetHttpServerDrainAmount() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunNetHttpServerIdleInterval() {
@@ -4017,7 +4017,7 @@ public static String getSunNetHttpServerIdleInterval() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunNetHttpServerMaxIdleConnections() {
@@ -4030,7 +4030,7 @@ public static String getSunNetHttpServerMaxIdleConnections() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunNetHttpServerMaxReqHeaders() {
@@ -4043,7 +4043,7 @@ public static String getSunNetHttpServerMaxReqHeaders() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunNetHttpServerMaxReqTime() {
@@ -4056,7 +4056,7 @@ public static String getSunNetHttpServerMaxReqTime() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunNetHttpServerMaxRspTime() {
@@ -4069,7 +4069,7 @@ public static String getSunNetHttpServerMaxRspTime() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunNetHttpServerNoDelay() {
@@ -4082,7 +4082,7 @@ public static String getSunNetHttpServerNoDelay() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getSunSecurityKrb5Principal() {
@@ -4095,7 +4095,7 @@ public static String getSunSecurityKrb5Principal() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getUserCountry() {
         return getProperty(USER_COUNTRY);
@@ -4107,7 +4107,7 @@ public static String getUserCountry() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getUserDir() {
         return getProperty(USER_DIR);
@@ -4119,7 +4119,7 @@ public static String getUserDir() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getUserExtensions() {
@@ -4132,7 +4132,7 @@ public static String getUserExtensions() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getUserHome() {
         return getProperty(USER_HOME);
@@ -4144,7 +4144,7 @@ public static String getUserHome() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getUserLanguage() {
         return getProperty(USER_LANGUAGE);
@@ -4156,7 +4156,7 @@ public static String getUserLanguage() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getUserName() {
         return getProperty(USER_NAME);
@@ -4168,8 +4168,8 @@ public static String getUserName() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @param defaultValue get this Supplier when the property is empty or throws SecurityException.
-     * @return The system property value or {@code defaultValue} if the property is absent or a security problem occurs.
+     * @param defaultValue get this Supplier when the property is empty or throws SecurityException
+     * @return the system property value or {@code defaultValue} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getUserName(final String defaultValue) {
@@ -4182,7 +4182,7 @@ public static String getUserName(final String defaultValue) {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getUserRegion() {
@@ -4195,7 +4195,7 @@ public static String getUserRegion() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getUserScript() {
@@ -4208,7 +4208,7 @@ public static String getUserScript() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      */
     public static String getUserTimezone() {
         return getProperty(USER_TIMEZONE);
@@ -4220,7 +4220,7 @@ public static String getUserTimezone() {
      * Returns {@code null} if the property cannot be read due to a {@link SecurityException}.
      * </p>
      *
-     * @return The system property value or {@code null} if the property is absent or a security problem occurs.
+     * @return the system property value or {@code null} if the property is absent or a security problem occurs
      * @since 3.15.0
      */
     public static String getUserVariant() {
@@ -4236,8 +4236,8 @@ public static String getUserVariant() {
      * If a {@link SecurityException} is caught, the return value is {@code false}.
      * </p>
      *
-     * @param property the system property name.
-     * @return whether the given property is set.
+     * @param property the system property name
+     * @return whether the given property is set
      * @since 3.18.0
      */
     public static boolean isPropertySet(final String property) {
diff --git a/src/main/java/org/apache/commons/lang3/SystemUtils.java b/src/main/java/org/apache/commons/lang3/SystemUtils.java
index 4c869731ef2..c008f4716e1 100644
--- a/src/main/java/org/apache/commons/lang3/SystemUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SystemUtils.java
@@ -31,8 +31,8 @@
  * #ThreadSafe#
  * </p>
  *
- * @since 1.0
  * @see SystemProperties
+ * @since 1.0
  */
 public class SystemUtils {
 
@@ -2106,8 +2106,8 @@ public class SystemUtils {
      * called after this class is loaded, the value will be out of sync with that System property.
      * </p>
      *
-     * @since 2.1
      * @see SystemProperties#getAwtToolkit()
+     * @since 2.1
      * @deprecated Deprecated without replacement.
      */
     @Deprecated
@@ -2120,9 +2120,9 @@ public class SystemUtils {
      * If a {@link SecurityException} is caught, the return value is {@code defaultValue} and a message is written to {@code System.err}.
      * </p>
      *
-     * @param name         the environment variable name.
-     * @param defaultValue the default value.
-     * @return the environment variable value or {@code defaultValue} if a security problem occurs.
+     * @param name         the environment variable name
+     * @param defaultValue the default value
+     * @return the environment variable value or {@code defaultValue} if a security problem occurs
      * @since 3.8
      */
     public static String getEnvironmentVariable(final String name, final String defaultValue) {
@@ -2153,8 +2153,8 @@ public static String getHostName() {
     /**
      * Gets the current Java home directory as a {@link File}.
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getJavaHome()
      * @since 2.1
      */
@@ -2165,8 +2165,8 @@ public static File getJavaHome() {
     /**
      * Gets the current Java home directory as a {@link File}.
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getJavaHome()
      * @since 3.18.0
      */
@@ -2177,8 +2177,8 @@ public static Path getJavaHomePath() {
     /**
      * Gets the current Java IO temporary directory as a {@link File}.
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getJavaIoTmpdir()
      * @since 2.1
      */
@@ -2189,8 +2189,8 @@ public static File getJavaIoTmpDir() {
     /**
      * Gets the current Java IO temporary directory as a {@link Path}.
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getJavaIoTmpdir()
      * @since 3.18.0
      */
@@ -2204,8 +2204,8 @@ public static Path getJavaIoTmpDirPath() {
      * The result depends on the value of the {@link #JAVA_SPECIFICATION_VERSION} constant.
      * </p>
      *
-     * @param versionPrefix the prefix for the Java version.
-     * @return true if matches, or false if not or can't determine.
+     * @param versionPrefix the prefix for the Java version
+     * @return true if matches, or false if not or can't determine
      */
     private static boolean getJavaVersionMatches(final String versionPrefix) {
         return isJavaVersionMatch(JAVA_SPECIFICATION_VERSION, versionPrefix);
@@ -2220,9 +2220,9 @@ private static boolean getJavaVersionMatches(final String versionPrefix) {
      * The method returns {@code false} if {@link #OS_NAME} or {@link #OS_VERSION} is {@code null}.
      * </p>
      *
-     * @param osNamePrefix    the prefix for the OS name.
-     * @param osVersionPrefix the prefix for the version.
-     * @return true if matches, or false if not or can't determine.
+     * @param osNamePrefix    the prefix for the OS name
+     * @param osVersionPrefix the prefix for the version
+     * @return true if matches, or false if not or can't determine
      */
     private static boolean getOsMatches(final String osNamePrefix, final String osVersionPrefix) {
         return isOsMatch(OS_NAME, OS_VERSION, osNamePrefix, osVersionPrefix);
@@ -2237,8 +2237,8 @@ private static boolean getOsMatches(final String osNamePrefix, final String osVe
      * The method returns {@code false} if {@link #OS_NAME} is {@code null}.
      * </p>
      *
-     * @param osNamePrefix the prefix for the OS name.
-     * @return true if matches, or false if not or can't determine.
+     * @param osNamePrefix the prefix for the OS name
+     * @return true if matches, or false if not or can't determine
      */
     private static boolean getOsNameMatches(final String osNamePrefix) {
         return isOsNameMatch(OS_NAME, osNamePrefix);
@@ -2250,8 +2250,8 @@ private static boolean getOsNameMatches(final String osNamePrefix) {
      * The result is based on the system property {@value SystemProperties#USER_DIR}.
      * </p>
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getUserDir()
      * @since 2.1
      */
@@ -2265,8 +2265,8 @@ public static File getUserDir() {
      * The result is based on the system property {@value SystemProperties#USER_DIR}.
      * </p>
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getUserDir()
      * @since 3.18.0
      */
@@ -2280,8 +2280,8 @@ public static Path getUserDirPath() {
      * The result is based on the system property {@value SystemProperties#USER_HOME}.
      * </p>
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getUserHome()
      * @since 2.1
      */
@@ -2295,8 +2295,8 @@ public static File getUserHome() {
      * The result is based on the system property {@value SystemProperties#USER_HOME}.
      * </p>
      *
-     * @return a directory.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a directory
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getUserHome()
      * @since 3.18.0
      */
@@ -2310,8 +2310,8 @@ public static Path getUserHomePath() {
      * The result is based on the system property {@value SystemProperties#USER_NAME}.
      * </p>
      *
-     * @return a name.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @return a name
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getUserName()
      * @since 3.10
      * @deprecated Use {@link SystemProperties#getUserName()}.
@@ -2327,9 +2327,9 @@ public static String getUserName() {
      * The result is based on the system property {@value SystemProperties#USER_NAME}.
      * </p>
      *
-     * @param defaultValue A default value.
-     * @return a name.
-     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property.
+     * @param defaultValue a default value
+     * @return a name
+     * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow access to the specified system property
      * @see SystemProperties#getUserName()
      * @since 3.10
      * @deprecated Use {@link SystemProperties#getUserName(String)}.
@@ -2345,7 +2345,7 @@ public static String getUserName(final String defaultValue) {
      * The result is based on the system property {@value SystemProperties#JAVA_AWT_HEADLESS}.
      * </p>
      *
-     * @return {@code true} if {@code JAVA_AWT_HEADLESS} is {@code "true"}, {@code false} otherwise.
+     * @return {@code true} if {@code JAVA_AWT_HEADLESS} is {@code "true"}, {@code false} otherwise
      * @see #JAVA_AWT_HEADLESS
      * @since 2.1
      * @since Java 1.4
@@ -2362,8 +2362,8 @@ public static boolean isJavaAwtHeadless() {
      * The result is based on the system property saved in {@link #JAVA_SPECIFICATION_VERSION}.
      * </p>
      *
-     * @param requiredVersion the required version, for example 1.31f.
-     * @return {@code true} if the actual version is equal or greater than the required version.
+     * @param requiredVersion the required version, for example 1.31f
+     * @return {@code true} if the actual version is equal or greater than the required version
      */
     public static boolean isJavaVersionAtLeast(final JavaVersion requiredVersion) {
         return JAVA_SPECIFICATION_VERSION_ENUM != null && JAVA_SPECIFICATION_VERSION_ENUM.atLeast(requiredVersion);
@@ -2375,8 +2375,8 @@ public static boolean isJavaVersionAtLeast(final JavaVersion requiredVersion) {
      * The result is based on the system property saved in {@link #JAVA_SPECIFICATION_VERSION}.
      * </p>
      *
-     * @param requiredVersion the required version, for example 1.31f.
-     * @return {@code true} if the actual version is equal or less than the required version.
+     * @param requiredVersion the required version, for example 1.31f
+     * @return {@code true} if the actual version is equal or less than the required version
      * @since 3.9
      */
     public static boolean isJavaVersionAtMost(final JavaVersion requiredVersion) {
@@ -2390,9 +2390,9 @@ public static boolean isJavaVersionAtMost(final JavaVersion requiredVersion) {
      * This method is package private instead of private to support unit test invocation.
      * </p>
      *
-     * @param version       the actual Java version.
-     * @param versionPrefix the prefix for the expected Java version.
-     * @return true if matches, or false if not or can't determine.
+     * @param version       the actual Java version
+     * @param versionPrefix the prefix for the expected Java version
+     * @return true if matches, or false if not or can't determine
      */
     static boolean isJavaVersionMatch(final String version, final String versionPrefix) {
         if (version == null) {
@@ -2407,11 +2407,11 @@ static boolean isJavaVersionMatch(final String version, final String versionPref
      * This method is package private instead of private to support unit test invocation.
      * </p>
      *
-     * @param osName          the actual OS name.
-     * @param osVersion       the actual OS version.
-     * @param osNamePrefix    the prefix for the expected OS name.
-     * @param osVersionPrefix the prefix for the expected OS version.
-     * @return true if matches, or false if not or can't determine.
+     * @param osName          the actual OS name
+     * @param osVersion       the actual OS version
+     * @param osNamePrefix    the prefix for the expected OS name
+     * @param osVersionPrefix the prefix for the expected OS version
+     * @return true if matches, or false if not or can't determine
      */
     static boolean isOsMatch(final String osName, final String osVersion, final String osNamePrefix, final String osVersionPrefix) {
         if (osName == null || osVersion == null) {
@@ -2426,9 +2426,9 @@ static boolean isOsMatch(final String osName, final String osVersion, final Stri
      * This method is package private instead of private to support unit test invocation.
      * </p>
      *
-     * @param osName       the actual OS name.
-     * @param osNamePrefix the prefix for the expected OS name.
-     * @return true for a case-insensitive match, or false if not.
+     * @param osName       the actual OS name
+     * @param osNamePrefix the prefix for the expected OS name
+     * @return true for a case-insensitive match, or false if not
      */
     static boolean isOsNameMatch(final String osName, final String osNamePrefix) {
         if (osName == null) {
@@ -2443,9 +2443,9 @@ static boolean isOsNameMatch(final String osName, final String osNamePrefix) {
      * This method is package private instead of private to support unit test invocation.
      * </p>
      *
-     * @param osVersion       the actual OS version.
-     * @param osVersionPrefix the prefix for the expected OS version.
-     * @return true if matches, or false if not or can't determine.
+     * @param osVersion       the actual OS version
+     * @param osVersionPrefix the prefix for the expected OS version
+     * @return true if matches, or false if not or can't determine
      */
     static boolean isOsVersionMatch(final String osVersion, final String osVersionPrefix) {
         if (StringUtils.isEmpty(osVersion)) {
diff --git a/src/main/java/org/apache/commons/lang3/ThreadUtils.java b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
index e2af9d182dc..2e32bef078a 100644
--- a/src/main/java/org/apache/commons/lang3/ThreadUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
@@ -79,8 +79,8 @@ public static class NamePredicate implements ThreadPredicate, ThreadGroupPredica
         /**
          * Constructs an instance.
          *
-         * @param name thread or thread group name.
-         * @throws NullPointerException if the name is {@code null}.
+         * @param name thread or thread group name
+         * @throws NullPointerException if the name is {@code null}
          */
         public NamePredicate(final String name) {
             Objects.requireNonNull(name, "name");
@@ -128,10 +128,10 @@ public static class ThreadIdPredicate implements ThreadPredicate {
         private final long threadId;
 
         /**
-         * Predicate constructor
+         * Predicate constructor.
          *
-         * @param threadId the threadId to match.
-         * @throws IllegalArgumentException if the threadId is zero or negative.
+         * @param threadId the threadId to match
+         * @throws IllegalArgumentException if the threadId is zero or negative
          */
         public ThreadIdPredicate(final long threadId) {
             if (threadId <= 0) {
@@ -176,11 +176,11 @@ public interface ThreadPredicate {
     /**
      * Finds the active thread with the specified id.
      *
-     * @param threadId The thread id.
-     * @return The thread with the specified id or {@code null} if no such thread exists.
-     * @throws IllegalArgumentException if the specified id is zero or negative.
-     * @throws SecurityException        if the current thread cannot access the system thread group.
-     * @throws SecurityException        if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param threadId the thread id
+     * @return the thread with the specified id or {@code null} if no such thread exists
+     * @throws IllegalArgumentException if the specified id is zero or negative
+     * @throws SecurityException        if the current thread cannot access the system thread group
+     * @throws SecurityException        if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Thread findThreadById(final long threadId) {
         if (threadId <= 0) {
@@ -193,14 +193,14 @@ public static Thread findThreadById(final long threadId) {
     /**
      * Finds the active thread with the specified id if it belongs to a thread group with the specified group name.
      *
-     * @param threadId        The thread id.
-     * @param threadGroupName The thread group name.
-     * @return The threads which belongs to a thread group with the specified group name and the thread's id match the specified id. {@code null} is returned if
+     * @param threadId        the thread id
+     * @param threadGroupName the thread group name
+     * @return the threads which belongs to a thread group with the specified group name and the thread's id match the specified id. {@code null} is returned if
      *         no such thread exists.
-     * @throws NullPointerException     if the group name is null.
-     * @throws IllegalArgumentException if the specified id is zero or negative.
-     * @throws SecurityException        if the current thread cannot access the system thread group.
-     * @throws SecurityException        if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @throws IllegalArgumentException if the specified id is zero or negative
+     * @throws NullPointerException     if the group name is null
+     * @throws SecurityException        if the current thread cannot access the system thread group
+     * @throws SecurityException        if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Thread findThreadById(final long threadId, final String threadGroupName) {
         Objects.requireNonNull(threadGroupName, "threadGroupName");
@@ -214,14 +214,14 @@ public static Thread findThreadById(final long threadId, final String threadGrou
     /**
      * Finds the active thread with the specified id if it belongs to the specified thread group.
      *
-     * @param threadId    The thread id.
-     * @param threadGroup The thread group.
-     * @return The thread which belongs to a specified thread group and the thread's id match the specified id. {@code null} is returned if no such thread
+     * @param threadId    the thread id
+     * @param threadGroup the thread group
+     * @return the thread which belongs to a specified thread group and the thread's id match the specified id. {@code null} is returned if no such thread
      *         exists.
-     * @throws NullPointerException     if {@code threadGroup == null}.
-     * @throws IllegalArgumentException if the specified id is zero or negative.
-     * @throws SecurityException        if the current thread cannot access the system thread group.
-     * @throws SecurityException        if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @throws IllegalArgumentException if the specified id is zero or negative
+     * @throws NullPointerException     if {@code threadGroup == null}
+     * @throws SecurityException        if the current thread cannot access the system thread group
+     * @throws SecurityException        if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Thread findThreadById(final long threadId, final ThreadGroup threadGroup) {
         Objects.requireNonNull(threadGroup, "threadGroup");
@@ -235,11 +235,11 @@ public static Thread findThreadById(final long threadId, final ThreadGroup threa
     /**
      * Finds all active thread groups which match the given predicate.
      *
-     * @param predicate the predicate.
-     * @return An unmodifiable {@link Collection} of active thread groups matching the given predicate.
-     * @throws NullPointerException if the predicate is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param predicate the predicate
+     * @return an unmodifiable {@link Collection} of active thread groups matching the given predicate
+     * @throws NullPointerException if the predicate is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @since 3.13.0
      */
     public static Collection<ThreadGroup> findThreadGroups(final Predicate<ThreadGroup> predicate) {
@@ -249,12 +249,12 @@ public static Collection<ThreadGroup> findThreadGroups(final Predicate<ThreadGro
     /**
      * Finds all active thread groups which match the given predicate and which is a subgroup of the given thread group (or one of its subgroups).
      *
-     * @param threadGroup the thread group.
-     * @param recurse     if {@code true} then evaluate the predicate recursively on all thread groups in all subgroups of the given group.
-     * @param predicate   the predicate.
-     * @return An unmodifiable {@link Collection} of active thread groups which match the given predicate and which is a subgroup of the given thread group.
-     * @throws NullPointerException if the given group or predicate is null.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param threadGroup the thread group
+     * @param recurse     if {@code true} then evaluate the predicate recursively on all thread groups in all subgroups of the given group
+     * @param predicate   the predicate
+     * @return an unmodifiable {@link Collection} of active thread groups which match the given predicate and which is a subgroup of the given thread group
+     * @throws NullPointerException if the given group or predicate is null
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @since 3.13.0
      */
     public static Collection<ThreadGroup> findThreadGroups(final ThreadGroup threadGroup, final boolean recurse, final Predicate<ThreadGroup> predicate) {
@@ -273,12 +273,12 @@ public static Collection<ThreadGroup> findThreadGroups(final ThreadGroup threadG
     /**
      * Finds all active thread groups which match the given predicate and which is a subgroup of the given thread group (or one of its subgroups).
      *
-     * @param threadGroup the thread group.
-     * @param recurse     if {@code true} then evaluate the predicate recursively on all thread groups in all subgroups of the given group.
-     * @param predicate   the predicate.
-     * @return An unmodifiable {@link Collection} of active thread groups which match the given predicate and which is a subgroup of the given thread group.
-     * @throws NullPointerException if the given group or predicate is null.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param threadGroup the thread group
+     * @param recurse     if {@code true} then evaluate the predicate recursively on all thread groups in all subgroups of the given group
+     * @param predicate   the predicate
+     * @return an unmodifiable {@link Collection} of active thread groups which match the given predicate and which is a subgroup of the given thread group
+     * @throws NullPointerException if the given group or predicate is null
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @deprecated Use {@link #findThreadGroups(ThreadGroup, boolean, Predicate)}.
      */
     @Deprecated
@@ -289,11 +289,11 @@ public static Collection<ThreadGroup> findThreadGroups(final ThreadGroup threadG
     /**
      * Finds all active thread groups which match the given predicate.
      *
-     * @param predicate the predicate.
-     * @return An unmodifiable {@link Collection} of active thread groups matching the given predicate.
-     * @throws NullPointerException if the predicate is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param predicate the predicate
+     * @return an unmodifiable {@link Collection} of active thread groups matching the given predicate
+     * @throws NullPointerException if the predicate is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @deprecated Use {@link #findThreadGroups(Predicate)}.
      */
     @Deprecated
@@ -304,12 +304,12 @@ public static Collection<ThreadGroup> findThreadGroups(final ThreadGroupPredicat
     /**
      * Finds active thread groups with the specified group name.
      *
-     * @param threadGroupName The thread group name.
+     * @param threadGroupName the thread group name
      * @return the thread groups with the specified group name or an empty collection if no such thread group exists. The collection returned is always
      *         unmodifiable.
-     * @throws NullPointerException if group name is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @throws NullPointerException if group name is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Collection<ThreadGroup> findThreadGroupsByName(final String threadGroupName) {
         return findThreadGroups(predicateThreadGroup(threadGroupName));
@@ -318,11 +318,11 @@ public static Collection<ThreadGroup> findThreadGroupsByName(final String thread
     /**
      * Finds all active threads which match the given predicate.
      *
-     * @param predicate the predicate.
-     * @return An unmodifiable {@link Collection} of active threads matching the given predicate.
-     * @throws NullPointerException if the predicate is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param predicate the predicate
+     * @return an unmodifiable {@link Collection} of active threads matching the given predicate
+     * @throws NullPointerException if the predicate is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @since 3.13.0
      */
     public static Collection<Thread> findThreads(final Predicate<Thread> predicate) {
@@ -332,12 +332,12 @@ public static Collection<Thread> findThreads(final Predicate<Thread> predicate)
     /**
      * Finds all active threads which match the given predicate and which belongs to the given thread group (or one of its subgroups).
      *
-     * @param threadGroup the thread group.
-     * @param recurse     if {@code true} then evaluate the predicate recursively on all threads in all subgroups of the given group.
-     * @param predicate   the predicate.
-     * @return An unmodifiable {@link Collection} of active threads which match the given predicate and which belongs to the given thread group.
-     * @throws NullPointerException if the given group or predicate is null.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param threadGroup the thread group
+     * @param recurse     if {@code true} then evaluate the predicate recursively on all threads in all subgroups of the given group
+     * @param predicate   the predicate
+     * @return an unmodifiable {@link Collection} of active threads which match the given predicate and which belongs to the given thread group
+     * @throws NullPointerException if the given group or predicate is null
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @since 3.13.0
      */
     public static Collection<Thread> findThreads(final ThreadGroup threadGroup, final boolean recurse, final Predicate<Thread> predicate) {
@@ -356,12 +356,12 @@ public static Collection<Thread> findThreads(final ThreadGroup threadGroup, fina
     /**
      * Finds all active threads which match the given predicate and which belongs to the given thread group (or one of its subgroups).
      *
-     * @param threadGroup the thread group.
-     * @param recurse     if {@code true} then evaluate the predicate recursively on all threads in all subgroups of the given group.
-     * @param predicate   the predicate.
-     * @return An unmodifiable {@link Collection} of active threads which match the given predicate and which belongs to the given thread group.
-     * @throws NullPointerException if the given group or predicate is null.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param threadGroup the thread group
+     * @param recurse     if {@code true} then evaluate the predicate recursively on all threads in all subgroups of the given group
+     * @param predicate   the predicate
+     * @return an unmodifiable {@link Collection} of active threads which match the given predicate and which belongs to the given thread group
+     * @throws NullPointerException if the given group or predicate is null
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @deprecated Use {@link #findThreads(ThreadGroup, boolean, Predicate)}.
      */
     @Deprecated
@@ -372,11 +372,11 @@ public static Collection<Thread> findThreads(final ThreadGroup threadGroup, fina
     /**
      * Finds all active threads which match the given predicate.
      *
-     * @param predicate the predicate.
-     * @return An unmodifiable {@link Collection} of active threads matching the given predicate.
-     * @throws NullPointerException if the predicate is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param predicate the predicate
+     * @return an unmodifiable {@link Collection} of active threads matching the given predicate
+     * @throws NullPointerException if the predicate is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      * @deprecated Use {@link #findThreads(Predicate)}.
      */
     @Deprecated
@@ -387,11 +387,11 @@ public static Collection<Thread> findThreads(final ThreadPredicate predicate) {
     /**
      * Finds active threads with the specified name.
      *
-     * @param threadName The thread name.
-     * @return The threads with the specified name or an empty collection if no such thread exists. The collection returned is always unmodifiable.
-     * @throws NullPointerException if the specified name is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @param threadName the thread name
+     * @return the threads with the specified name or an empty collection if no such thread exists. The collection returned is always unmodifiable.
+     * @throws NullPointerException if the specified name is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Collection<Thread> findThreadsByName(final String threadName) {
         return findThreads(predicateThread(threadName));
@@ -400,13 +400,13 @@ public static Collection<Thread> findThreadsByName(final String threadName) {
     /**
      * Finds active threads with the specified name if they belong to a thread group with the specified group name.
      *
-     * @param threadName      The thread name.
-     * @param threadGroupName The thread group name.
-     * @return The threads which belongs to a thread group with the specified group name and the thread's name match the specified name, An empty collection is
+     * @param threadName      the thread name
+     * @param threadGroupName the thread group name
+     * @return the threads which belongs to a thread group with the specified group name and the thread's name match the specified name, An empty collection is
      *         returned if no such thread exists. The collection returned is always unmodifiable.
-     * @throws NullPointerException if the specified thread name or group name is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @throws NullPointerException if the specified thread name or group name is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Collection<Thread> findThreadsByName(final String threadName, final String threadGroupName) {
         Objects.requireNonNull(threadName, "threadName");
@@ -418,13 +418,13 @@ public static Collection<Thread> findThreadsByName(final String threadName, fina
     /**
      * Finds active threads with the specified name if they belong to a specified thread group.
      *
-     * @param threadName  The thread name.
-     * @param threadGroup The thread group.
-     * @return The threads which belongs to a thread group and the thread's name match the specified name, An empty collection is returned if no such thread
+     * @param threadName  the thread name
+     * @param threadGroup the thread group
+     * @return the threads which belongs to a thread group and the thread's name match the specified name, An empty collection is returned if no such thread
      *         exists. The collection returned is always unmodifiable.
-     * @throws NullPointerException if the specified thread name or group is null.
-     * @throws SecurityException    if the current thread cannot access the system thread group.
-     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @throws NullPointerException if the specified thread name or group is null
+     * @throws SecurityException    if the current thread cannot access the system thread group
+     * @throws SecurityException    if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Collection<Thread> findThreadsByName(final String threadName, final ThreadGroup threadGroup) {
         return findThreads(threadGroup, false, predicateThread(threadName));
@@ -434,8 +434,8 @@ public static Collection<Thread> findThreadsByName(final String threadName, fina
      * Gets all active thread groups excluding the system thread group (A thread group is active if it has been not destroyed).
      *
      * @return all thread groups excluding the system thread group. The collection returned is always unmodifiable.
-     * @throws SecurityException if the current thread cannot access the system thread group.
-     * @throws SecurityException if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @throws SecurityException if the current thread cannot access the system thread group
+     * @throws SecurityException if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Collection<ThreadGroup> getAllThreadGroups() {
         return findThreadGroups(Predicates.truePredicate());
@@ -445,8 +445,8 @@ public static Collection<ThreadGroup> getAllThreadGroups() {
      * Gets all active threads (A thread is active if it has been started and has not yet died).
      *
      * @return all active threads. The collection returned is always unmodifiable.
-     * @throws SecurityException if the current thread cannot access the system thread group.
-     * @throws SecurityException if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @throws SecurityException if the current thread cannot access the system thread group
+     * @throws SecurityException if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static Collection<Thread> getAllThreads() {
         return findThreads(Predicates.truePredicate());
@@ -458,8 +458,8 @@ public static Collection<Thread> getAllThreads() {
      * This method returns null if this thread has died (been stopped).
      * </p>
      *
-     * @return the system thread group.
-     * @throws SecurityException if the current thread cannot modify thread groups from this thread's thread group up to the system thread group.
+     * @return the system thread group
+     * @throws SecurityException if the current thread cannot modify thread groups from this thread's thread group up to the system thread group
      */
     public static ThreadGroup getSystemThreadGroup() {
         ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
@@ -472,9 +472,9 @@ public static ThreadGroup getSystemThreadGroup() {
     /**
      * Waits for the given thread to die for the given duration. Implemented using {@link Thread#join(long, int)}.
      *
-     * @param thread The thread to join.
-     * @param duration How long to wait.
-     * @throws InterruptedException if any thread has interrupted the current thread.
+     * @param thread the thread to join
+     * @param duration how long to wait
+     * @throws InterruptedException if any thread has interrupted the current thread
      * @see Thread#join(long, int)
      * @since 3.12.0
      */
@@ -497,8 +497,8 @@ private static Predicate<ThreadGroup> predicateThreadGroup(final String threadGr
     /**
      * Sleeps the current thread for the given duration. Implemented using {@link Thread#sleep(long, int)}.
      *
-     * @param duration How long to sleep.
-     * @throws InterruptedException if any thread has interrupted the current thread.
+     * @param duration how long to sleep
+     * @throws InterruptedException if any thread has interrupted the current thread
      * @see Thread#sleep(long, int)
      * @since 3.12.0
      */
@@ -512,7 +512,7 @@ public static void sleep(final Duration duration) throws InterruptedException {
      * The sleep duration may be shorter than the given duration if we catch a {@link InterruptedException}.
      * </p>
      *
-     * @param duration the length of time to sleep.
+     * @param duration the length of time to sleep
      * @see #sleep(Duration)
      * @see Thread#interrupted()
      * @since 3.13.0
diff --git a/src/main/java/org/apache/commons/lang3/Validate.java b/src/main/java/org/apache/commons/lang3/Validate.java
index 7239384b99c..dadbd0935ab 100644
--- a/src/main/java/org/apache/commons/lang3/Validate.java
+++ b/src/main/java/org/apache/commons/lang3/Validate.java
@@ -84,10 +84,10 @@ public class Validate {
      *
      * <pre>Validate.exclusiveBetween(0.1, 2.1, 1.1);</pre>
      *
-     * @param start the exclusive start value.
-     * @param end   the exclusive end value.
-     * @param value the value to validate.
-     * @throws IllegalArgumentException if the value falls out of the boundaries.
+     * @param start the exclusive start value
+     * @param end   the exclusive end value
+     * @param value the value to validate
+     * @throws IllegalArgumentException if the value falls out of the boundaries
      * @since 3.3
      */
     @SuppressWarnings("boxing")
@@ -105,11 +105,11 @@ public static void exclusiveBetween(final double start, final double end, final
      *
      * <pre>Validate.exclusiveBetween(0.1, 2.1, 1.1, "Not in range");</pre>
      *
-     * @param start the exclusive start value.
-     * @param end   the exclusive end value.
-     * @param value the value to validate.
-     * @param message the exception message if invalid, not null.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param start the exclusive start value
+     * @param end   the exclusive end value
+     * @param value the value to validate
+     * @param message the exception message if invalid, not null
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @since 3.3
      */
     public static void exclusiveBetween(final double start, final double end, final double value, final String message) {
@@ -125,10 +125,10 @@ public static void exclusiveBetween(final double start, final double end, final
      *
      * <pre>Validate.exclusiveBetween(0, 2, 1);</pre>
      *
-     * @param start the exclusive start value.
-     * @param end   the exclusive end value.
-     * @param value the value to validate.
-     * @throws IllegalArgumentException if the value falls out of the boundaries.
+     * @param start the exclusive start value
+     * @param end   the exclusive end value
+     * @param value the value to validate
+     * @throws IllegalArgumentException if the value falls out of the boundaries
      * @since 3.3
      */
     @SuppressWarnings("boxing")
@@ -146,11 +146,11 @@ public static void exclusiveBetween(final long start, final long end, final long
      *
      * <pre>Validate.exclusiveBetween(0, 2, 1, "Not in range");</pre>
      *
-     * @param start the exclusive start value.
-     * @param end   the exclusive end value.
-     * @param value the value to validate.
-     * @param message the exception message if invalid, not null.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param start the exclusive start value
+     * @param end   the exclusive end value
+     * @param value the value to validate
+     * @param message the exception message if invalid, not null
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @since 3.3
      */
     public static void exclusiveBetween(final long start, final long end, final long value, final String message) {
@@ -166,11 +166,11 @@ public static void exclusiveBetween(final long start, final long end, final long
      *
      * <pre>Validate.exclusiveBetween(0, 2, 1);</pre>
      *
-     * @param <T> the type of the argument object.
-     * @param start  the exclusive start value, not null.
-     * @param end  the exclusive end value, not null.
-     * @param value  the object to validate, not null.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param <T> the type of the argument object
+     * @param start  the exclusive start value, not null
+     * @param end  the exclusive end value, not null
+     * @param value  the object to validate, not null
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @see #exclusiveBetween(Object, Object, Comparable, String, Object...)
      * @since 3.0
      */
@@ -188,13 +188,13 @@ public static <T> void exclusiveBetween(final T start, final T end, final Compar
      *
      * <pre>Validate.exclusiveBetween(0, 2, 1, "Not in boundaries");</pre>
      *
-     * @param <T> the type of the argument object.
-     * @param start  the exclusive start value, not null.
-     * @param end  the exclusive end value, not null.
-     * @param value  the object to validate, not null.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param <T> the type of the argument object
+     * @param start  the exclusive start value, not null
+     * @param end  the exclusive end value, not null
+     * @param value  the object to validate, not null
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @see #exclusiveBetween(Object, Object, Comparable)
      * @since 3.0
      */
@@ -213,8 +213,8 @@ public static <T> void exclusiveBetween(final T start, final T end, final Compar
      *
      * <p>The message of the exception is &quot;The value is invalid: %f&quot;.</p>
      *
-     * @param value  the value to validate.
-     * @throws IllegalArgumentException if the value is infinite or Not-a-Number (NaN).
+     * @param value  the value to validate
+     * @throws IllegalArgumentException if the value is infinite or Not-a-Number (NaN)
      * @see #finite(double, String, Object...)
      * @since 3.5
      */
@@ -228,10 +228,10 @@ public static void finite(final double value) {
      *
      * <pre>Validate.finite(myDouble, "The argument must contain a numeric value");</pre>
      *
-     * @param value the value to validate.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message.
-     * @throws IllegalArgumentException if the value is infinite or Not-a-Number (NaN).
+     * @param value the value to validate
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message
+     * @throws IllegalArgumentException if the value is infinite or Not-a-Number (NaN)
      * @see #finite(double)
      * @since 3.5
      */
@@ -246,10 +246,10 @@ public static void finite(final double value, final String message, final Object
      * unformatted. This method exists to allow validation methods declaring a String message and varargs parameters to be used without any message parameters
      * when the message contains special characters, e.g. {@code Validate.isTrue(false, "%Failed%")}.
      *
-     * @param message the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted message.
+     * @param message the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted message
      * @return formatted message using {@link String#format(String, Object...) String.format(message, values)} if the values are not empty, otherwise return the
-     *         unformatted message.
+     *         unformatted message
      */
     private static String getMessage(final String message, final Object... values) {
         return ArrayUtils.isEmpty(values) ? message : String.format(message, values);
@@ -261,10 +261,10 @@ private static String getMessage(final String message, final Object... values) {
      *
      * <pre>Validate.inclusiveBetween(0.1, 2.1, 1.1);</pre>
      *
-     * @param start the inclusive start value.
-     * @param end   the inclusive end value.
-     * @param value the value to validate.
-     * @throws IllegalArgumentException if the value falls outside the boundaries (inclusive).
+     * @param start the inclusive start value
+     * @param end   the inclusive end value
+     * @param value the value to validate
+     * @throws IllegalArgumentException if the value falls outside the boundaries (inclusive)
      * @since 3.3
      */
     @SuppressWarnings("boxing")
@@ -282,11 +282,11 @@ public static void inclusiveBetween(final double start, final double end, final
      *
      * <pre>Validate.inclusiveBetween(0.1, 2.1, 1.1, "Not in range");</pre>
      *
-     * @param start the inclusive start value.
-     * @param end   the inclusive end value.
-     * @param value the value to validate.
-     * @param message the exception message if invalid, not null.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param start the inclusive start value
+     * @param end   the inclusive end value
+     * @param value the value to validate
+     * @param message the exception message if invalid, not null
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @since 3.3
      */
     public static void inclusiveBetween(final double start, final double end, final double value, final String message) {
@@ -302,10 +302,10 @@ public static void inclusiveBetween(final double start, final double end, final
      *
      * <pre>Validate.inclusiveBetween(0, 2, 1);</pre>
      *
-     * @param start the inclusive start value.
-     * @param end   the inclusive end value.
-     * @param value the value to validate.
-     * @throws IllegalArgumentException if the value falls outside the boundaries (inclusive).
+     * @param start the inclusive start value
+     * @param end   the inclusive end value
+     * @param value the value to validate
+     * @throws IllegalArgumentException if the value falls outside the boundaries (inclusive)
      * @since 3.3
      */
     @SuppressWarnings("boxing")
@@ -323,11 +323,11 @@ public static void inclusiveBetween(final long start, final long end, final long
      *
      * <pre>Validate.inclusiveBetween(0, 2, 1, "Not in range");</pre>
      *
-     * @param start the inclusive start value.
-     * @param end   the inclusive end value.
-     * @param value the value to validate.
-     * @param message the exception message if invalid, not null.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param start the inclusive start value
+     * @param end   the inclusive end value
+     * @param value the value to validate
+     * @param message the exception message if invalid, not null
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @since 3.3
      */
     public static void inclusiveBetween(final long start, final long end, final long value, final String message) {
@@ -343,11 +343,11 @@ public static void inclusiveBetween(final long start, final long end, final long
      *
      * <pre>Validate.inclusiveBetween(0, 2, 1);</pre>
      *
-     * @param <T> the type of the argument object.
-     * @param start  the inclusive start value, not null.
-     * @param end  the inclusive end value, not null.
-     * @param value  the object to validate, not null.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param <T> the type of the argument object
+     * @param start  the inclusive start value, not null
+     * @param end  the inclusive end value, not null
+     * @param value  the object to validate, not null
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @see #inclusiveBetween(Object, Object, Comparable, String, Object...)
      * @since 3.0
      */
@@ -365,13 +365,13 @@ public static <T> void inclusiveBetween(final T start, final T end, final Compar
      *
      * <pre>Validate.inclusiveBetween(0, 2, 1, "Not in boundaries");</pre>
      *
-     * @param <T> the type of the argument object.
-     * @param start  the inclusive start value, not null.
-     * @param end  the inclusive end value, not null.
-     * @param value  the object to validate, not null.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @throws IllegalArgumentException if the value falls outside the boundaries.
+     * @param <T> the type of the argument object
+     * @param start  the inclusive start value, not null
+     * @param end  the inclusive end value, not null
+     * @param value  the object to validate, not null
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @throws IllegalArgumentException if the value falls outside the boundaries
      * @see #inclusiveBetween(Object, Object, Comparable)
      * @since 3.0
      */
@@ -391,9 +391,9 @@ public static <T> void inclusiveBetween(final T start, final T end, final Compar
      *
      * <p>The message format of the exception is &quot;Cannot assign {type} to {superType}&quot;</p>
      *
-     * @param superType  the class must be validated against, not null.
-     * @param type  the class to check, not null.
-     * @throws IllegalArgumentException if type argument is not assignable to the specified superType.
+     * @param superType  the class must be validated against, not null
+     * @param type  the class to check, not null
+     * @throws IllegalArgumentException if type argument is not assignable to the specified superType
      * @see #isAssignableFrom(Class, Class, String, Object...)
      * @since 3.0
      */
@@ -415,11 +415,11 @@ public static void isAssignableFrom(final Class<?> superType, final Class<?> typ
      * <p>The message of the exception is &quot;The validated object cannot be converted to the&quot;
      * followed by the name of the class and &quot;class&quot;</p>
      *
-     * @param superType  the class must be validated against, not null.
-     * @param type  the class to check, not null.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @throws IllegalArgumentException if argument cannot be converted to the specified class.
+     * @param superType  the class must be validated against, not null
+     * @param type  the class to check, not null
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @throws IllegalArgumentException if argument cannot be converted to the specified class
      * @see #isAssignableFrom(Class, Class)
      */
     public static void isAssignableFrom(final Class<?> superType, final Class<?> type, final String message, final Object... values) {
@@ -438,9 +438,9 @@ public static void isAssignableFrom(final Class<?> superType, final Class<?> typ
      *
      * <p>The message of the exception is &quot;Expected type: {type}, actual: {obj_type}&quot;</p>
      *
-     * @param type  the class the object must be validated against, not null.
-     * @param obj  the object to check, null throws an exception.
-     * @throws IllegalArgumentException if argument is not of specified class.
+     * @param type  the class the object must be validated against, not null
+     * @param obj  the object to check, null throws an exception
+     * @throws IllegalArgumentException if argument is not of specified class
      * @see #isInstanceOf(Class, Object, String, Object...)
      * @since 3.0
      */
@@ -459,11 +459,11 @@ public static void isInstanceOf(final Class<?> type, final Object obj) {
      * <pre>Validate.isInstanceOf(OkClass.class, object, "Wrong class, object is of class %s",
      *   object.getClass().getName());</pre>
      *
-     * @param type  the class the object must be validated against, not null.
-     * @param obj  the object to check, null throws an exception.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @throws IllegalArgumentException if argument is not of specified class.
+     * @param type  the class the object must be validated against, not null
+     * @param obj  the object to check, null throws an exception
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @throws IllegalArgumentException if argument is not of specified class
      * @see #isInstanceOf(Class, Object)
      * @since 3.0
      */
@@ -487,8 +487,8 @@ public static void isInstanceOf(final Class<?> type, final Object obj, final Str
      * <p>The message of the exception is &quot;The validated expression is
      * false&quot;.</p>
      *
-     * @param expression  the boolean expression to check.
-     * @throws IllegalArgumentException if expression is {@code false}.
+     * @param expression  the boolean expression to check
+     * @throws IllegalArgumentException if expression is {@code false}
      * @see #isTrue(boolean, String, long)
      * @see #isTrue(boolean, String, double)
      * @see #isTrue(boolean, String, Object...)
@@ -511,10 +511,10 @@ public static void isTrue(final boolean expression) {
      * <p>For performance reasons, the double value is passed as a separate parameter and
      * appended to the exception message only in the case of an error.</p>
      *
-     * @param expression  the boolean expression to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param value  the value to append to the message when invalid.
-     * @throws IllegalArgumentException if expression is {@code false}.
+     * @param expression  the boolean expression to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param value  the value to append to the message when invalid
+     * @throws IllegalArgumentException if expression is {@code false}
      * @see #isTrue(boolean)
      * @see #isTrue(boolean, String, long)
      * @see #isTrue(boolean, String, Object...)
@@ -537,10 +537,10 @@ public static void isTrue(final boolean expression, final String message, final
      * <p>For performance reasons, the long value is passed as a separate parameter and
      * appended to the exception message only in the case of an error.</p>
      *
-     * @param expression  the boolean expression to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param value  the value to append to the message when invalid.
-     * @throws IllegalArgumentException if expression is {@code false}.
+     * @param expression  the boolean expression to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param value  the value to append to the message when invalid
+     * @throws IllegalArgumentException if expression is {@code false}
      * @see #isTrue(boolean)
      * @see #isTrue(boolean, String, double)
      * @see #isTrue(boolean, String, Object...)
@@ -561,10 +561,10 @@ public static void isTrue(final boolean expression, final String message, final
      * <pre>{@code
      * Validate.isTrue(i >= min &amp;&amp; i <= max, "The value must be between %d and %d", min, max);}</pre>
      *
-     * @param expression  the boolean expression to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @throws IllegalArgumentException if expression is {@code false}.
+     * @param expression  the boolean expression to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @throws IllegalArgumentException if expression is {@code false}
      * @see #isTrue(boolean)
      * @see #isTrue(boolean, String, long)
      * @see #isTrue(boolean, String, double)
@@ -584,9 +584,9 @@ public static void isTrue(final boolean expression, final String message, final
      * Validate.isTrue(i >= min && i <= max, "The value must be between %d and %d", min, max);
      * }</pre>
      *
-     * @param expression      the boolean expression to check.
-     * @param messageSupplier the exception message supplier.
-     * @throws IllegalArgumentException if expression is {@code false}.
+     * @param expression      the boolean expression to check
+     * @param messageSupplier the exception message supplier
+     * @throws IllegalArgumentException if expression is {@code false}
      * @see #isTrue(boolean)
      * @see #isTrue(boolean, String, long)
      * @see #isTrue(boolean, String, double)
@@ -606,9 +606,9 @@ public static void isTrue(final boolean expression, final Supplier<String> messa
      *
      * <p>The syntax of the pattern is the one used in the {@link Pattern} class.</p>
      *
-     * @param input  the character sequence to validate, not null.
-     * @param pattern  the regular expression pattern, not null.
-     * @throws IllegalArgumentException if the character sequence does not match the pattern.
+     * @param input  the character sequence to validate, not null
+     * @param pattern  the regular expression pattern, not null
+     * @throws IllegalArgumentException if the character sequence does not match the pattern
      * @see #matchesPattern(CharSequence, String, String, Object...)
      * @since 3.0
      */
@@ -627,11 +627,11 @@ public static void matchesPattern(final CharSequence input, final String pattern
      *
      * <p>The syntax of the pattern is the one used in the {@link Pattern} class.</p>
      *
-     * @param input  the character sequence to validate, not null.
-     * @param pattern  the regular expression pattern, not null.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @throws IllegalArgumentException if the character sequence does not match the pattern.
+     * @param input  the character sequence to validate, not null
+     * @param pattern  the regular expression pattern, not null
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @throws IllegalArgumentException if the character sequence does not match the pattern
      * @see #matchesPattern(CharSequence, String)
      * @since 3.0
      */
@@ -656,11 +656,11 @@ public static void matchesPattern(final CharSequence input, final String pattern
      * exception is &quot;The validated iterable contains null element at index:
      * &quot; followed by the index.</p>
      *
-     * @param <T> the iterable type.
-     * @param iterable  the iterable to check, validated not null by this method.
-     * @return the validated iterable (never {@code null} method for chaining).
-     * @throws NullPointerException if the array is {@code null}.
-     * @throws IllegalArgumentException if an element is {@code null}.
+     * @param <T> the iterable type
+     * @param iterable  the iterable to check, validated not null by this method
+     * @return the validated iterable (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if an element is {@code null}
+     * @throws NullPointerException if the array is {@code null}
      * @see #noNullElements(Iterable, String, Object...)
      */
     public static <T extends Iterable<?>> T noNullElements(final T iterable) {
@@ -681,13 +681,13 @@ public static <T extends Iterable<?>> T noNullElements(final T iterable) {
      * index of the invalid element is appended to the {@code values}
      * argument.</p>
      *
-     * @param <T> the iterable type.
-     * @param iterable  the iterable to check, validated not null by this method.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated iterable (never {@code null} method for chaining).
-     * @throws NullPointerException if the array is {@code null}.
-     * @throws IllegalArgumentException if an element is {@code null}.
+     * @param <T> the iterable type
+     * @param iterable  the iterable to check, validated not null by this method
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated iterable (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if an element is {@code null}
+     * @throws NullPointerException if the array is {@code null}
      * @see #noNullElements(Iterable)
      */
     public static <T extends Iterable<?>> T noNullElements(final T iterable, final String message, final Object... values) {
@@ -715,11 +715,11 @@ public static <T extends Iterable<?>> T noNullElements(final T iterable, final S
      * exception is &quot;The validated array contains null element at index:
      * &quot; followed by the index.</p>
      *
-     * @param <T> the array type.
-     * @param array  the array to check, validated not null by this method.
-     * @return the validated array (never {@code null} method for chaining).
-     * @throws NullPointerException if the array is {@code null}.
-     * @throws IllegalArgumentException if an element is {@code null}.
+     * @param <T> the array type
+     * @param array  the array to check, validated not null by this method
+     * @return the validated array (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if an element is {@code null}
+     * @throws NullPointerException if the array is {@code null}
      * @see #noNullElements(Object[], String, Object...)
      */
     public static <T> T[] noNullElements(final T[] array) {
@@ -740,13 +740,13 @@ public static <T> T[] noNullElements(final T[] array) {
      * index of the invalid element is appended to the {@code values}
      * argument.</p>
      *
-     * @param <T> the array type.
-     * @param array  the array to check, validated not null by this method.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated array (never {@code null} method for chaining).
-     * @throws NullPointerException if the array is {@code null}.
-     * @throws IllegalArgumentException if an element is {@code null}.
+     * @param <T> the array type
+     * @param array  the array to check, validated not null by this method
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated array (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if an element is {@code null}
+     * @throws NullPointerException if the array is {@code null}
      * @see #noNullElements(Object[])
      */
     public static <T> T[] noNullElements(final T[] array, final String message, final Object... values) {
@@ -770,11 +770,11 @@ public static <T> T[] noNullElements(final T[] array, final String message, fina
      * <p>The message in the exception is &quot;The validated character
      * sequence is blank&quot;.
      *
-     * @param <T> the character sequence type.
-     * @param chars  the character sequence to check, validated not null by this method.
-     * @return the validated character sequence (never {@code null} method for chaining).
-     * @throws NullPointerException if the character sequence is {@code null}.
-     * @throws IllegalArgumentException if the character sequence is blank.
+     * @param <T> the character sequence type
+     * @param chars  the character sequence to check, validated not null by this method
+     * @return the validated character sequence (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the character sequence is blank
+     * @throws NullPointerException if the character sequence is {@code null}
      * @see #notBlank(CharSequence, String, Object...)
      * @since 3.0
      */
@@ -790,13 +790,13 @@ public static <T extends CharSequence> T notBlank(final T chars) {
      * Validate.notBlank(myString, "The string must not be blank");
      * </pre>
      *
-     * @param <T>     the character sequence type.
-     * @param chars   the character sequence to check, validated not null by this method.
-     * @param message the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated character sequence (never {@code null} method for chaining).
-     * @throws NullPointerException     if the character sequence is {@code null}.
-     * @throws IllegalArgumentException if the character sequence is blank.
+     * @param <T>     the character sequence type
+     * @param chars   the character sequence to check, validated not null by this method
+     * @param message the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated character sequence (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the character sequence is blank
+     * @throws NullPointerException     if the character sequence is {@code null}
      * @see #notBlank(CharSequence)
      * @see StringUtils#isBlank(CharSequence)
      * @since 3.0
@@ -818,11 +818,11 @@ public static <T extends CharSequence> T notBlank(final T chars, final String me
      * <p>The message in the exception is &quot;The validated collection is
      * empty&quot;.
      *
-     * @param <T> the collection type.
-     * @param collection  the collection to check, validated not null by this method.
-     * @return the validated collection (never {@code null} method for chaining).
-     * @throws NullPointerException if the collection is {@code null}.
-     * @throws IllegalArgumentException if the collection is empty.
+     * @param <T> the collection type
+     * @param collection  the collection to check, validated not null by this method
+     * @return the validated collection (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the collection is empty
+     * @throws NullPointerException if the collection is {@code null}
      * @see #notEmpty(Collection, String, Object...)
      */
     public static <T extends Collection<?>> T notEmpty(final T collection) {
@@ -838,11 +838,11 @@ public static <T extends Collection<?>> T notEmpty(final T collection) {
      * <p>The message in the exception is &quot;The validated map is
      * empty&quot;.
      *
-     * @param <T> the map type.
-     * @param map  the map to check, validated not null by this method.
-     * @return the validated map (never {@code null} method for chaining).
-     * @throws NullPointerException if the map is {@code null}.
-     * @throws IllegalArgumentException if the map is empty.
+     * @param <T> the map type
+     * @param map  the map to check, validated not null by this method
+     * @return the validated map (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the map is empty
+     * @throws NullPointerException if the map is {@code null}
      * @see #notEmpty(Map, String, Object...)
      */
     public static <T extends Map<?, ?>> T notEmpty(final T map) {
@@ -859,11 +859,11 @@ public static <T extends Collection<?>> T notEmpty(final T collection) {
      * <p>The message in the exception is &quot;The validated
      * character sequence is empty&quot;.
      *
-     * @param <T> the character sequence type.
-     * @param chars  the character sequence to check, validated not null by this method.
-     * @return the validated character sequence (never {@code null} method for chaining).
-     * @throws NullPointerException if the character sequence is {@code null}.
-     * @throws IllegalArgumentException if the character sequence is empty.
+     * @param <T> the character sequence type
+     * @param chars  the character sequence to check, validated not null by this method
+     * @return the validated character sequence (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the character sequence is empty
+     * @throws NullPointerException if the character sequence is {@code null}
      * @see #notEmpty(CharSequence, String, Object...)
      */
     public static <T extends CharSequence> T notEmpty(final T chars) {
@@ -877,13 +877,13 @@ public static <T extends CharSequence> T notEmpty(final T chars) {
      *
      * <pre>Validate.notEmpty(myCollection, "The collection must not be empty");</pre>
      *
-     * @param <T> the collection type.
-     * @param collection  the collection to check, validated not null by this method.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated collection (never {@code null} method for chaining).
-     * @throws NullPointerException if the collection is {@code null}.
-     * @throws IllegalArgumentException if the collection is empty.
+     * @param <T> the collection type
+     * @param collection  the collection to check, validated not null by this method
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated collection (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the collection is empty
+     * @throws NullPointerException if the collection is {@code null}
      * @see #notEmpty(Object[])
      */
     public static <T extends Collection<?>> T notEmpty(final T collection, final String message, final Object... values) {
@@ -901,13 +901,13 @@ public static <T extends Collection<?>> T notEmpty(final T collection, final Str
      *
      * <pre>Validate.notEmpty(myMap, "The map must not be empty");</pre>
      *
-     * @param <T> the map type.
-     * @param map  the map to check, validated not null by this method.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated map (never {@code null} method for chaining).
-     * @throws NullPointerException if the map is {@code null}.
-     * @throws IllegalArgumentException if the map is empty.
+     * @param <T> the map type
+     * @param map  the map to check, validated not null by this method
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated map (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the map is empty
+     * @throws NullPointerException if the map is {@code null}
      * @see #notEmpty(Object[])
      */
     public static <T extends Map<?, ?>> T notEmpty(final T map, final String message, final Object... values) {
@@ -925,13 +925,13 @@ public static <T extends Collection<?>> T notEmpty(final T collection, final Str
      *
      * <pre>Validate.notEmpty(myString, "The string must not be empty");</pre>
      *
-     * @param <T> the character sequence type.
-     * @param chars  the character sequence to check, validated not null by this method.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated character sequence (never {@code null} method for chaining).
-     * @throws NullPointerException if the character sequence is {@code null}.
-     * @throws IllegalArgumentException if the character sequence is empty.
+     * @param <T> the character sequence type
+     * @param chars  the character sequence to check, validated not null by this method
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated character sequence (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the character sequence is empty
+     * @throws NullPointerException if the character sequence is {@code null}
      * @see #notEmpty(CharSequence)
      */
     public static <T extends CharSequence> T notEmpty(final T chars, final String message, final Object... values) {
@@ -951,11 +951,11 @@ public static <T extends CharSequence> T notEmpty(final T chars, final String me
      * <p>The message in the exception is &quot;The validated array is
      * empty&quot;.
      *
-     * @param <T> the array type.
-     * @param array  the array to check, validated not null by this method.
-     * @return the validated array (never {@code null} method for chaining).
-     * @throws NullPointerException if the array is {@code null}.
-     * @throws IllegalArgumentException if the array is empty.
+     * @param <T> the array type
+     * @param array  the array to check, validated not null by this method
+     * @return the validated array (never {@code null} method for chaining)
+     * @throws IllegalArgumentException if the array is empty
+     * @throws NullPointerException if the array is {@code null}
      * @see #notEmpty(Object[], String, Object...)
      */
     public static <T> T[] notEmpty(final T[] array) {
@@ -969,13 +969,13 @@ public static <T> T[] notEmpty(final T[] array) {
      *
      * <pre>Validate.notEmpty(myArray, "The array must not be empty");</pre>
      *
-     * @param <T> the array type.
-     * @param array  the array to check, validated not null by this method.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated array (never {@code null} method for chaining).
-     * @throws NullPointerException if the array is {@code null}
+     * @param <T> the array type
+     * @param array  the array to check, validated not null by this method
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated array (never {@code null} method for chaining)
      * @throws IllegalArgumentException if the array is empty
+     * @throws NullPointerException if the array is {@code null}
      * @see #notEmpty(Object[])
      */
     public static <T> T[] notEmpty(final T[] array, final String message, final Object... values) {
@@ -995,8 +995,8 @@ public static <T> T[] notEmpty(final T[] array, final String message, final Obje
      * <p>The message of the exception is &quot;The validated value is not a
      * number&quot;.</p>
      *
-     * @param value  the value to validate.
-     * @throws IllegalArgumentException if the value is not a number.
+     * @param value  the value to validate
+     * @throws IllegalArgumentException if the value is not a number
      * @see #notNaN(double, String, Object...)
      * @since 3.5
      */
@@ -1010,10 +1010,10 @@ public static void notNaN(final double value) {
      *
      * <pre>Validate.notNaN(myDouble, "The value must be a number");</pre>
      *
-     * @param value  the value to validate.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message.
-     * @throws IllegalArgumentException if the value is not a number.
+     * @param value  the value to validate
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message
+     * @throws IllegalArgumentException if the value is not a number
      * @see #notNaN(double)
      * @since 3.5
      */
@@ -1032,10 +1032,10 @@ public static void notNaN(final double value, final String message, final Object
      * <p>The message of the exception is &quot;The validated object is
      * null&quot;.
      *
-     * @param <T> the object type.
-     * @param object  the object to check.
-     * @return the validated object (never {@code null} for method chaining).
-     * @throws NullPointerException if the object is {@code null}.
+     * @param <T> the object type
+     * @param object  the object to check
+     * @return the validated object (never {@code null} for method chaining)
+     * @throws NullPointerException if the object is {@code null}
      * @see #notNull(Object, String, Object...)
      * @deprecated Use {@link Objects#requireNonNull(Object)}.
      */
@@ -1050,12 +1050,12 @@ public static <T> T notNull(final T object) {
      *
      * <pre>Validate.notNull(myObject, "The object must not be null");</pre>
      *
-     * @param <T> the object type.
-     * @param object  the object to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message.
-     * @return the validated object (never {@code null} for method chaining).
-     * @throws NullPointerException if the object is {@code null}.
+     * @param <T> the object type
+     * @param object  the object to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message
+     * @return the validated object (never {@code null} for method chaining)
+     * @throws NullPointerException if the object is {@code null}
      * @see Objects#requireNonNull(Object)
      */
     public static <T> T notNull(final T object, final String message, final Object... values) {
@@ -1076,12 +1076,12 @@ private static Supplier<String> toSupplier(final String message, final Object...
      * is &quot;The validated collection index is invalid: &quot;
      * followed by the index.</p>
      *
-     * @param <T> the collection type.
-     * @param collection  the collection to check, validated not null by this method.
-     * @param index  the index to check.
-     * @return the validated collection (never {@code null} for method chaining).
-     * @throws NullPointerException if the collection is {@code null}.
-     * @throws IndexOutOfBoundsException if the index is invalid.
+     * @param <T> the collection type
+     * @param collection  the collection to check, validated not null by this method
+     * @param index  the index to check
+     * @return the validated collection (never {@code null} for method chaining)
+     * @throws IndexOutOfBoundsException if the index is invalid
+     * @throws NullPointerException if the collection is {@code null}
      * @see #validIndex(Collection, int, String, Object...)
      * @since 3.0
      */
@@ -1103,12 +1103,12 @@ public static <T extends Collection<?>> T validIndex(final T collection, final i
      * is &quot;The validated character sequence index is invalid: &quot;
      * followed by the index.</p>
      *
-     * @param <T> the character sequence type.
-     * @param chars  the character sequence to check, validated not null by this method.
-     * @param index  the index to check.
-     * @return the validated character sequence (never {@code null} for method chaining).
-     * @throws NullPointerException if the character sequence is {@code null}.
-     * @throws IndexOutOfBoundsException if the index is invalid.
+     * @param <T> the character sequence type
+     * @param chars  the character sequence to check, validated not null by this method
+     * @param index  the index to check
+     * @return the validated character sequence (never {@code null} for method chaining)
+     * @throws IndexOutOfBoundsException if the index is invalid
+     * @throws NullPointerException if the character sequence is {@code null}
      * @see #validIndex(CharSequence, int, String, Object...)
      * @since 3.0
      */
@@ -1125,14 +1125,14 @@ public static <T extends CharSequence> T validIndex(final T chars, final int ind
      * <p>If the collection is {@code null}, then the message of the
      * exception is &quot;The validated object is null&quot;.</p>
      *
-     * @param <T> the collection type.
-     * @param collection  the collection to check, validated not null by this method.
-     * @param index  the index to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated collection (never {@code null} for chaining).
-     * @throws NullPointerException if the collection is {@code null}.
-     * @throws IndexOutOfBoundsException if the index is invalid.
+     * @param <T> the collection type
+     * @param collection  the collection to check, validated not null by this method
+     * @param index  the index to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated collection (never {@code null} for chaining)
+     * @throws IndexOutOfBoundsException if the index is invalid
+     * @throws NullPointerException if the collection is {@code null}
      * @see #validIndex(Collection, int)
      * @since 3.0
      */
@@ -1154,14 +1154,14 @@ public static <T extends Collection<?>> T validIndex(final T collection, final i
      * <p>If the character sequence is {@code null}, then the message
      * of the exception is &quot;The validated object is null&quot;.</p>
      *
-     * @param <T> the character sequence type.
-     * @param chars  the character sequence to check, validated not null by this method.
-     * @param index  the index to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated character sequence (never {@code null} for method chaining).
-     * @throws NullPointerException if the character sequence is {@code null}.
-     * @throws IndexOutOfBoundsException if the index is invalid.
+     * @param <T> the character sequence type
+     * @param chars  the character sequence to check, validated not null by this method
+     * @param index  the index to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated character sequence (never {@code null} for method chaining)
+     * @throws IndexOutOfBoundsException if the index is invalid
+     * @throws NullPointerException if the character sequence is {@code null}
      * @see #validIndex(CharSequence, int)
      * @since 3.0
      */
@@ -1186,12 +1186,12 @@ public static <T extends CharSequence> T validIndex(final T chars, final int ind
      * &quot;The validated array index is invalid: &quot; followed by the
      * index.</p>
      *
-     * @param <T> the array type.
-     * @param array  the array to check, validated not null by this method.
-     * @param index  the index to check.
-     * @return the validated array (never {@code null} for method chaining).
-     * @throws NullPointerException if the array is {@code null}.
-     * @throws IndexOutOfBoundsException if the index is invalid.
+     * @param <T> the array type
+     * @param array  the array to check, validated not null by this method
+     * @param index  the index to check
+     * @return the validated array (never {@code null} for method chaining)
+     * @throws IndexOutOfBoundsException if the index is invalid
+     * @throws NullPointerException if the array is {@code null}
      * @see #validIndex(Object[], int, String, Object...)
      * @since 3.0
      */
@@ -1208,14 +1208,14 @@ public static <T> T[] validIndex(final T[] array, final int index) {
      * <p>If the array is {@code null}, then the message of the exception
      * is &quot;The validated object is null&quot;.</p>
      *
-     * @param <T> the array type.
-     * @param array  the array to check, validated not null by this method.
-     * @param index  the index to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @return the validated array (never {@code null} for method chaining).
-     * @throws NullPointerException if the array is {@code null}.
-     * @throws IndexOutOfBoundsException if the index is invalid.
+     * @param <T> the array type
+     * @param array  the array to check, validated not null by this method
+     * @param index  the index to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @return the validated array (never {@code null} for method chaining)
+     * @throws IndexOutOfBoundsException if the index is invalid
+     * @throws NullPointerException if the array is {@code null}
      * @see #validIndex(Object[], int)
      * @since 3.0
      */
@@ -1240,8 +1240,8 @@ public static <T> T[] validIndex(final T[] array, final int index, final String
      * <p>The message of the exception is &quot;The validated state is
      * false&quot;.</p>
      *
-     * @param expression  the boolean expression to check.
-     * @throws IllegalStateException if expression is {@code false}.
+     * @param expression  the boolean expression to check
+     * @throws IllegalStateException if expression is {@code false}
      * @see #validState(boolean, String, Object...)
      * @since 3.0
      */
@@ -1259,10 +1259,10 @@ public static void validState(final boolean expression) {
      *
      * <pre>Validate.validState(this.isOk(), "The state is not OK: %s", myObject);</pre>
      *
-     * @param expression  the boolean expression to check.
-     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null.
-     * @param values  the optional values for the formatted exception message, null array not recommended.
-     * @throws IllegalStateException if expression is {@code false}.
+     * @param expression  the boolean expression to check
+     * @param message  the {@link String#format(String, Object...)} exception message if invalid, not null
+     * @param values  the optional values for the formatted exception message, null array not recommended
+     * @throws IllegalStateException if expression is {@code false}
      * @see #validState(boolean)
      * @since 3.0
      */
diff --git a/src/main/java/org/apache/commons/lang3/arch/Processor.java b/src/main/java/org/apache/commons/lang3/arch/Processor.java
index c3c9a161f66..7e6d11ac3da 100644
--- a/src/main/java/org/apache/commons/lang3/arch/Processor.java
+++ b/src/main/java/org/apache/commons/lang3/arch/Processor.java
@@ -64,7 +64,7 @@ public enum Arch {
         /**
          * Gets the label suitable for display.
          *
-         * @return the label.
+         * @return the label
          */
         public String getLabel() {
             return label;
@@ -131,7 +131,7 @@ public enum Type {
         /**
          * Gets the label suitable for display.
          *
-         * @return the label.
+         * @return the label
          * @since 3.13.0
          */
         public String getLabel() {
@@ -147,8 +147,8 @@ public String getLabel() {
      * Constructs a {@link Processor} object with the given
      * parameters.
      *
-     * @param arch The processor architecture.
-     * @param type The processor type.
+     * @param arch the processor architecture
+     * @param type the processor type
      */
     public Processor(final Arch arch, final Type type) {
         this.arch = arch;
@@ -160,7 +160,7 @@ public Processor(final Arch arch, final Type type) {
      * The processor architecture defines, if the processor has
      * a 32 or 64 bit architecture.
      *
-     * @return A {@link Arch} enum.
+     * @return a {@link Arch} enum
      */
     public Arch getArch() {
         return arch;
@@ -171,7 +171,7 @@ public Arch getArch() {
      * The processor type defines, if the processor is for example
      * an x86 or PPA.
      *
-     * @return A {@link Type} enum.
+     * @return a {@link Type} enum
      */
     public Type getType() {
         return type;
@@ -180,7 +180,7 @@ public Type getType() {
     /**
      * Tests if {@link Processor} is 32 bit.
      *
-     * @return {@code true}, if {@link Processor} is {@link Arch#BIT_32}, else {@code false}.
+     * @return {@code true}, if {@link Processor} is {@link Arch#BIT_32}, else {@code false}
      */
     public boolean is32Bit() {
         return Arch.BIT_32 == arch;
@@ -189,7 +189,7 @@ public boolean is32Bit() {
     /**
      * Tests if {@link Processor} is 64 bit.
      *
-     * @return {@code true}, if {@link Processor} is {@link Arch#BIT_64}, else {@code false}.
+     * @return {@code true}, if {@link Processor} is {@link Arch#BIT_64}, else {@code false}
      */
     public boolean is64Bit() {
         return Arch.BIT_64 == arch;
@@ -198,7 +198,7 @@ public boolean is64Bit() {
     /**
      * Tests if {@link Processor} is type of Aarch64.
      *
-     * @return {@code true}, if {@link Processor} is {@link Type#AARCH_64}, else {@code false}.
+     * @return {@code true}, if {@link Processor} is {@link Type#AARCH_64}, else {@code false}
      * @since 3.13.0
      */
     public boolean isAarch64() {
@@ -236,7 +236,7 @@ public boolean isRISCV() {
     /**
      * Tests if {@link Processor} is type of x86.
      *
-     * @return {@code true}, if {@link Processor} is {@link Type#X86}, else {@code false}.
+     * @return {@code true}, if {@link Processor} is {@link Type#X86}, else {@code false}
      */
     public boolean isX86() {
         return Type.X86 == type;
diff --git a/src/main/java/org/apache/commons/lang3/builder/AbstractSupplier.java b/src/main/java/org/apache/commons/lang3/builder/AbstractSupplier.java
index f8a6d9567d0..3809f27dede 100644
--- a/src/main/java/org/apache/commons/lang3/builder/AbstractSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/builder/AbstractSupplier.java
@@ -22,9 +22,9 @@
 /**
  * Abstracts supplying an instance of {@code T}. Use to implement the builder pattern.
  *
- * @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.
+ * @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
  */
 public abstract class AbstractSupplier<T, B extends AbstractSupplier<T, B, E>, E extends Throwable> implements FailableSupplier<T, E> {
@@ -45,7 +45,7 @@ public AbstractSupplier() {
      * (B) this
      * </pre>
      *
-     * @return {@code this} instance typed as the subclass type {@code B}.
+     * @return {@code this} instance typed as the subclass type {@code B}
      */
     @SuppressWarnings("unchecked")
     protected B asThis() {
diff --git a/src/main/java/org/apache/commons/lang3/builder/Builder.java b/src/main/java/org/apache/commons/lang3/builder/Builder.java
index 4c5a463c956..1c6da565f07 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Builder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Builder.java
@@ -69,7 +69,7 @@
  *                                                              .build();
  * }</pre>
  *
- * @param <T> the type of object that the builder will construct or compute.
+ * @param <T> the type of object that the builder will construct or compute
  * @since 3.0
  */
 @FunctionalInterface
@@ -79,7 +79,7 @@ public interface Builder<T> {
      * Returns a reference to the object being constructed or result being
      * calculated by the builder.
      *
-     * @return the object constructed or result calculated by the builder.
+     * @return the object constructed or result calculated by the builder
      */
     T build();
 }
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 9a3b419ab0f..345ba503785 100644
--- a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
@@ -76,7 +76,7 @@
  *
  * <p>A typical implementation of {@code compareTo(Object)} using
  * {@code reflectionCompare} looks like:</p>
-
+ *
  * <pre>
  * public int compareTo(Object o) {
  *   return CompareToBuilder.reflectionCompare(this, o);
@@ -151,10 +151,10 @@ private static void reflectionAppend(
      * @param rhs  right-hand side object
      * @return a negative integer, zero, or a positive integer as {@code lhs}
      *  is less than, equal to, or greater than {@code rhs}
-     * @throws NullPointerException  if either (but not both) parameters are
-     *  {@code null}
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
+     * @throws NullPointerException  if either (but not both) parameters are
+     *  {@code null}
      */
     public static int reflectionCompare(final Object lhs, final Object rhs) {
         return reflectionCompare(lhs, rhs, false, null);
@@ -183,10 +183,10 @@ public static int reflectionCompare(final Object lhs, final Object rhs) {
      * @param compareTransients  whether to compare transient fields
      * @return a negative integer, zero, or a positive integer as {@code lhs}
      *  is less than, equal to, or greater than {@code rhs}
-     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
-     *  (but not both) is {@code null}
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
+     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
+     *  (but not both) is {@code null}
      */
     public static int reflectionCompare(final Object lhs, final Object rhs, final boolean compareTransients) {
         return reflectionCompare(lhs, rhs, compareTransients, null);
@@ -218,10 +218,10 @@ public static int reflectionCompare(final Object lhs, final Object rhs, final bo
      * @param excludeFields  fields to exclude
      * @return a negative integer, zero, or a positive integer as {@code lhs}
      *  is less than, equal to, or greater than {@code rhs}
-     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
-     *  (but not both) is {@code null}
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
+     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
+     *  (but not both) is {@code null}
      * @since 2.2 (2.0 as {@code reflectionCompare(Object, Object, boolean, Class)})
      */
     public static int reflectionCompare(
@@ -270,13 +270,13 @@ public static int reflectionCompare(
      *
      * @param lhs  left-hand side object
      * @param rhs  right-hand side object
-     * @param excludeFields  Collection of String fields to exclude
+     * @param excludeFields  collection of String fields to exclude
      * @return a negative integer, zero, or a positive integer as {@code lhs}
      *  is less than, equal to, or greater than {@code rhs}
-     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
-     *  (but not both) is {@code null}
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
+     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
+     *  (but not both) is {@code null}
      * @since 2.2
      */
     public static int reflectionCompare(final Object lhs, final Object rhs, final Collection<String> excludeFields) {
@@ -306,10 +306,10 @@ public static int reflectionCompare(final Object lhs, final Object rhs, final Co
      * @param excludeFields  array of fields to exclude
      * @return a negative integer, zero, or a positive integer as {@code lhs}
      *  is less than, equal to, or greater than {@code rhs}
-     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
-     *  (but not both) is {@code null}
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
+     * @throws NullPointerException  if either {@code lhs} or {@code rhs}
+     *  (but not both) is {@code null}
      * @since 2.2
      */
     public static int reflectionCompare(final Object lhs, final Object rhs, final String... excludeFields) {
@@ -338,8 +338,8 @@ public CompareToBuilder() {
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
-      */
+     * @return {@code this} instance
+     */
     public CompareToBuilder append(final boolean lhs, final boolean rhs) {
         if (comparison != 0) {
             return this;
@@ -368,7 +368,7 @@ public CompareToBuilder append(final boolean lhs, final boolean rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final boolean[] lhs, final boolean[] rhs) {
         if (comparison != 0) {
@@ -401,7 +401,7 @@ public CompareToBuilder append(final boolean[] lhs, final boolean[] rhs) {
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final byte lhs, final byte rhs) {
         if (comparison != 0) {
@@ -424,7 +424,7 @@ public CompareToBuilder append(final byte lhs, final byte rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final byte[] lhs, final byte[] rhs) {
         if (comparison != 0) {
@@ -457,7 +457,7 @@ public CompareToBuilder append(final byte[] lhs, final byte[] rhs) {
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final char lhs, final char rhs) {
         if (comparison != 0) {
@@ -480,7 +480,7 @@ public CompareToBuilder append(final char lhs, final char rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final char[] lhs, final char[] rhs) {
         if (comparison != 0) {
@@ -518,7 +518,7 @@ public CompareToBuilder append(final char[] lhs, final char[] rhs) {
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final double lhs, final double rhs) {
         if (comparison != 0) {
@@ -541,7 +541,7 @@ public CompareToBuilder append(final double lhs, final double rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final double[] lhs, final double[] rhs) {
         if (comparison != 0) {
@@ -579,7 +579,7 @@ public CompareToBuilder append(final double[] lhs, final double[] rhs) {
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final float lhs, final float rhs) {
         if (comparison != 0) {
@@ -602,7 +602,7 @@ public CompareToBuilder append(final float lhs, final float rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final float[] lhs, final float[] rhs) {
         if (comparison != 0) {
@@ -635,7 +635,7 @@ public CompareToBuilder append(final float[] lhs, final float[] rhs) {
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final int lhs, final int rhs) {
         if (comparison != 0) {
@@ -658,7 +658,7 @@ public CompareToBuilder append(final int lhs, final int rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final int[] lhs, final int[] rhs) {
         if (comparison != 0) {
@@ -691,7 +691,7 @@ public CompareToBuilder append(final int[] lhs, final int[] rhs) {
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final long lhs, final long rhs) {
         if (comparison != 0) {
@@ -714,7 +714,7 @@ public CompareToBuilder append(final long lhs, final long rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final long[] lhs, final long[] rhs) {
         if (comparison != 0) {
@@ -756,7 +756,7 @@ public CompareToBuilder append(final long[] lhs, final long[] rhs) {
      *
      * @param lhs  left-hand side object
      * @param rhs  right-hand side object
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
      */
@@ -784,7 +784,7 @@ public CompareToBuilder append(final Object lhs, final Object rhs) {
      * @param rhs  right-hand side object
      * @param comparator  {@link Comparator} used to compare the objects,
      *  {@code null} means treat lhs as {@link Comparable}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
      * @since 2.0
@@ -836,7 +836,7 @@ public CompareToBuilder append(final Object lhs, final Object rhs, final Compara
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
      */
@@ -861,8 +861,8 @@ public CompareToBuilder append(final Object[] lhs, final Object[] rhs) {
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
      * @param comparator  {@link Comparator} to use to compare the array elements,
-     *  {@code null} means to treat {@code lhs} elements as {@link Comparable}.
-     * @return {@code this} instance.
+     *  {@code null} means to treat {@code lhs} elements as {@link Comparable}
+     * @return {@code this} instance
      * @throws ClassCastException  if {@code rhs} is not assignment-compatible
      *  with {@code lhs}
      * @since 2.0
@@ -898,7 +898,7 @@ public CompareToBuilder append(final Object[] lhs, final Object[] rhs, final Com
      *
      * @param lhs  left-hand side value
      * @param rhs  right-hand side value
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final short lhs, final short rhs) {
         if (comparison != 0) {
@@ -921,7 +921,7 @@ public CompareToBuilder append(final short lhs, final short rhs) {
      *
      * @param lhs  left-hand side array
      * @param rhs  right-hand side array
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public CompareToBuilder append(final short[] lhs, final short[] rhs) {
         if (comparison != 0) {
@@ -980,7 +980,7 @@ private void appendArray(final Object lhs, final Object rhs, final Comparator<?>
      * result of the superclass.
      *
      * @param superCompareTo  result of calling {@code super.compareTo(Object)}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.0
      */
     public CompareToBuilder appendSuper(final int superCompareTo) {
@@ -1019,4 +1019,3 @@ public int toComparison() {
         return comparison;
     }
 }
-
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diff.java b/src/main/java/org/apache/commons/lang3/builder/Diff.java
index 47973816c1e..8cb8f0a8976 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diff.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diff.java
@@ -30,7 +30,7 @@
  * Typically, {@link Diff}s are retrieved by using a {@link DiffBuilder} to produce a {@link DiffResult}, containing the differences between two objects.
  * </p>
  *
- * @param <T> The type of object contained within this {@link Diff}. Differences between primitive objects are stored as their Object wrapper equivalent.
+ * @param <T> the type of object contained within this {@link Diff}. Differences between primitive objects are stored as their Object wrapper equivalent.
  * @since 3.3
  */
 public abstract class Diff<T> extends Pair<T, T> {
@@ -47,7 +47,7 @@ public abstract class Diff<T> extends Pair<T, T> {
      * Constructs a new {@link Diff} for the given field name.
      *
      * @param fieldName
-     *            the field name.
+ *            the field name
      */
     protected Diff(final String fieldName) {
         this.fieldName = Objects.requireNonNull(fieldName);
@@ -62,7 +62,7 @@ protected Diff(final String fieldName) {
     /**
      * Gets the name of the field.
      *
-     * @return the field name.
+     * @return the field name
      */
     public final String getFieldName() {
         return fieldName;
@@ -71,7 +71,7 @@ public final String getFieldName() {
     /**
      * Gets the type of the field.
      *
-     * @return the field type.
+     * @return the field type
      * @deprecated Unused, will be removed in 4.0.0.
      */
     @Deprecated
@@ -83,8 +83,8 @@ public final Type getType() {
      * Throws {@link UnsupportedOperationException}.
      *
      * @param value
-     *            ignored.
-     * @return Throws {@link UnsupportedOperationException}.
+     *            ignored
+     * @return throws {@link UnsupportedOperationException}
      */
     @Override
     public final T setValue(final T value) {
@@ -99,7 +99,7 @@ public final T setValue(final T value) {
      * [fieldname: left-value, right-value]
      * </pre>
      *
-     * @return the string representation.
+     * @return the string representation
      */
     @Override
     public final String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
index d24379966e3..eef4825afc8 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
@@ -64,7 +64,7 @@
  * See {@link ReflectionDiffBuilder} for a reflection based version of this class.
  * </p>
  *
- * @param <T> type of the left and right object.
+ * @param <T> type of the left and right object
  * @see Diffable
  * @see Diff
  * @see DiffResult
@@ -77,7 +77,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     /**
      * Constructs a new instance.
      *
-     * @param <T> type of the left and right object.
+     * @param <T> type of the left and right object
      * @since 3.15.0
      */
     public static final class Builder<T> {
@@ -98,7 +98,7 @@ public Builder() {
         /**
          * Builds a new configured {@link DiffBuilder}.
          *
-         * @return a new configured {@link DiffBuilder}.
+         * @return a new configured {@link DiffBuilder}
          */
         public DiffBuilder<T> build() {
             return new DiffBuilder<>(left, right, style, testObjectsEquals, toStringFormat);
@@ -107,8 +107,8 @@ public DiffBuilder<T> build() {
         /**
          * Sets the left object.
          *
-         * @param left the left object.
-         * @return {@code this} instance.
+         * @param left the left object
+         * @return {@code this} instance
          */
         public Builder<T> setLeft(final T left) {
             this.left = left;
@@ -118,8 +118,8 @@ public Builder<T> setLeft(final T left) {
         /**
          * Sets the right object.
          *
-         * @param right the left object.
-         * @return {@code this} instance.
+         * @param right the left object
+         * @return {@code this} instance
          */
         public Builder<T> setRight(final T right) {
             this.right = right;
@@ -129,8 +129,8 @@ public Builder<T> setRight(final T right) {
         /**
          * Sets the style will to use when outputting the objects, {@code null} uses the default.
          *
-         * @param style the style to use when outputting the objects, {@code null} uses the default.
-         * @return {@code this} instance.
+         * @param style the style to use when outputting the objects, {@code null} uses the default
+         * @return {@code this} instance
          */
         public Builder<T> setStyle(final ToStringStyle style) {
             this.style = style != null ? style : ToStringStyle.DEFAULT_STYLE;
@@ -142,10 +142,10 @@ public Builder<T> setStyle(final ToStringStyle style) {
          * {@link Diff} if the trivially equal test is enabled and returns true. The result of this test is never changed throughout the life of this
          * {@link DiffBuilder}.
          *
-         * @param testObjectsEquals If true, this will test if lhs and rhs are the same or equal. All of the append(fieldName, left, right) methods will abort
+         * @param testObjectsEquals if true, this will test if lhs and rhs are the same or equal. All of the append(fieldName, left, right) methods will abort
          *                          without creating a field {@link Diff} if the trivially equal test is enabled and returns true. The result of this test is
          *                          never changed throughout the life of this {@link DiffBuilder}.
-         * @return {@code this} instance.
+         * @return {@code this} instance
          */
         public Builder<T> setTestObjectsEquals(final boolean testObjectsEquals) {
             this.testObjectsEquals = testObjectsEquals;
@@ -155,8 +155,8 @@ public Builder<T> setTestObjectsEquals(final boolean testObjectsEquals) {
         /**
          * Sets the two-argument format string for {@link String#format(String, Object...)}, for example {@code "%s differs from %s"}.
          *
-         * @param toStringFormat {@code null} uses the default.
-         * @return {@code this} instance.
+         * @param toStringFormat {@code null} uses the default
+         * @return {@code this} instance
          */
         public Builder<T> setToStringFormat(final String toStringFormat) {
             this.toStringFormat = toStringFormat != null ? toStringFormat : TO_STRING_FORMAT;
@@ -191,7 +191,7 @@ public T getRight() {
     /**
      * Private interface while we still have to support serialization.
      *
-     * @param <T> the type of results supplied by this supplier.
+     * @param <T> the type of results supplied by this supplier
      */
     private interface SerializableSupplier<T> extends Supplier<T>, Serializable {
         // empty
@@ -202,8 +202,8 @@ private interface SerializableSupplier<T> extends Supplier<T>, Serializable {
     /**
      * Constructs a new {@link Builder}.
      *
-     * @param <T> type of the left and right object.
-     * @return a new {@link Builder}.
+     * @param <T> type of the left and right object
+     * @return a new {@link Builder}
      * @since 3.15.0
      */
     public static <T> Builder<T> builder() {
@@ -229,10 +229,10 @@ public static <T> Builder<T> builder() {
      * This delegates to {@link #DiffBuilder(Object, Object, ToStringStyle, boolean)} with the testTriviallyEqual flag enabled.
      * </p>
      *
-     * @param left  {@code this} object.
-     * @param right the object to diff against.
-     * @param style the style to use when outputting the objects, {@code null} uses the default.
-     * @throws NullPointerException if {@code lhs} or {@code rhs} is {@code null}.
+     * @param left  {@code this} object
+     * @param right the object to diff against
+     * @param style the style to use when outputting the objects, {@code null} uses the default
+     * @throws NullPointerException if {@code lhs} or {@code rhs} is {@code null}
      * @deprecated Use {@link Builder}.
      */
     @Deprecated
@@ -248,13 +248,13 @@ public DiffBuilder(final T left, final T right, final ToStringStyle style) {
      * {@link DiffResult} when {@link #build()} is executed.
      * </p>
      *
-     * @param left              {@code this} object.
-     * @param right             the object to diff against.
-     * @param style             the style to use when outputting the objects, {@code null} uses the default.
-     * @param testObjectsEquals If true, this will test if lhs and rhs are the same or equal. All of the append(fieldName, lhs, rhs) methods will abort without
+     * @param left              {@code this} object
+     * @param right             the object to diff against
+     * @param style             the style to use when outputting the objects, {@code null} uses the default
+     * @param testObjectsEquals if true, this will test if lhs and rhs are the same or equal. All of the append(fieldName, lhs, rhs) methods will abort without
      *                          creating a field {@link Diff} if the trivially equal test is enabled and returns true. The result of this test is never changed
      *                          throughout the life of this {@link DiffBuilder}.
-     * @throws NullPointerException if {@code lhs} or {@code rhs} is {@code null}.
+     * @throws NullPointerException if {@code lhs} or {@code rhs} is {@code null}
      * @since 3.4
      * @deprecated Use {@link Builder}.
      */
@@ -281,11 +281,11 @@ private <F> DiffBuilder<T> add(final String fieldName, final SerializableSupplie
     /**
      * Tests if two {@code boolean}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code boolean}.
-     * @param rhs       the right-hand side {@code boolean}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code boolean}
+     * @param rhs       the right-hand side {@code boolean}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final boolean lhs, final boolean rhs) {
         return equals || lhs == rhs ? this : add(fieldName, () -> Boolean.valueOf(lhs), () -> Boolean.valueOf(rhs), Boolean.class);
@@ -294,11 +294,11 @@ public DiffBuilder<T> append(final String fieldName, final boolean lhs, final bo
     /**
      * Tests if two {@code boolean[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code boolean[]}.
-     * @param rhs       the right-hand side {@code boolean[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code boolean[]}
+     * @param rhs       the right-hand side {@code boolean[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final boolean[] lhs, final boolean[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Boolean[].class);
@@ -307,11 +307,11 @@ public DiffBuilder<T> append(final String fieldName, final boolean[] lhs, final
     /**
      * Tests if two {@code byte}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code byte}.
-     * @param rhs       the right-hand side {@code byte}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code byte}
+     * @param rhs       the right-hand side {@code byte}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final byte lhs, final byte rhs) {
         return equals || lhs == rhs ? this : add(fieldName, () -> Byte.valueOf(lhs), () -> Byte.valueOf(rhs), Byte.class);
@@ -320,11 +320,11 @@ public DiffBuilder<T> append(final String fieldName, final byte lhs, final byte
     /**
      * Tests if two {@code byte[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code byte[]}.
-     * @param rhs       the right-hand side {@code byte[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code byte[]}
+     * @param rhs       the right-hand side {@code byte[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final byte[] lhs, final byte[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Byte[].class);
@@ -333,11 +333,11 @@ public DiffBuilder<T> append(final String fieldName, final byte[] lhs, final byt
     /**
      * Tests if two {@code char}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code char}.
-     * @param rhs       the right-hand side {@code char}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code char}
+     * @param rhs       the right-hand side {@code char}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final char lhs, final char rhs) {
         return equals || lhs == rhs ? this : add(fieldName, () -> Character.valueOf(lhs), () -> Character.valueOf(rhs), Character.class);
@@ -346,11 +346,11 @@ public DiffBuilder<T> append(final String fieldName, final char lhs, final char
     /**
      * Tests if two {@code char[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code char[]}.
-     * @param rhs       the right-hand side {@code char[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code char[]}
+     * @param rhs       the right-hand side {@code char[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final char[] lhs, final char[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Character[].class);
@@ -380,10 +380,10 @@ public DiffBuilder<T> append(final String fieldName, final char[] lhs, final cha
      * }
      * </pre>
      *
-     * @param fieldName  the field name.
-     * @param diffResult the {@link DiffResult} to append.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null} or diffResult is {@code null}.
+     * @param fieldName  the field name
+     * @param diffResult the {@link DiffResult} to append
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null} or diffResult is {@code null}
      * @since 3.5
      */
     public DiffBuilder<T> append(final String fieldName, final DiffResult<?> diffResult) {
@@ -398,11 +398,11 @@ public DiffBuilder<T> append(final String fieldName, final DiffResult<?> diffRes
     /**
      * Tests if two {@code double}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code double}.
-     * @param rhs       the right-hand side {@code double}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code double}
+     * @param rhs       the right-hand side {@code double}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final double lhs, final double rhs) {
         return equals || Double.doubleToLongBits(lhs) == Double.doubleToLongBits(rhs) ? this
@@ -412,11 +412,11 @@ public DiffBuilder<T> append(final String fieldName, final double lhs, final dou
     /**
      * Tests if two {@code double[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code double[]}.
-     * @param rhs       the right-hand side {@code double[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code double[]}
+     * @param rhs       the right-hand side {@code double[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final double[] lhs, final double[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Double[].class);
@@ -425,11 +425,11 @@ public DiffBuilder<T> append(final String fieldName, final double[] lhs, final d
     /**
      * Test if two {@code float}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code float}.
-     * @param rhs       the right-hand side {@code float}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code float}
+     * @param rhs       the right-hand side {@code float}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final float lhs, final float rhs) {
         return equals || Float.floatToIntBits(lhs) == Float.floatToIntBits(rhs) ? this
@@ -439,11 +439,11 @@ public DiffBuilder<T> append(final String fieldName, final float lhs, final floa
     /**
      * Tests if two {@code float[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code float[]}.
-     * @param rhs       the right-hand side {@code float[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code float[]}
+     * @param rhs       the right-hand side {@code float[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final float[] lhs, final float[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Float[].class);
@@ -452,11 +452,11 @@ public DiffBuilder<T> append(final String fieldName, final float[] lhs, final fl
     /**
      * Tests if two {@code int}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code int}.
-     * @param rhs       the right-hand side {@code int}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code int}
+     * @param rhs       the right-hand side {@code int}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final int lhs, final int rhs) {
         return equals || lhs == rhs ? this : add(fieldName, () -> Integer.valueOf(lhs), () -> Integer.valueOf(rhs), Integer.class);
@@ -465,11 +465,11 @@ public DiffBuilder<T> append(final String fieldName, final int lhs, final int rh
     /**
      * Tests if two {@code int[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code int[]}.
-     * @param rhs       the right-hand side {@code int[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code int[]}
+     * @param rhs       the right-hand side {@code int[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final int[] lhs, final int[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Integer[].class);
@@ -478,11 +478,11 @@ public DiffBuilder<T> append(final String fieldName, final int[] lhs, final int[
     /**
      * Tests if two {@code long}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code long}.
-     * @param rhs       the right-hand side {@code long}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code long}
+     * @param rhs       the right-hand side {@code long}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final long lhs, final long rhs) {
         return equals || lhs == rhs ? this : add(fieldName, () -> Long.valueOf(lhs), () -> Long.valueOf(rhs), Long.class);
@@ -491,11 +491,11 @@ public DiffBuilder<T> append(final String fieldName, final long lhs, final long
     /**
      * Tests if two {@code long[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code long[]}.
-     * @param rhs       the right-hand side {@code long[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code long[]}
+     * @param rhs       the right-hand side {@code long[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final long[] lhs, final long[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Long[].class);
@@ -504,11 +504,11 @@ public DiffBuilder<T> append(final String fieldName, final long[] lhs, final lon
     /**
      * Tests if two {@link Objects}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@link Object}.
-     * @param rhs       the right-hand side {@link Object}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@link Object}
+     * @param rhs       the right-hand side {@link Object}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final Object lhs, final Object rhs) {
         if (equals || lhs == rhs) {
@@ -550,11 +550,11 @@ public DiffBuilder<T> append(final String fieldName, final Object lhs, final Obj
     /**
      * Tests if two {@code Object[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code Object[]}.
-     * @param rhs       the right-hand side {@code Object[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code Object[]}
+     * @param rhs       the right-hand side {@code Object[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final Object[] lhs, final Object[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> lhs, () -> rhs, Object[].class);
@@ -563,11 +563,11 @@ public DiffBuilder<T> append(final String fieldName, final Object[] lhs, final O
     /**
      * Tests if two {@code short}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code short}.
-     * @param rhs       the right-hand side {@code short}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code short}
+     * @param rhs       the right-hand side {@code short}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final short lhs, final short rhs) {
         return equals || lhs == rhs ? this : add(fieldName, () -> Short.valueOf(lhs), () -> Short.valueOf(rhs), Short.class);
@@ -576,11 +576,11 @@ public DiffBuilder<T> append(final String fieldName, final short lhs, final shor
     /**
      * Tests if two {@code short[]}s are equal.
      *
-     * @param fieldName the field name.
-     * @param lhs       the left-hand side {@code short[]}.
-     * @param rhs       the right-hand side {@code short[]}.
-     * @return {@code this} instance.
-     * @throws NullPointerException if field name is {@code null}.
+     * @param fieldName the field name
+     * @param lhs       the left-hand side {@code short[]}
+     * @param rhs       the right-hand side {@code short[]}
+     * @return {@code this} instance
+     * @throws NullPointerException if field name is {@code null}
      */
     public DiffBuilder<T> append(final String fieldName, final short[] lhs, final short[] rhs) {
         return equals || Arrays.equals(lhs, rhs) ? this : add(fieldName, () -> ArrayUtils.toObject(lhs), () -> ArrayUtils.toObject(rhs), Short[].class);
@@ -589,7 +589,7 @@ public DiffBuilder<T> append(final String fieldName, final short[] lhs, final sh
     /**
      * Builds a {@link DiffResult} based on the differences appended to this builder.
      *
-     * @return a {@link DiffResult} containing the differences between the two objects.
+     * @return a {@link DiffResult} containing the differences between the two objects
      */
     @Override
     public DiffResult<T> build() {
@@ -599,7 +599,7 @@ public DiffResult<T> build() {
     /**
      * Gets the left object.
      *
-     * @return the left object.
+     * @return the left object
      */
     T getLeft() {
         return left;
@@ -608,7 +608,7 @@ T getLeft() {
     /**
      * Gets the right object.
      *
-     * @return the right object.
+     * @return the right object
      */
     T getRight() {
         return right;
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
index eb4f1856468..998c1375018 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
@@ -33,7 +33,7 @@
  * Use a {@link DiffBuilder} to build a {@link DiffResult} comparing two objects.
  * </p>
  *
- * @param <T> type of the left and right object.
+ * @param <T> type of the left and right object
  * @since 3.3
  */
 public class DiffResult<T> implements Iterable<Diff<?>> {
@@ -65,8 +65,8 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
      *            {@code null}, in which case
      *            {@link ToStringStyle#DEFAULT_STYLE} is used
      * @param toStringFormat
-     *            Two-argument format string for {@link String#format(String, Object...)}, for example {@code "%s differs from %s"}.
-     * @throws NullPointerException if {@code lhs}, {@code rhs} or {@code diffs} are {@code null}.
+     *            Two-argument format string for {@link String#format(String, Object...)}, for example {@code "%s differs from %s"}
+     * @throws NullPointerException if {@code lhs}, {@code rhs} or {@code diffs} are {@code null}
      */
     DiffResult(final T lhs, final T rhs, final List<Diff<?>> diffList, final ToStringStyle style, final String toStringFormat) {
         this.diffList = Objects.requireNonNull(diffList, "diffList");
@@ -161,7 +161,7 @@ public Iterator<Diff<?>> iterator() {
      * use {@link #toString(ToStringStyle)}.
      * </p>
      *
-     * @return a {@link String} description of the differences.
+     * @return a {@link String} description of the differences
      */
     @Override
     public String toString() {
@@ -174,8 +174,7 @@ public String toString() {
      *
      * @param style
      *            the {@link ToStringStyle} to use when outputting the objects
-     *
-     * @return a {@link String} description of the differences.
+     * @return a {@link String} description of the differences
      */
     public String toString(final ToStringStyle style) {
         if (diffList.isEmpty()) {
diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
index d4bbdf55804..87456b8afea 100644
--- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
@@ -127,7 +127,7 @@ static Pair<IDKey, IDKey> getRegisterPair(final Object lhs, final Object rhs) {
      * Gets the registry of object pairs being traversed by the reflection
      * methods in the current thread.
      *
-     * @return Set the registry of objects being traversed
+     * @return set the registry of objects being traversed
      * @since 3.0
      */
     static Set<Pair<IDKey, IDKey>> getRegistry() {
@@ -144,7 +144,7 @@ static Set<Pair<IDKey, IDKey>> getRegistry() {
      *
      * @param lhs {@code this} object to lookup in registry
      * @param rhs the other object to lookup on registry
-     * @return boolean {@code true} if the registry contains the given object.
+     * @return boolean {@code true} if the registry contains the given object
      * @since 3.0
      */
     static boolean isRegistered(final Object lhs, final Object rhs) {
@@ -173,7 +173,7 @@ static boolean isRegistered(final Object lhs, final Object rhs) {
      * @param lhs  {@code this} object
      * @param rhs  the other object
      * @param testTransients  whether to include transient fields
-     * @return {@code true} if the two Objects have tested equals.
+     * @return {@code true} if the two Objects have tested equals
      * @see EqualsExclude
      */
     public static boolean reflectionEquals(final Object lhs, final Object rhs, final boolean testTransients) {
@@ -209,9 +209,9 @@ public static boolean reflectionEquals(final Object lhs, final Object rhs, final
      * @param reflectUpToClass  the superclass to reflect up to (inclusive),
      *  may be {@code null}
      * @param testRecursive  whether to call reflection equals on non-primitive
-     *  fields recursively.
+     *  fields recursively
      * @param excludeFields  array of field names to exclude from testing
-     * @return {@code true} if the two Objects have tested equals.
+     * @return {@code true} if the two Objects have tested equals
      * @see EqualsExclude
      * @since 3.6
      */
@@ -258,7 +258,7 @@ public static boolean reflectionEquals(final Object lhs, final Object rhs, final
      * @param reflectUpToClass  the superclass to reflect up to (inclusive),
      *  may be {@code null}
      * @param excludeFields  array of field names to exclude from testing
-     * @return {@code true} if the two Objects have tested equals.
+     * @return {@code true} if the two Objects have tested equals
      * @see EqualsExclude
      * @since 2.0
      */
@@ -284,8 +284,8 @@ public static boolean reflectionEquals(final Object lhs, final Object rhs, final
      *
      * @param lhs  {@code this} object
      * @param rhs  the other object
-     * @param excludeFields  Collection of String field names to exclude from testing
-     * @return {@code true} if the two Objects have tested equals.
+     * @param excludeFields  collection of String field names to exclude from testing
+     * @return {@code true} if the two Objects have tested equals
      * @see EqualsExclude
      */
     public static boolean reflectionEquals(final Object lhs, final Object rhs, final Collection<String> excludeFields) {
@@ -310,7 +310,7 @@ public static boolean reflectionEquals(final Object lhs, final Object rhs, final
      * @param lhs  {@code this} object
      * @param rhs  the other object
      * @param excludeFields  array of field names to exclude from testing
-     * @return {@code true} if the two Objects have tested equals.
+     * @return {@code true} if the two Objects have tested equals
      * @see EqualsExclude
      */
     public static boolean reflectionEquals(final Object lhs, final Object rhs, final String... excludeFields) {
@@ -381,8 +381,8 @@ public EqualsBuilder() {
      *
      * @param lhs  the left-hand side {@code boolean}
      * @param rhs  the right-hand side {@code boolean}
-     * @return {@code this} instance.
-      */
+     * @return {@code this} instance
+     */
     public EqualsBuilder append(final boolean lhs, final boolean rhs) {
         if (!isEquals) {
             return this;
@@ -399,7 +399,7 @@ public EqualsBuilder append(final boolean lhs, final boolean rhs) {
      *
      * @param lhs  the left-hand side {@code boolean[]}
      * @param rhs  the right-hand side {@code boolean[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final boolean[] lhs, final boolean[] rhs) {
         if (!isEquals) {
@@ -427,7 +427,7 @@ public EqualsBuilder append(final boolean[] lhs, final boolean[] rhs) {
      *
      * @param lhs  the left-hand side {@code byte}
      * @param rhs  the right-hand side {@code byte}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final byte lhs, final byte rhs) {
         if (isEquals) {
@@ -444,7 +444,7 @@ public EqualsBuilder append(final byte lhs, final byte rhs) {
      *
      * @param lhs  the left-hand side {@code byte[]}
      * @param rhs  the right-hand side {@code byte[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final byte[] lhs, final byte[] rhs) {
         if (!isEquals) {
@@ -472,7 +472,7 @@ public EqualsBuilder append(final byte[] lhs, final byte[] rhs) {
      *
      * @param lhs  the left-hand side {@code char}
      * @param rhs  the right-hand side {@code char}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final char lhs, final char rhs) {
         if (isEquals) {
@@ -489,7 +489,7 @@ public EqualsBuilder append(final char lhs, final char rhs) {
      *
      * @param lhs  the left-hand side {@code char[]}
      * @param rhs  the right-hand side {@code char[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final char[] lhs, final char[] rhs) {
         if (!isEquals) {
@@ -523,7 +523,7 @@ public EqualsBuilder append(final char[] lhs, final char[] rhs) {
      *
      * @param lhs  the left-hand side {@code double}
      * @param rhs  the right-hand side {@code double}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final double lhs, final double rhs) {
         if (isEquals) {
@@ -540,7 +540,7 @@ public EqualsBuilder append(final double lhs, final double rhs) {
      *
      * @param lhs  the left-hand side {@code double[]}
      * @param rhs  the right-hand side {@code double[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final double[] lhs, final double[] rhs) {
         if (!isEquals) {
@@ -574,7 +574,7 @@ public EqualsBuilder append(final double[] lhs, final double[] rhs) {
      *
      * @param lhs  the left-hand side {@code float}
      * @param rhs  the right-hand side {@code float}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final float lhs, final float rhs) {
         if (isEquals) {
@@ -591,7 +591,7 @@ public EqualsBuilder append(final float lhs, final float rhs) {
      *
      * @param lhs  the left-hand side {@code float[]}
      * @param rhs  the right-hand side {@code float[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final float[] lhs, final float[] rhs) {
         if (!isEquals) {
@@ -619,7 +619,7 @@ public EqualsBuilder append(final float[] lhs, final float[] rhs) {
      *
      * @param lhs  the left-hand side {@code int}
      * @param rhs  the right-hand side {@code int}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final int lhs, final int rhs) {
         if (isEquals) {
@@ -636,7 +636,7 @@ public EqualsBuilder append(final int lhs, final int rhs) {
      *
      * @param lhs  the left-hand side {@code int[]}
      * @param rhs  the right-hand side {@code int[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final int[] lhs, final int[] rhs) {
         if (!isEquals) {
@@ -666,7 +666,7 @@ public EqualsBuilder append(final int[] lhs, final int[] rhs) {
      *                  the left-hand side {@code long}
      * @param rhs
      *                  the right-hand side {@code long}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final long lhs, final long rhs) {
         if (isEquals) {
@@ -683,7 +683,7 @@ public EqualsBuilder append(final long lhs, final long rhs) {
      *
      * @param lhs  the left-hand side {@code long[]}
      * @param rhs  the right-hand side {@code long[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final long[] lhs, final long[] rhs) {
         if (!isEquals) {
@@ -715,7 +715,7 @@ public EqualsBuilder append(final long[] lhs, final long[] rhs) {
      *
      * @param lhs  the left-hand side object
      * @param rhs  the right-hand side object
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final Object lhs, final Object rhs) {
         if (!isEquals) {
@@ -753,7 +753,7 @@ public EqualsBuilder append(final Object lhs, final Object rhs) {
      *
      * @param lhs  the left-hand side {@code Object[]}
      * @param rhs  the right-hand side {@code Object[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final Object[] lhs, final Object[] rhs) {
         if (!isEquals) {
@@ -781,7 +781,7 @@ public EqualsBuilder append(final Object[] lhs, final Object[] rhs) {
      *
      * @param lhs  the left-hand side {@code short}
      * @param rhs  the right-hand side {@code short}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final short lhs, final short rhs) {
         if (isEquals) {
@@ -798,7 +798,7 @@ public EqualsBuilder append(final short lhs, final short rhs) {
      *
      * @param lhs  the left-hand side {@code short[]}
      * @param rhs  the right-hand side {@code short[]}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder append(final short[] lhs, final short[] rhs) {
         if (!isEquals) {
@@ -859,7 +859,7 @@ private void appendArray(final Object lhs, final Object rhs) {
      * Adds the result of {@code super.equals()} to this builder.
      *
      * @param superEquals  the result of calling {@code super.equals()}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.0
      */
     public EqualsBuilder appendSuper(final boolean superEquals) {
@@ -875,8 +875,7 @@ public EqualsBuilder appendSuper(final boolean superEquals) {
      * are all equal.
      *
      * @return {@code true} if all of the fields that have been checked
-     *         are equal, {@code false} otherwise.
-     *
+     *         are equal, {@code false} otherwise
      * @since 3.0
      */
     @Override
@@ -919,7 +918,7 @@ public boolean isEquals() {
      *
      * @param lhs  the left-hand side object
      * @param rhs  the right-hand side object
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public EqualsBuilder reflectionAppend(final Object lhs, final Object rhs) {
         if (!isEquals) {
@@ -1038,7 +1037,7 @@ public void reset() {
      * your own set of classes here, remember to include {@link String} class, too.</p>
      *
      * @param bypassReflectionClasses  classes to bypass reflection test
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @see #setTestRecursive(boolean)
      * @since 3.8
      */
@@ -1050,7 +1049,7 @@ public EqualsBuilder setBypassReflectionClasses(final List<Class<?>> bypassRefle
     /**
      * Sets the {@code isEquals} value.
      *
-     * @param isEquals The value to set.
+     * @param isEquals the value to set
      * @since 2.1
      */
     protected void setEquals(final boolean isEquals) {
@@ -1061,7 +1060,7 @@ protected void setEquals(final boolean isEquals) {
      * Sets field names to be excluded by reflection tests.
      *
      * @param excludeFields the fields to exclude
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.6
      */
     public EqualsBuilder setExcludeFields(final String... excludeFields) {
@@ -1073,7 +1072,7 @@ public EqualsBuilder setExcludeFields(final String... excludeFields) {
      * Sets the superclass to reflect up to at reflective tests.
      *
      * @param reflectUpToClass the super class to reflect up to
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.6
      */
     public EqualsBuilder setReflectUpToClass(final Class<?> reflectUpToClass) {
@@ -1087,7 +1086,7 @@ public EqualsBuilder setReflectUpToClass(final Class<?> reflectUpToClass) {
      * You may specify other exceptions by calling {@link #setBypassReflectionClasses(List)}.
      *
      * @param testRecursive whether to do a recursive test
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @see #setBypassReflectionClasses(List)
      * @since 3.6
      */
@@ -1100,7 +1099,7 @@ public EqualsBuilder setTestRecursive(final boolean testRecursive) {
      * Sets whether to include transient fields when reflectively comparing objects.
      *
      * @param testTransients whether to test transient fields
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.6
      */
     public EqualsBuilder setTestTransients(final boolean testTransients) {
diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
index 89610d298e6..6f5707cd40f 100644
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
@@ -141,7 +141,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     /**
      * Gets the registry of objects being traversed by the reflection methods in the current thread.
      *
-     * @return Set the registry of objects being traversed
+     * @return set the registry of objects being traversed
      * @since 2.3
      */
     static Set<IDKey> getRegistry() {
@@ -153,8 +153,8 @@ static Set<IDKey> getRegistry() {
      * infinite loops.
      *
      * @param value
-     *            The object to lookup in the registry.
-     * @return boolean {@code true} if the registry contains the given object.
+     *            The object to lookup in the registry
+     * @return boolean {@code true} if the registry contains the given object
      * @since 2.3
      */
     static boolean isRegistered(final Object value) {
@@ -231,11 +231,10 @@ private static void reflectionAppend(final Object object, final Class<?> clazz,
      * @param object
      *            the Object to create a {@code hashCode} for
      * @return int hash code
-     * @throws NullPointerException
-     *             if the Object is {@code null}
      * @throws IllegalArgumentException
      *             if the number is zero or even
-     *
+     * @throws NullPointerException
+     *             if the Object is {@code null}
      * @see HashCodeExclude
      */
     public static int reflectionHashCode(final int initialNonZeroOddNumber, final int multiplierNonZeroOddNumber, final Object object) {
@@ -275,11 +274,10 @@ public static int reflectionHashCode(final int initialNonZeroOddNumber, final in
      * @param testTransients
      *            whether to include transient fields
      * @return int hash code
-     * @throws NullPointerException
-     *             if the Object is {@code null}
      * @throws IllegalArgumentException
      *             if the number is zero or even
-     *
+     * @throws NullPointerException
+     *             if the Object is {@code null}
      * @see HashCodeExclude
      */
     public static int reflectionHashCode(final int initialNonZeroOddNumber, final int multiplierNonZeroOddNumber, final Object object,
@@ -327,11 +325,10 @@ public static int reflectionHashCode(final int initialNonZeroOddNumber, final in
      * @param excludeFields
      *            array of field names to exclude from use in calculation of hash code
      * @return int hash code
-     * @throws NullPointerException
-     *             if the Object is {@code null}
      * @throws IllegalArgumentException
      *             if the number is zero or even
-     *
+     * @throws NullPointerException
+     *             if the Object is {@code null}
      * @see HashCodeExclude
      * @since 2.0
      */
@@ -378,7 +375,6 @@ public static <T> int reflectionHashCode(final int initialNonZeroOddNumber, fina
      * @return int hash code
      * @throws NullPointerException
      *             if the object is {@code null}
-     *
      * @see HashCodeExclude
      */
     public static int reflectionHashCode(final Object object, final boolean testTransients) {
@@ -416,7 +412,6 @@ public static int reflectionHashCode(final Object object, final boolean testTran
      * @return int hash code
      * @throws NullPointerException
      *             if the object is {@code null}
-     *
      * @see HashCodeExclude
      */
     public static int reflectionHashCode(final Object object, final Collection<String> excludeFields) {
@@ -453,7 +448,6 @@ public static int reflectionHashCode(final Object object, final Collection<Strin
      * @return int hash code
      * @throws NullPointerException
      *             if the object is {@code null}
-     *
      * @see HashCodeExclude
      */
     public static int reflectionHashCode(final Object object, final String... excludeFields) {
@@ -465,7 +459,7 @@ public static int reflectionHashCode(final Object object, final String... exclud
      * Registers the given object. Used by the reflection methods to avoid infinite loops.
      *
      * @param value
-     *            The object to register.
+ *            The object to register
      */
     private static void register(final Object value) {
         getRegistry().add(new IDKey(value));
@@ -479,7 +473,7 @@ private static void register(final Object value) {
      * </p>
      *
      * @param value
-     *            The object to unregister.
+     *            The object to unregister
      * @since 2.3
      */
     private static void unregister(final Object value) {
@@ -548,7 +542,7 @@ public HashCodeBuilder(final int initialOddNumber, final int multiplierOddNumber
      *
      * @param value
      *            the boolean to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final boolean value) {
         total = total * constant + (value ? 0 : 1);
@@ -560,7 +554,7 @@ public HashCodeBuilder append(final boolean value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final boolean[] array) {
         if (array == null) {
@@ -578,7 +572,7 @@ public HashCodeBuilder append(final boolean[] array) {
      *
      * @param value
      *            the byte to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final byte value) {
         total = total * constant + value;
@@ -590,7 +584,7 @@ public HashCodeBuilder append(final byte value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final byte[] array) {
         if (array == null) {
@@ -608,7 +602,7 @@ public HashCodeBuilder append(final byte[] array) {
      *
      * @param value
      *            the char to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final char value) {
         total = total * constant + value;
@@ -620,7 +614,7 @@ public HashCodeBuilder append(final char value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final char[] array) {
         if (array == null) {
@@ -638,7 +632,7 @@ public HashCodeBuilder append(final char[] array) {
      *
      * @param value
      *            the double to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final double value) {
         return append(Double.doubleToLongBits(value));
@@ -649,7 +643,7 @@ public HashCodeBuilder append(final double value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final double[] array) {
         if (array == null) {
@@ -667,7 +661,7 @@ public HashCodeBuilder append(final double[] array) {
      *
      * @param value
      *            the float to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final float value) {
         total = total * constant + Float.floatToIntBits(value);
@@ -679,7 +673,7 @@ public HashCodeBuilder append(final float value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final float[] array) {
         if (array == null) {
@@ -697,7 +691,7 @@ public HashCodeBuilder append(final float[] array) {
      *
      * @param value
      *            the int to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final int value) {
         total = total * constant + value;
@@ -709,7 +703,7 @@ public HashCodeBuilder append(final int value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final int[] array) {
         if (array == null) {
@@ -727,7 +721,7 @@ public HashCodeBuilder append(final int[] array) {
      *
      * @param value
      *            the long to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     // NOTE: This method uses >> and not >>> as Effective Java and
     //       Long.hashCode do. Ideally we should switch to >>> at
@@ -743,7 +737,7 @@ public HashCodeBuilder append(final long value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final long[] array) {
         if (array == null) {
@@ -761,7 +755,7 @@ public HashCodeBuilder append(final long[] array) {
      *
      * @param object
      *            the Object to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final Object object) {
         if (object == null) {
@@ -781,7 +775,7 @@ public HashCodeBuilder append(final Object object) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final Object[] array) {
         if (array == null) {
@@ -799,7 +793,7 @@ public HashCodeBuilder append(final Object[] array) {
      *
      * @param value
      *            the short to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final short value) {
         total = total * constant + value;
@@ -811,7 +805,7 @@ public HashCodeBuilder append(final short value) {
      *
      * @param array
      *            the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public HashCodeBuilder append(final short[] array) {
         if (array == null) {
@@ -828,7 +822,7 @@ public HashCodeBuilder append(final short[] array) {
      * Append a {@code hashCode} for an array.
      *
      * @param object
-     *            the array to add to the {@code hashCode}
+ *            the array to add to the {@code hashCode}
      */
     private void appendArray(final Object object) {
         // 'Switch' on type of array, to dispatch to the correct handler
@@ -860,7 +854,7 @@ private void appendArray(final Object object) {
      *
      * @param superHashCode
      *            the result of calling {@code super.hashCode()}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.0
      */
     public HashCodeBuilder appendSuper(final int superHashCode) {
diff --git a/src/main/java/org/apache/commons/lang3/builder/IDKey.java b/src/main/java/org/apache/commons/lang3/builder/IDKey.java
index 910844adbdc..cebf4a2c7c1 100644
--- a/src/main/java/org/apache/commons/lang3/builder/IDKey.java
+++ b/src/main/java/org/apache/commons/lang3/builder/IDKey.java
@@ -32,7 +32,7 @@ final class IDKey {
     /**
      * Constructs new instance.
      *
-     * @param value The value
+     * @param value the value
      */
     IDKey(final Object value) {
         // This is the Object hash code
@@ -46,7 +46,7 @@ final class IDKey {
     /**
      * Tests if instances are equal.
      *
-     * @param other The other object to compare to
+     * @param other the other object to compare to
      * @return if the instances are for the same object
      */
     @Override
@@ -65,7 +65,7 @@ public boolean equals(final Object other) {
     /**
      * Gets the hash code, the system identity hash code.
      *
-     * @return the hash code.
+     * @return the hash code
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
index aef8cc2a19e..51e6781a4bb 100644
--- a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
@@ -206,7 +206,7 @@ private void resetIndent() {
      * Creates a StringBuilder responsible for the indenting.
      *
      * @param spaces how far to indent
-     * @return a StringBuilder with {spaces} leading space characters.
+     * @return a StringBuilder with {spaces} leading space characters
      */
     private String spacer(final int spaces) {
         return StringUtils.repeat(' ', spaces);
diff --git a/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
index 95695079a82..515f5f390fa 100644
--- a/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
@@ -80,8 +80,8 @@ public RecursiveToStringStyle() {
      * <li>{@link MutableBoolean}</li>
      * </ul>
      *
-     * @param clazz The class to test.
-     * @return Whether or not to recursively format instances of the given {@link Class}.
+     * @param clazz the class to test
+     * @return whether or not to recursively format instances of the given {@link Class}
      */
     protected boolean accept(final Class<?> clazz) {
         // @formatter:off
diff --git a/src/main/java/org/apache/commons/lang3/builder/Reflection.java b/src/main/java/org/apache/commons/lang3/builder/Reflection.java
index 1cbb0456cd5..5200983acc8 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Reflection.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Reflection.java
@@ -28,10 +28,10 @@ final class Reflection {
     /**
      * Delegates to {@link Field#get(Object)} and rethrows {@link IllegalAccessException} as {@link IllegalArgumentException}.
      *
-     * @param field The receiver of the get call.
-     * @param obj   The argument of the get call.
-     * @return The result of the get call.
-     * @throws IllegalArgumentException Thrown after catching {@link IllegalAccessException}.
+     * @param field the receiver of the get call
+     * @param obj   the argument of the get call
+     * @return the result of the get call
+     * @throws IllegalArgumentException thrown after catching {@link IllegalAccessException}
      */
     static Object getUnchecked(final Field field, final Object obj) {
         try {
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
index ca9da55e849..6fba156fe75 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
@@ -67,7 +67,7 @@
  * See {@link DiffBuilder} for a non-reflection based version of this class.
  * </p>
  *
- * @param <T> type of the left and right object to diff.
+ * @param <T> type of the left and right object to diff
  * @see Diffable
  * @see Diff
  * @see DiffResult
@@ -80,7 +80,7 @@ public class ReflectionDiffBuilder<T> implements Builder<DiffResult<T>> {
     /**
      * Constructs a new instance.
      *
-     * @param <T> type of the left and right object.
+     * @param <T> type of the left and right object
      * @since 3.15.0
      */
     public static final class Builder<T> {
@@ -98,7 +98,7 @@ public Builder() {
         /**
          * Builds a new configured {@link ReflectionDiffBuilder}.
          *
-         * @return a new configured {@link ReflectionDiffBuilder}.
+         * @return a new configured {@link ReflectionDiffBuilder}
          */
         public ReflectionDiffBuilder<T> build() {
             return new ReflectionDiffBuilder<>(diffBuilder, excludeFieldNames);
@@ -107,8 +107,8 @@ public ReflectionDiffBuilder<T> build() {
         /**
          * Sets the DiffBuilder.
          *
-         * @param diffBuilder the DiffBuilder.
-         * @return {@code this} instance.
+         * @param diffBuilder the DiffBuilder
+         * @return {@code this} instance
          */
         public Builder<T> setDiffBuilder(final DiffBuilder<T> diffBuilder) {
             this.diffBuilder = diffBuilder;
@@ -118,8 +118,8 @@ public Builder<T> setDiffBuilder(final DiffBuilder<T> diffBuilder) {
         /**
          * Sets field names to exclude from output. Intended for fields like {@code "password"} or {@code "lastModificationDate"}.
          *
-         * @param excludeFieldNames field names to exclude.
-         * @return {@code this} instance.
+         * @param excludeFieldNames field names to exclude
+         * @return {@code this} instance
          */
         public Builder<T> setExcludeFieldNames(final String... excludeFieldNames) {
             this.excludeFieldNames = toExcludeFieldNames(excludeFieldNames);
@@ -131,8 +131,8 @@ public Builder<T> setExcludeFieldNames(final String... excludeFieldNames) {
     /**
      * Constructs a new {@link Builder}.
      *
-     * @param <T> type of the left and right object.
-     * @return a new {@link Builder}.
+     * @param <T> type of the left and right object
+     * @return a new {@link Builder}
      * @since 3.15.0
      */
     public static <T> Builder<T> builder() {
@@ -157,9 +157,9 @@ private static String[] toExcludeFieldNames(final String[] excludeFieldNames) {
     /**
      * Constructs a new instance.
      *
-     * @param diffBuilder a non-null DiffBuilder.
-     * @param excludeFieldNames a non-null String array.
-     * @throw NullPointerException Thrown on null input.
+     * @param diffBuilder a non-null DiffBuilder
+     * @param excludeFieldNames a non-null String array
+     * @throw NullPointerException thrown on null input
      */
     private ReflectionDiffBuilder(final DiffBuilder<T> diffBuilder, final String[] excludeFieldNames) {
         this.diffBuilder = Objects.requireNonNull(diffBuilder, "diffBuilder");
@@ -174,10 +174,10 @@ private ReflectionDiffBuilder(final DiffBuilder<T> diffBuilder, final String[] e
      * {@link DiffResult} when {@link #build()} is executed.
      * </p>
      *
-     * @param left  {@code this} object.
-     * @param right the object to diff against.
+     * @param left  {@code this} object
+     * @param right the object to diff against
      * @param style the style will use when outputting the objects, {@code null} uses the default
-     * @throws IllegalArgumentException if {@code left} or {@code right} is {@code null}.
+     * @throws IllegalArgumentException if {@code left} or {@code right} is {@code null}
      * @deprecated Use {@link Builder}.
      */
     @Deprecated
@@ -197,7 +197,7 @@ private boolean accept(final Field field) {
     /**
      * Appends fields using reflection.
      *
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     private void appendFields(final Class<?> clazz) {
@@ -217,7 +217,7 @@ private void appendFields(final Class<?> clazz) {
     /**
      * {@inheritDoc}
      *
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     @Override
@@ -232,7 +232,7 @@ public DiffResult<T> build() {
     /**
      * Gets the field names that should be excluded from the diff.
      *
-     * @return the excludeFieldNames.
+     * @return the excludeFieldNames
      * @since 3.13.0
      */
     public String[] getExcludeFieldNames() {
@@ -250,12 +250,12 @@ private T getRight() {
     /**
      * Reads a {@link Field}, forcing access if needed.
      *
-     * @param field  the field to use.
-     * @param target the object to call on, may be {@code null} for {@code static} fields.
-     * @return the field value.
-     * @throws NullPointerException   if the field is {@code null}.
-     * @throws IllegalAccessException if the field is not made accessible.
-     * @throws SecurityException      if an underlying accessible object's method denies the request.
+     * @param field  the field to use
+     * @param target the object to call on, may be {@code null} for {@code static} fields
+     * @return the field value
+     * @throws IllegalAccessException if the field is not made accessible
+     * @throws NullPointerException   if the field is {@code null}
+     * @throws SecurityException      if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     private Object readField(final Field field, final Object target) throws IllegalAccessException {
@@ -265,8 +265,8 @@ private Object readField(final Field field, final Object target) throws IllegalA
     /**
      * Sets the field names to exclude.
      *
-     * @param excludeFieldNames The field names to exclude from the diff or {@code null}.
-     * @return {@code this} instance.
+     * @param excludeFieldNames the field names to exclude from the diff or {@code null}
+     * @return {@code this} instance
      * @since 3.13.0
      * @deprecated Use {@link Builder#setExcludeFieldNames(String[])}.
      */
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
index 418e96fd1fd..24e75da1cc1 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
@@ -107,7 +107,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
      *
      * @param collection
      *            The collection to convert
-     * @return A new array of Strings.
+     * @return a new array of Strings
      */
     static String[] toNoNullStringArray(final Collection<String> collection) {
         if (collection == null) {
@@ -123,7 +123,7 @@ static String[] toNoNullStringArray(final Collection<String> collection) {
      *
      * @param array
      *            The array to check
-     * @return The given array or a new array without null.
+     * @return the given array or a new array without null
      */
     static String[] toNoNullStringArray(final Object[] array) {
         return Streams.nonNull(array).map(Objects::toString).toArray(String[]::new);
@@ -148,7 +148,6 @@ static String[] toNoNullStringArray(final Object[] array) {
      * @return the String result
      * @throws IllegalArgumentException
      *             if the Object is {@code null}
-     *
      * @see ToStringExclude
      * @see ToStringSummary
      */
@@ -181,7 +180,6 @@ public static String toString(final Object object) {
      * @return the String result
      * @throws IllegalArgumentException
      *             if the Object or {@link ToStringStyle} is {@code null}
-     *
      * @see ToStringExclude
      * @see ToStringSummary
      */
@@ -220,7 +218,6 @@ public static String toString(final Object object, final ToStringStyle style) {
      * @return the String result
      * @throws IllegalArgumentException
      *             if the Object is {@code null}
-     *
      * @see ToStringExclude
      * @see ToStringSummary
      */
@@ -266,7 +263,6 @@ public static String toString(final Object object, final ToStringStyle style, fi
      * @return the String result
      * @throws IllegalArgumentException
      *             if the Object is {@code null}
-     *
      * @see ToStringExclude
      * @see ToStringSummary
      * @since 2.1
@@ -320,7 +316,6 @@ public static String toString(final Object object, final ToStringStyle style, fi
      * @return the String result
      * @throws IllegalArgumentException
      *             if the Object is {@code null}
-     *
      * @see ToStringExclude
      * @see ToStringSummary
      * @since 3.6
@@ -375,7 +370,6 @@ public static <T> String toString(
      * @return the String result
      * @throws IllegalArgumentException
      *             if the Object is {@code null}
-     *
      * @see ToStringExclude
      * @see ToStringSummary
      * @since 2.1
@@ -391,10 +385,10 @@ public static <T> String toString(
      * Builds a String for a toString method excluding the given field names.
      *
      * @param object
-     *            The object to "toString".
+     *            The object to "toString"
      * @param excludeFieldNames
      *            The field names to exclude. Null excludes nothing.
-     * @return The toString value.
+     * @return the toString value
      */
     public static String toStringExclude(final Object object, final Collection<String> excludeFieldNames) {
         return toStringExclude(object, toNoNullStringArray(excludeFieldNames));
@@ -404,10 +398,10 @@ public static String toStringExclude(final Object object, final Collection<Strin
      * Builds a String for a toString method excluding the given field names.
      *
      * @param object
-     *            The object to "toString".
+     *            The object to "toString"
      * @param excludeFieldNames
      *            The field names to exclude
-     * @return The toString value.
+     * @return the toString value
      */
     public static String toStringExclude(final Object object, final String... excludeFieldNames) {
         return new ReflectionToStringBuilder(object).setExcludeFieldNames(excludeFieldNames).toString();
@@ -417,10 +411,10 @@ public static String toStringExclude(final Object object, final String... exclud
      * Builds a String for a toString method including the given field names.
      *
      * @param object
-     *            The object to "toString".
+     *            The object to "toString"
      * @param includeFieldNames
      *            {@code null} or empty means all fields are included. All fields are included by default. This method will override the default behavior.
-     * @return The toString value.
+     * @return the toString value
      * @since 3.13.0
      */
     public static String toStringInclude(final Object object, final Collection<String> includeFieldNames) {
@@ -431,11 +425,11 @@ public static String toStringInclude(final Object object, final Collection<Strin
      * Builds a String for a toString method including the given field names.
      *
      * @param object
-     *            The object to "toString".
+     *            The object to "toString"
      * @param includeFieldNames
      *            The field names to include. {@code null} or empty means all fields are included. All fields are included by default. This method will override the default
      *             behavior.
-     * @return The toString value.
+     * @return the toString value
      * @since 3.13.0
      */
     public static String toStringInclude(final Object object, final String... includeFieldNames) {
@@ -484,7 +478,7 @@ public static String toStringInclude(final Object object, final String... includ
      * </p>
      *
      * @param object
-     *            the Object to build a {@code toString} for, must not be {@code null}
+ *            the Object to build a {@code toString} for, must not be {@code null}
      */
     public ReflectionToStringBuilder(final Object object) {
         super(object);
@@ -597,8 +591,8 @@ public <T> ReflectionToStringBuilder(
      * </ul>
      *
      * @param field
-     *            The Field to test.
-     * @return Whether or not to append the given {@link Field}.
+     *            The Field to test
+     * @return whether or not to append the given {@link Field}
      */
     protected boolean accept(final Field field) {
         if (field.getName().indexOf(ClassUtils.INNER_CLASS_SEPARATOR_CHAR) != -1) {
@@ -637,7 +631,7 @@ protected boolean accept(final Field field) {
      * </p>
      *
      * @param clazz
-     *            The class of object parameter
+ *            The class of object parameter
      */
     protected void appendFieldsIn(final Class<?> clazz) {
         if (clazz.isArray()) {
@@ -669,16 +663,16 @@ protected void appendFieldsIn(final Class<?> clazz) {
     /**
      * Gets the excludeFieldNames.
      *
-     * @return the excludeFieldNames.
+     * @return the excludeFieldNames
      */
     public String[] getExcludeFieldNames() {
         return this.excludeFieldNames.clone();
     }
 
     /**
-     * Gets the includeFieldNames
+     * Gets the includeFieldNames.
      *
-     * @return the includeFieldNames.
+     * @return the includeFieldNames
      * @since 3.13.0
      */
     public String[] getIncludeFieldNames() {
@@ -688,7 +682,7 @@ public String[] getIncludeFieldNames() {
     /**
      * Gets the last super class to stop appending fields for.
      *
-     * @return The last super class to stop appending fields for.
+     * @return the last super class to stop appending fields for
      */
     public Class<?> getUpToClass() {
         return this.upToClass;
@@ -698,13 +692,12 @@ public Class<?> getUpToClass() {
      * Calls {@code java.lang.reflect.Field.get(Object)}.
      *
      * @param field
-     *            The Field to query.
-     * @return The Object from the given Field.
-     * @throws IllegalArgumentException
-     *             see {@link java.lang.reflect.Field#get(Object)}
+     *            The Field to query
+     * @return the Object from the given Field
      * @throws IllegalAccessException
      *             see {@link java.lang.reflect.Field#get(Object)}
-     *
+     * @throws IllegalArgumentException
+     *             see {@link java.lang.reflect.Field#get(Object)}
      * @see java.lang.reflect.Field#get(Object)
      */
     protected Object getValue(final Field field) throws IllegalAccessException {
@@ -714,7 +707,7 @@ protected Object getValue(final Field field) throws IllegalAccessException {
     /**
      * Gets whether or not to append static fields.
      *
-     * @return Whether or not to append static fields.
+     * @return whether or not to append static fields
      * @since 2.1
      */
     public boolean isAppendStatics() {
@@ -724,7 +717,7 @@ public boolean isAppendStatics() {
     /**
      * Gets whether or not to append transient fields.
      *
-     * @return Whether or not to append transient fields.
+     * @return whether or not to append transient fields
      */
     public boolean isAppendTransients() {
         return this.appendTransients;
@@ -733,7 +726,7 @@ public boolean isAppendTransients() {
     /**
      * Gets whether or not to append fields whose values are null.
      *
-     * @return Whether or not to append fields whose values are null.
+     * @return whether or not to append fields whose values are null
      * @since 3.6
      */
     public boolean isExcludeNullValues() {
@@ -745,7 +738,7 @@ public boolean isExcludeNullValues() {
      *
      * @param array
      *            the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ReflectionToStringBuilder reflectionAppendArray(final Object array) {
         getStyle().reflectionAppendArrayDetail(getStringBuffer(), null, array);
@@ -756,7 +749,7 @@ public ReflectionToStringBuilder reflectionAppendArray(final Object array) {
      * Sets whether or not to append static fields.
      *
      * @param appendStatics
-     *            Whether or not to append static fields.
+     *            Whether or not to append static fields
      * @since 2.1
      */
     public void setAppendStatics(final boolean appendStatics) {
@@ -767,7 +760,7 @@ public void setAppendStatics(final boolean appendStatics) {
      * Sets whether or not to append transient fields.
      *
      * @param appendTransients
-     *            Whether or not to append transient fields.
+ *            Whether or not to append transient fields
      */
     public void setAppendTransients(final boolean appendTransients) {
         this.appendTransients = appendTransients;
@@ -777,7 +770,7 @@ public void setAppendTransients(final boolean appendTransients) {
      * Sets the field names to exclude.
      *
      * @param excludeFieldNamesParam
-     *            The excludeFieldNames to excluding from toString or {@code null}.
+     *            The excludeFieldNames to excluding from toString or {@code null}
      * @return {@code this}
      */
     public ReflectionToStringBuilder setExcludeFieldNames(final String... excludeFieldNamesParam) {
@@ -794,7 +787,7 @@ public ReflectionToStringBuilder setExcludeFieldNames(final String... excludeFie
      * Sets whether or not to append fields whose values are null.
      *
      * @param excludeNullValues
-     *            Whether or not to append fields whose values are null.
+     *            Whether or not to append fields whose values are null
      * @since 3.6
      */
     public void setExcludeNullValues(final boolean excludeNullValues) {
@@ -805,7 +798,7 @@ public void setExcludeNullValues(final boolean excludeNullValues) {
      * Sets the field names to include. {@code null} or empty means all fields are included. All fields are included by default. This method will override the default behavior.
      *
      * @param includeFieldNamesParam
-     *            The includeFieldNames that must be on toString or {@code null}.
+     *            The includeFieldNames that must be on toString or {@code null}
      * @return {@code this}
      * @since 3.13.0
      */
@@ -823,7 +816,7 @@ public ReflectionToStringBuilder setIncludeFieldNames(final String... includeFie
      * Sets the last super class to stop appending fields for.
      *
      * @param clazz
-     *            The last super class to stop appending fields for.
+ *            The last super class to stop appending fields for
      */
     public void setUpToClass(final Class<?> clazz) {
         if (clazz != null) {
diff --git a/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
index 6ebdb9ba103..15f20589390 100644
--- a/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
@@ -267,7 +267,7 @@ public boolean isUseShortClassName() {
     /**
      * Sets whether to output array content detail.
      *
-     * @param arrayContentDetail  the new arrayContentDetail flag
+     * @param arrayContentDetail the new arrayContentDetail flag
      */
     @Override
     public void setArrayContentDetail(final boolean arrayContentDetail) {
@@ -280,7 +280,7 @@ public void setArrayContentDetail(final boolean arrayContentDetail) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param arrayEnd  the new array end text
+     * @param arrayEnd the new array end text
      */
     @Override
     public void setArrayEnd(final String arrayEnd) {
@@ -293,7 +293,7 @@ public void setArrayEnd(final String arrayEnd) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param arraySeparator  the new array separator text
+     * @param arraySeparator the new array separator text
      */
     @Override
     public void setArraySeparator(final String arraySeparator) {
@@ -306,7 +306,7 @@ public void setArraySeparator(final String arraySeparator) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param arrayStart  the new array start text
+     * @param arrayStart the new array start text
      */
     @Override
     public void setArrayStart(final String arrayStart) {
@@ -319,7 +319,7 @@ public void setArrayStart(final String arrayStart) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param contentEnd  the new content end text
+     * @param contentEnd the new content end text
      */
     @Override
     public void setContentEnd(final String contentEnd) {
@@ -332,7 +332,7 @@ public void setContentEnd(final String contentEnd) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param contentStart  the new content start text
+     * @param contentStart the new content start text
      */
     @Override
     public void setContentStart(final String contentStart) {
@@ -343,7 +343,7 @@ public void setContentStart(final String contentStart) {
      * Sets whether to use full detail when the caller doesn't
      * specify.
      *
-     * @param defaultFullDetail  the new defaultFullDetail flag
+     * @param defaultFullDetail the new defaultFullDetail flag
      */
     @Override
     public void setDefaultFullDetail(final boolean defaultFullDetail) {
@@ -356,7 +356,7 @@ public void setDefaultFullDetail(final boolean defaultFullDetail) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param fieldNameValueSeparator  the new field name value separator text
+     * @param fieldNameValueSeparator the new field name value separator text
      */
     @Override
     public void setFieldNameValueSeparator(final String fieldNameValueSeparator) {
@@ -369,7 +369,7 @@ public void setFieldNameValueSeparator(final String fieldNameValueSeparator) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param fieldSeparator  the new field separator text
+     * @param fieldSeparator the new field separator text
      */
     @Override
     public void setFieldSeparator(final String fieldSeparator) {
@@ -406,7 +406,7 @@ public void setFieldSeparatorAtStart(final boolean fieldSeparatorAtStart) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param nullText  the new text to output when {@code null} found
+     * @param nullText the new text to output when {@code null} found
      */
     @Override
     public void setNullText(final String nullText) {
@@ -422,7 +422,7 @@ public void setNullText(final String nullText) {
      * <p>{@code null} is accepted, but will be converted
      * to an empty String.</p>
      *
-     * @param sizeEndText  the new end of size text
+     * @param sizeEndText the new end of size text
      */
     @Override
     public void setSizeEndText(final String sizeEndText) {
@@ -438,7 +438,7 @@ public void setSizeEndText(final String sizeEndText) {
      * <p>{@code null} is accepted, but will be converted to
      * an empty String.</p>
      *
-     * @param sizeStartText  the new start of size text
+     * @param sizeStartText the new start of size text
      */
     @Override
     public void setSizeStartText(final String sizeStartText) {
@@ -454,7 +454,7 @@ public void setSizeStartText(final String sizeStartText) {
      * <p>{@code null} is accepted, but will be converted to
      * an empty String.</p>
      *
-     * @param summaryObjectEndText  the new end of summary text
+     * @param summaryObjectEndText the new end of summary text
      */
     @Override
     public void setSummaryObjectEndText(final String summaryObjectEndText) {
@@ -470,7 +470,7 @@ public void setSummaryObjectEndText(final String summaryObjectEndText) {
      * <p>{@code null} is accepted, but will be converted to
      * an empty String.</p>
      *
-     * @param summaryObjectStartText  the new start of summary text
+     * @param summaryObjectStartText the new start of summary text
      */
     @Override
     public void setSummaryObjectStartText(final String summaryObjectStartText) {
@@ -480,7 +480,7 @@ public void setSummaryObjectStartText(final String summaryObjectStartText) {
     /**
      * Sets whether to use the class name.
      *
-     * @param useClassName  the new useClassName flag
+     * @param useClassName the new useClassName flag
      */
     @Override
     public void setUseClassName(final boolean useClassName) {
@@ -490,7 +490,7 @@ public void setUseClassName(final boolean useClassName) {
     /**
      * Sets whether to use the field names passed in.
      *
-     * @param useFieldNames  the new useFieldNames flag
+     * @param useFieldNames the new useFieldNames flag
      */
     @Override
     public void setUseFieldNames(final boolean useFieldNames) {
@@ -500,7 +500,7 @@ public void setUseFieldNames(final boolean useFieldNames) {
     /**
      * Sets whether to use the identity hash code.
      *
-     * @param useIdentityHashCode  the new useIdentityHashCode flag
+     * @param useIdentityHashCode the new useIdentityHashCode flag
      */
     @Override
     public void setUseIdentityHashCode(final boolean useIdentityHashCode) {
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
index 379fef13438..77ceebbfda1 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
@@ -215,7 +215,7 @@ public static void setDefaultStyle(final ToStringStyle style) {
      *
      * <p>This default style is obtained from {@link #getDefaultStyle()}.</p>
      *
-     * @param object  the Object to build a {@code toString} for, not recommended to be null
+     * @param object the Object to build a {@code toString} for, not recommended to be null
      */
     public ToStringBuilder(final Object object) {
         this(object, null, null);
@@ -263,7 +263,7 @@ public ToStringBuilder(final Object object, ToStringStyle style, StringBuffer bu
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final boolean value) {
         style.append(buffer, null, value);
@@ -275,7 +275,7 @@ public ToStringBuilder append(final boolean value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final boolean[] array) {
         style.append(buffer, null, array, null);
@@ -287,7 +287,7 @@ public ToStringBuilder append(final boolean[] array) {
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final byte value) {
         style.append(buffer, null, value);
@@ -299,7 +299,7 @@ public ToStringBuilder append(final byte value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final byte[] array) {
         style.append(buffer, null, array, null);
@@ -311,7 +311,7 @@ public ToStringBuilder append(final byte[] array) {
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final char value) {
         style.append(buffer, null, value);
@@ -323,7 +323,7 @@ public ToStringBuilder append(final char value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final char[] array) {
         style.append(buffer, null, array, null);
@@ -335,7 +335,7 @@ public ToStringBuilder append(final char[] array) {
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final double value) {
         style.append(buffer, null, value);
@@ -347,7 +347,7 @@ public ToStringBuilder append(final double value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final double[] array) {
         style.append(buffer, null, array, null);
@@ -359,7 +359,7 @@ public ToStringBuilder append(final double[] array) {
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final float value) {
         style.append(buffer, null, value);
@@ -371,7 +371,7 @@ public ToStringBuilder append(final float value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final float[] array) {
         style.append(buffer, null, array, null);
@@ -383,7 +383,7 @@ public ToStringBuilder append(final float[] array) {
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final int value) {
         style.append(buffer, null, value);
@@ -395,7 +395,7 @@ public ToStringBuilder append(final int value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final int[] array) {
         style.append(buffer, null, array, null);
@@ -407,7 +407,7 @@ public ToStringBuilder append(final int[] array) {
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final long value) {
         style.append(buffer, null, value);
@@ -419,7 +419,7 @@ public ToStringBuilder append(final long value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final long[] array) {
         style.append(buffer, null, array, null);
@@ -431,7 +431,7 @@ public ToStringBuilder append(final long[] array) {
      * value.
      *
      * @param obj  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final Object obj) {
         style.append(buffer, null, obj, null);
@@ -443,7 +443,7 @@ public ToStringBuilder append(final Object obj) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final Object[] array) {
         style.append(buffer, null, array, null);
@@ -455,7 +455,7 @@ public ToStringBuilder append(final Object[] array) {
      * value.
      *
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final short value) {
         style.append(buffer, null, value);
@@ -467,7 +467,7 @@ public ToStringBuilder append(final short value) {
      * array.
      *
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final short[] array) {
         style.append(buffer, null, array, null);
@@ -480,7 +480,7 @@ public ToStringBuilder append(final short[] array) {
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final boolean value) {
         style.append(buffer, fieldName, value);
@@ -493,7 +493,7 @@ public ToStringBuilder append(final String fieldName, final boolean value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code hashCode}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final boolean[] array) {
         style.append(buffer, fieldName, array, null);
@@ -513,7 +513,7 @@ public ToStringBuilder append(final String fieldName, final boolean[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final boolean[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -526,7 +526,7 @@ public ToStringBuilder append(final String fieldName, final boolean[] array, fin
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final byte value) {
         style.append(buffer, fieldName, value);
@@ -538,7 +538,7 @@ public ToStringBuilder append(final String fieldName, final byte value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final byte[] array) {
         style.append(buffer, fieldName, array, null);
@@ -558,7 +558,7 @@ public ToStringBuilder append(final String fieldName, final byte[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final byte[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -571,7 +571,7 @@ public ToStringBuilder append(final String fieldName, final byte[] array, final
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final char value) {
         style.append(buffer, fieldName, value);
@@ -584,7 +584,7 @@ public ToStringBuilder append(final String fieldName, final char value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final char[] array) {
         style.append(buffer, fieldName, array, null);
@@ -604,7 +604,7 @@ public ToStringBuilder append(final String fieldName, final char[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final char[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -617,7 +617,7 @@ public ToStringBuilder append(final String fieldName, final char[] array, final
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final double value) {
         style.append(buffer, fieldName, value);
@@ -630,7 +630,7 @@ public ToStringBuilder append(final String fieldName, final double value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final double[] array) {
         style.append(buffer, fieldName, array, null);
@@ -650,7 +650,7 @@ public ToStringBuilder append(final String fieldName, final double[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final double[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -663,7 +663,7 @@ public ToStringBuilder append(final String fieldName, final double[] array, fina
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final float value) {
         style.append(buffer, fieldName, value);
@@ -676,7 +676,7 @@ public ToStringBuilder append(final String fieldName, final float value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final float[] array) {
         style.append(buffer, fieldName, array, null);
@@ -696,7 +696,7 @@ public ToStringBuilder append(final String fieldName, final float[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final float[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -709,7 +709,7 @@ public ToStringBuilder append(final String fieldName, final float[] array, final
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final int value) {
         style.append(buffer, fieldName, value);
@@ -722,7 +722,7 @@ public ToStringBuilder append(final String fieldName, final int value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final int[] array) {
         style.append(buffer, fieldName, array, null);
@@ -742,7 +742,7 @@ public ToStringBuilder append(final String fieldName, final int[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final int[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -755,7 +755,7 @@ public ToStringBuilder append(final String fieldName, final int[] array, final b
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final long value) {
         style.append(buffer, fieldName, value);
@@ -768,7 +768,7 @@ public ToStringBuilder append(final String fieldName, final long value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final long[] array) {
         style.append(buffer, fieldName, array, null);
@@ -788,7 +788,7 @@ public ToStringBuilder append(final String fieldName, final long[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final long[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -801,7 +801,7 @@ public ToStringBuilder append(final String fieldName, final long[] array, final
      *
      * @param fieldName  the field name
      * @param obj  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final Object obj) {
         style.append(buffer, fieldName, obj, null);
@@ -816,7 +816,7 @@ public ToStringBuilder append(final String fieldName, final Object obj) {
      * @param obj  the value to add to the {@code toString}
      * @param fullDetail  {@code true} for detail,
      *  {@code false} for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final Object obj, final boolean fullDetail) {
         style.append(buffer, fieldName, obj, Boolean.valueOf(fullDetail));
@@ -829,7 +829,7 @@ public ToStringBuilder append(final String fieldName, final Object obj, final bo
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final Object[] array) {
         style.append(buffer, fieldName, array, null);
@@ -849,7 +849,7 @@ public ToStringBuilder append(final String fieldName, final Object[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final Object[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -862,7 +862,7 @@ public ToStringBuilder append(final String fieldName, final Object[] array, fina
      *
      * @param fieldName  the field name
      * @param value  the value to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final short value) {
         style.append(buffer, fieldName, value);
@@ -875,7 +875,7 @@ public ToStringBuilder append(final String fieldName, final short value) {
      *
      * @param fieldName  the field name
      * @param array  the array to add to the {@code toString}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final short[] array) {
         style.append(buffer, fieldName, array, null);
@@ -895,7 +895,7 @@ public ToStringBuilder append(final String fieldName, final short[] array) {
      * @param array  the array to add to the {@code toString}
      * @param fullDetail  {@code true} for detail, {@code false}
      *  for summary info
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public ToStringBuilder append(final String fieldName, final short[] array, final boolean fullDetail) {
         style.append(buffer, fieldName, array, Boolean.valueOf(fullDetail));
@@ -908,7 +908,7 @@ public ToStringBuilder append(final String fieldName, final short[] array, final
      * {@link System#identityHashCode(Object)}.
      *
      * @param srcObject  the {@link Object} whose class name and id to output
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws NullPointerException if {@code srcObject} is {@code null}
      * @since 2.0
      */
@@ -926,7 +926,7 @@ public ToStringBuilder appendAsObjectToString(final Object srcObject) {
      * <p>If {@code superToString} is {@code null}, no change is made.</p>
      *
      * @param superToString  the result of {@code super.toString()}
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.0
      */
     public ToStringBuilder appendSuper(final String superToString) {
@@ -960,7 +960,7 @@ public ToStringBuilder appendSuper(final String superToString) {
      * <p>If the {@code toString} is {@code null}, no change is made.</p>
      *
      * @param toString  the result of {@code toString()} on another object
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.0
      */
     public ToStringBuilder appendToString(final String toString) {
@@ -986,7 +986,7 @@ public String build() {
     /**
      * Gets the {@link Object} being output.
      *
-     * @return The object being output.
+     * @return the object being output
      * @since 2.0
      */
     public Object getObject() {
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
index 2db828980f0..43d5114ea39 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
@@ -98,7 +98,7 @@ private static final class DefaultToStringStyle extends ToStringStyle {
         /**
          * Ensure Singleton after serialization.
          *
-         * @return the singleton.
+         * @return the singleton
          */
         private Object readResolve() {
             return DEFAULT_STYLE;
@@ -112,8 +112,8 @@ private Object readResolve() {
      * This is an inner class rather than using {@link StandardToStringStyle} to ensure its immutability.
      * </p>
      *
-     * @since 3.4
      * @see <a href="https://www.json.org/">json.org</a>
+     * @since 3.4
      */
     private static final class JsonToStringStyle extends ToStringStyle {
 
@@ -281,8 +281,8 @@ protected void appendFieldStart(final StringBuffer buffer, final String fieldNam
         /**
          * Appends the given String enclosed in double-quotes to the given StringBuffer.
          *
-         * @param buffer the StringBuffer to append the value to.
-         * @param value  the value to append.
+         * @param buffer the StringBuffer to append the value to
+         * @param value  the value to append
          */
         private void appendValueAsString(final StringBuffer buffer, final String value) {
             buffer.append('"').append(StringEscapeUtils.escapeJson(value)).append('"');
@@ -351,7 +351,7 @@ private static final class MultiLineToStringStyle extends ToStringStyle {
         /**
          * Ensure Singleton after serialization.
          *
-         * @return the singleton.
+         * @return the singleton
          */
         private Object readResolve() {
             return MULTI_LINE_STYLE;
@@ -449,7 +449,7 @@ private static final class ShortPrefixToStringStyle extends ToStringStyle {
         /**
          * Ensure {@code Singleton} after serialization.
          *
-         * @return the singleton.
+         * @return the singleton
          */
         private Object readResolve() {
             return SHORT_PREFIX_STYLE;
@@ -570,8 +570,8 @@ private Object readResolve() {
      * is passed in while appending. Furthermore This ToStringStyle will only generate valid JSON if referenced objects also produce JSON when calling
      * {@code toString()} on them.
      *
-     * @since 3.4
      * @see <a href="https://www.json.org/">json.org</a>
+     * @since 3.4
      */
     public static final ToStringStyle JSON_STYLE = new JsonToStringStyle();
 
@@ -590,7 +590,7 @@ private Object readResolve() {
     /**
      * Gets the registry of objects being traversed by the {@code reflectionToString} methods in the current thread.
      *
-     * @return Set the registry of objects being traversed.
+     * @return set the registry of objects being traversed
      */
     public static Map<Object, Object> getRegistry() {
         return REGISTRY.get();
@@ -599,8 +599,8 @@ public static Map<Object, Object> getRegistry() {
     /**
      * Tests whether the registry contains the given object. Used by the reflection methods to avoid infinite loops.
      *
-     * @param value The object to lookup in the registry.
-     * @return boolean {@code true} if the registry contains the given object.
+     * @param value the object to lookup in the registry
+     * @return boolean {@code true} if the registry contains the given object
      */
     static boolean isRegistered(final Object value) {
         return getRegistry().containsKey(value);
@@ -609,7 +609,7 @@ static boolean isRegistered(final Object value) {
     /**
      * Registers the given object. Used by the reflection methods to avoid infinite loops.
      *
-     * @param value The object to register.
+     * @param value the object to register
      */
     static void register(final Object value) {
         if (value != null) {
@@ -624,7 +624,7 @@ static void register(final Object value) {
      * Used by the reflection methods to avoid infinite loops.
      * </p>
      *
-     * @param value The object to unregister.
+     * @param value the object to unregister
      */
     static void unregister(final Object value) {
         if (value != null) {
@@ -745,9 +745,9 @@ protected ToStringStyle() {
     /**
      * Appends to the {@code toString} a {@code boolean} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final boolean value) {
         appendFieldStart(buffer, fieldName);
@@ -758,10 +758,10 @@ public void append(final StringBuffer buffer, final String fieldName, final bool
     /**
      * Appends to the {@code toString} a {@code boolean} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the toString.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the toString
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final boolean[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -778,9 +778,9 @@ public void append(final StringBuffer buffer, final String fieldName, final bool
     /**
      * Appends to the {@code toString} a {@code byte} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final byte value) {
         appendFieldStart(buffer, fieldName);
@@ -791,10 +791,10 @@ public void append(final StringBuffer buffer, final String fieldName, final byte
     /**
      * Appends to the {@code toString} a {@code byte} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the {@code toString}.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the {@code toString}
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final byte[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -811,9 +811,9 @@ public void append(final StringBuffer buffer, final String fieldName, final byte
     /**
      * Appends to the {@code toString} a {@code char} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final char value) {
         appendFieldStart(buffer, fieldName);
@@ -824,10 +824,10 @@ public void append(final StringBuffer buffer, final String fieldName, final char
     /**
      * Appends to the {@code toString} a {@code char} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the {@code toString}.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the {@code toString}
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final char[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -844,9 +844,9 @@ public void append(final StringBuffer buffer, final String fieldName, final char
     /**
      * Appends to the {@code toString} a {@code double} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final double value) {
         appendFieldStart(buffer, fieldName);
@@ -857,10 +857,10 @@ public void append(final StringBuffer buffer, final String fieldName, final doub
     /**
      * Appends to the {@code toString} a {@code double} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the toString.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the toString
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final double[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -877,9 +877,9 @@ public void append(final StringBuffer buffer, final String fieldName, final doub
     /**
      * Appends to the {@code toString} a {@code float} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final float value) {
         appendFieldStart(buffer, fieldName);
@@ -890,10 +890,10 @@ public void append(final StringBuffer buffer, final String fieldName, final floa
     /**
      * Appends to the {@code toString} a {@code float} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the toString.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the toString
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final float[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -910,9 +910,9 @@ public void append(final StringBuffer buffer, final String fieldName, final floa
     /**
      * Appends to the {@code toString} an {@code int} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final int value) {
         appendFieldStart(buffer, fieldName);
@@ -923,10 +923,10 @@ public void append(final StringBuffer buffer, final String fieldName, final int
     /**
      * Appends to the {@code toString} an {@code int} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the {@code toString}.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the {@code toString}
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final int[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -943,9 +943,9 @@ public void append(final StringBuffer buffer, final String fieldName, final int[
     /**
      * Appends to the {@code toString} a {@code long} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final long value) {
         appendFieldStart(buffer, fieldName);
@@ -956,10 +956,10 @@ public void append(final StringBuffer buffer, final String fieldName, final long
     /**
      * Appends to the {@code toString} a {@code long} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the {@code toString}.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the {@code toString}
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final long[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -976,10 +976,10 @@ public void append(final StringBuffer buffer, final String fieldName, final long
     /**
      * Appends to the {@code toString} an {@link Object} value, printing the full {@code toString} of the {@link Object} passed in.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param value      the value to add to the {@code toString}.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param value      the value to add to the {@code toString}
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final Object value, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -994,10 +994,10 @@ public void append(final StringBuffer buffer, final String fieldName, final Obje
     /**
      * Appends to the {@code toString} an {@link Object} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the toString.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the toString
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final Object[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -1014,9 +1014,9 @@ public void append(final StringBuffer buffer, final String fieldName, final Obje
     /**
      * Appends to the {@code toString} a {@code short} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
+     * @param value     the value to add to the {@code toString}
      */
     public void append(final StringBuffer buffer, final String fieldName, final short value) {
         appendFieldStart(buffer, fieldName);
@@ -1027,10 +1027,10 @@ public void append(final StringBuffer buffer, final String fieldName, final shor
     /**
      * Appends to the {@code toString} a {@code short} array.
      *
-     * @param buffer     the {@link StringBuffer} to populate.
-     * @param fieldName  the field name.
-     * @param array      the array to add to the {@code toString}.
-     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides.
+     * @param buffer     the {@link StringBuffer} to populate
+     * @param fieldName  the field name
+     * @param array      the array to add to the {@code toString}
+     * @param fullDetail {@code true} for detail, {@code false} for summary info, {@code null} for style decides
      */
     public void append(final StringBuffer buffer, final String fieldName, final short[] array, final Boolean fullDetail) {
         appendFieldStart(buffer, fieldName);
@@ -1047,8 +1047,8 @@ public void append(final StringBuffer buffer, final String fieldName, final shor
     /**
      * Appends to the {@code toString} the class name.
      *
-     * @param buffer the {@link StringBuffer} to populate.
-     * @param object the {@link Object} whose name to output.
+     * @param buffer the {@link StringBuffer} to populate
+     * @param object the {@link Object} whose name to output
      */
     protected void appendClassName(final StringBuffer buffer, final Object object) {
         if (isUseClassName() && object != null) {
@@ -1064,7 +1064,7 @@ protected void appendClassName(final StringBuffer buffer, final Object object) {
     /**
      * Appends to the {@code toString} the content end.
      *
-     * @param buffer the {@link StringBuffer} to populate.
+     * @param buffer the {@link StringBuffer} to populate
      */
     protected void appendContentEnd(final StringBuffer buffer) {
         buffer.append(getContentEnd());
@@ -1073,7 +1073,7 @@ protected void appendContentEnd(final StringBuffer buffer) {
     /**
      * Appends to the {@code toString} the content start.
      *
-     * @param buffer the {@link StringBuffer} to populate.
+     * @param buffer the {@link StringBuffer} to populate
      */
     protected void appendContentStart(final StringBuffer buffer) {
         buffer.append(getContentStart());
@@ -1083,9 +1083,9 @@ protected void appendContentStart(final StringBuffer buffer) {
      * Appends to the {@code toString} an {@link Object} value that has been detected to participate in a cycle. This implementation will print the standard
      * string value of the value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
+     * @param buffer    the {@link StringBuffer} to populate
      * @param fieldName the field name, typically not used as already appended
-     * @param value     the value to add to the {@code toString}, not {@code null}.
+     * @param value     the value to add to the {@code toString}, not {@code null}
      * @since 2.2
      */
     protected void appendCyclicObject(final StringBuffer buffer, final String fieldName, final Object value) {
@@ -1095,9 +1095,9 @@ protected void appendCyclicObject(final StringBuffer buffer, final String fieldN
     /**
      * Appends to the {@code toString} a {@code boolean} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final boolean value) {
         buffer.append(value);
@@ -1106,9 +1106,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of a {@code boolean} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final boolean[] array) {
         buffer.append(getArrayStart());
@@ -1124,9 +1124,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@code byte} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final byte value) {
         buffer.append(value);
@@ -1135,9 +1135,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of a {@code byte} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final byte[] array) {
         buffer.append(getArrayStart());
@@ -1153,9 +1153,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@code char} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final char value) {
         buffer.append(value);
@@ -1164,9 +1164,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of a {@code char} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final char[] array) {
         buffer.append(getArrayStart());
@@ -1182,9 +1182,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@link Collection}.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param coll      the {@link Collection} to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param coll      the {@link Collection} to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final Collection<?> coll) {
         buffer.append(coll);
@@ -1193,9 +1193,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@code double} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final double value) {
         buffer.append(value);
@@ -1204,9 +1204,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of a {@code double} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
+     * @param buffer    the {@link StringBuffer} to populate
      * @param fieldName the field name, typically not used as already appended
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final double[] array) {
         buffer.append(getArrayStart());
@@ -1222,9 +1222,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@code float} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final float value) {
         buffer.append(value);
@@ -1233,9 +1233,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of a {@code float} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final float[] array) {
         buffer.append(getArrayStart());
@@ -1251,9 +1251,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} an {@code int} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final int value) {
         buffer.append(value);
@@ -1262,10 +1262,10 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of an {@link Object} array item.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param i         the array item index to add.
-     * @param item      the array item to add.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param i         the array item index to add
+     * @param item      the array item to add
      * @since 3.11
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final int i, final Object item) {
@@ -1282,9 +1282,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of an {@code int} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final int[] array) {
         buffer.append(getArrayStart());
@@ -1300,9 +1300,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@code long} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final long value) {
         buffer.append(value);
@@ -1311,9 +1311,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of a {@code long} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final long[] array) {
         buffer.append(getArrayStart());
@@ -1329,9 +1329,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@link Map}.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param map       the {@link Map} to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param map       the {@link Map} to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final Map<?, ?> map) {
         buffer.append(map);
@@ -1340,9 +1340,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} an {@link Object} value, printing the full detail of the {@link Object}.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final Object value) {
         buffer.append(value);
@@ -1351,9 +1351,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of an {@link Object} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final Object[] array) {
         buffer.append(getArrayStart());
@@ -1366,9 +1366,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} a {@code short} value.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final short value) {
         buffer.append(value);
@@ -1377,9 +1377,9 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the detail of a {@code short} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendDetail(final StringBuffer buffer, final String fieldName, final short[] array) {
         buffer.append(getArrayStart());
@@ -1395,8 +1395,8 @@ protected void appendDetail(final StringBuffer buffer, final String fieldName, f
     /**
      * Appends to the {@code toString} the end of data indicator.
      *
-     * @param buffer the {@link StringBuffer} to populate.
-     * @param object the {@link Object} to build a {@code toString} for.
+     * @param buffer the {@link StringBuffer} to populate
+     * @param object the {@link Object} to build a {@code toString} for
      */
     public void appendEnd(final StringBuffer buffer, final Object object) {
         if (!isFieldSeparatorAtEnd()) {
@@ -1409,8 +1409,8 @@ public void appendEnd(final StringBuffer buffer, final Object object) {
     /**
      * Appends to the {@code toString} the field end.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
      */
     protected void appendFieldEnd(final StringBuffer buffer, final String fieldName) {
         appendFieldSeparator(buffer);
@@ -1419,7 +1419,7 @@ protected void appendFieldEnd(final StringBuffer buffer, final String fieldName)
     /**
      * Appends to the {@code toString} the field separator.
      *
-     * @param buffer the {@link StringBuffer} to populate.
+     * @param buffer the {@link StringBuffer} to populate
      */
     protected void appendFieldSeparator(final StringBuffer buffer) {
         buffer.append(getFieldSeparator());
@@ -1428,8 +1428,8 @@ protected void appendFieldSeparator(final StringBuffer buffer) {
     /**
      * Appends to the {@code toString} the field start.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name
      */
     protected void appendFieldStart(final StringBuffer buffer, final String fieldName) {
         if (isUseFieldNames() && fieldName != null) {
@@ -1441,8 +1441,8 @@ protected void appendFieldStart(final StringBuffer buffer, final String fieldNam
     /**
      * Appends the {@link System#identityHashCode(java.lang.Object)}.
      *
-     * @param buffer the {@link StringBuffer} to populate.
-     * @param object the {@link Object} whose id to output.
+     * @param buffer the {@link StringBuffer} to populate
+     * @param object the {@link Object} whose id to output
      */
     protected void appendIdentityHashCode(final StringBuffer buffer, final Object object) {
         if (isUseIdentityHashCode() && object != null) {
@@ -1468,10 +1468,10 @@ protected void appendIdentityHashCode(final StringBuffer buffer, final Object ob
      * If a cycle is detected, an object will be appended with the {@code Object.toString()} format.
      * </p>
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}, not {@code null}.
-     * @param detail    output detail or not.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}, not {@code null}
+     * @param detail    output detail or not
      */
     protected void appendInternal(final StringBuffer buffer, final String fieldName, final Object value, final boolean detail) {
         if (isRegistered(value) && !(value instanceof Number || value instanceof Boolean || value instanceof Character)) {
@@ -1563,8 +1563,8 @@ protected void appendInternal(final StringBuffer buffer, final String fieldName,
      * The default indicator is {@code "<null>"}.
      * </p>
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
      */
     protected void appendNullText(final StringBuffer buffer, final String fieldName) {
         buffer.append(getNullText());
@@ -1573,8 +1573,8 @@ protected void appendNullText(final StringBuffer buffer, final String fieldName)
     /**
      * Appends to the {@code toString} the start of data indicator.
      *
-     * @param buffer the {@link StringBuffer} to populate.
-     * @param object the {@link Object} to build a {@code toString} for.
+     * @param buffer the {@link StringBuffer} to populate
+     * @param object the {@link Object} to build a {@code toString} for
      */
     public void appendStart(final StringBuffer buffer, final Object object) {
         if (object != null) {
@@ -1590,9 +1590,9 @@ public void appendStart(final StringBuffer buffer, final Object object) {
     /**
      * Appends to the {@code toString} a summary of a {@code boolean} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final boolean[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1601,9 +1601,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} a summary of a {@code byte} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final byte[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1612,9 +1612,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} a summary of a {@code char} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final char[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1634,9 +1634,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} a summary of a {@code float} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final float[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1645,9 +1645,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} a summary of an {@code int} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final int[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1656,9 +1656,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} a summary of a {@code long} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final long[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1667,9 +1667,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} an {@link Object} value, printing a summary of the {@link Object}.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param value     the value to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param value     the value to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final Object value) {
         buffer.append(getSummaryObjectStartText());
@@ -1680,9 +1680,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} a summary of an {@link Object} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final Object[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1691,9 +1691,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
     /**
      * Appends to the {@code toString} a summary of a {@code short} array.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      */
     protected void appendSummary(final StringBuffer buffer, final String fieldName, final short[] array) {
         appendSummarySize(buffer, fieldName, array.length);
@@ -1714,9 +1714,9 @@ protected void appendSummary(final StringBuffer buffer, final String fieldName,
      * The default format is {@code "<size=n>"}.
      * </p>
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param size      the size to append.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param size      the size to append
      */
     protected void appendSummarySize(final StringBuffer buffer, final String fieldName, final int size) {
         buffer.append(getSizeStartText());
@@ -1734,8 +1734,8 @@ protected void appendSummarySize(final StringBuffer buffer, final String fieldNa
      * A {@code null} {@code superToString} is ignored.
      * </p>
      *
-     * @param buffer        the {@link StringBuffer} to populate.
-     * @param superToString the {@code super.toString()}.
+     * @param buffer        the {@link StringBuffer} to populate
+     * @param superToString the {@code super.toString()}
      * @since 2.0
      */
     public void appendSuper(final StringBuffer buffer, final String superToString) {
@@ -1752,8 +1752,8 @@ public void appendSuper(final StringBuffer buffer, final String superToString) {
      * A {@code null} {@code toString} is ignored.
      * </p>
      *
-     * @param buffer   the {@link StringBuffer} to populate.
-     * @param toString the additional {@code toString}.
+     * @param buffer   the {@link StringBuffer} to populate
+     * @param toString the additional {@code toString}
      * @since 2.0
      */
     public void appendToString(final StringBuffer buffer, final String toString) {
@@ -1773,7 +1773,7 @@ public void appendToString(final StringBuffer buffer, final String toString) {
     /**
      * Gets the array end text.
      *
-     * @return the current array end text.
+     * @return the current array end text
      */
     protected String getArrayEnd() {
         return arrayEnd;
@@ -1782,7 +1782,7 @@ protected String getArrayEnd() {
     /**
      * Gets the array separator text.
      *
-     * @return the current array separator text.
+     * @return the current array separator text
      */
     protected String getArraySeparator() {
         return arraySeparator;
@@ -1791,7 +1791,7 @@ protected String getArraySeparator() {
     /**
      * Gets the array start text.
      *
-     * @return the current array start text.
+     * @return the current array start text
      */
     protected String getArrayStart() {
         return arrayStart;
@@ -1800,7 +1800,7 @@ protected String getArrayStart() {
     /**
      * Gets the content end text.
      *
-     * @return the current content end text.
+     * @return the current content end text
      */
     protected String getContentEnd() {
         return contentEnd;
@@ -1809,7 +1809,7 @@ protected String getContentEnd() {
     /**
      * Gets the content start text.
      *
-     * @return the current content start text.
+     * @return the current content start text
      */
     protected String getContentStart() {
         return contentStart;
@@ -1818,7 +1818,7 @@ protected String getContentStart() {
     /**
      * Gets the field name value separator text.
      *
-     * @return the current field name value separator text.
+     * @return the current field name value separator text
      */
     protected String getFieldNameValueSeparator() {
         return fieldNameValueSeparator;
@@ -1827,7 +1827,7 @@ protected String getFieldNameValueSeparator() {
     /**
      * Gets the field separator text.
      *
-     * @return the current field separator text.
+     * @return the current field separator text
      */
     protected String getFieldSeparator() {
         return fieldSeparator;
@@ -1836,7 +1836,7 @@ protected String getFieldSeparator() {
     /**
      * Gets the text to output when {@code null} found.
      *
-     * @return the current text to output when null found.
+     * @return the current text to output when null found
      */
     protected String getNullText() {
         return nullText;
@@ -1849,8 +1849,8 @@ protected String getNullText() {
      * The short class name is the class name excluding the package name.
      * </p>
      *
-     * @param cls the {@link Class} to get the short name of.
-     * @return the short name.
+     * @param cls the {@link Class} to get the short name of
+     * @return the short name
      */
     protected String getShortClassName(final Class<?> cls) {
         return ClassUtils.getShortClassName(cls);
@@ -1863,7 +1863,7 @@ protected String getShortClassName(final Class<?> cls) {
      * This is output after the size value.
      * </p>
      *
-     * @return the current end of size text.
+     * @return the current end of size text
      */
     protected String getSizeEndText() {
         return sizeEndText;
@@ -1876,7 +1876,7 @@ protected String getSizeEndText() {
      * This is output before the size value.
      * </p>
      *
-     * @return the current start of size text.
+     * @return the current start of size text
      */
     protected String getSizeStartText() {
         return sizeStartText;
@@ -1889,7 +1889,7 @@ protected String getSizeStartText() {
      * This is output after the size value.
      * </p>
      *
-     * @return the current end of summary text.
+     * @return the current end of summary text
      */
     protected String getSummaryObjectEndText() {
         return summaryObjectEndText;
@@ -1902,7 +1902,7 @@ protected String getSummaryObjectEndText() {
      * This is output before the size value.
      * </p>
      *
-     * @return the current start of summary text.
+     * @return the current start of summary text
      */
     protected String getSummaryObjectStartText() {
         return summaryObjectStartText;
@@ -1911,7 +1911,7 @@ protected String getSummaryObjectStartText() {
     /**
      * Gets whether to output array content detail.
      *
-     * @return the current array content detail setting.
+     * @return the current array content detail setting
      */
     protected boolean isArrayContentDetail() {
         return arrayContentDetail;
@@ -1920,7 +1920,7 @@ protected boolean isArrayContentDetail() {
     /**
      * Gets whether to use full detail when the caller doesn't specify.
      *
-     * @return the current defaultFullDetail flag.
+     * @return the current defaultFullDetail flag
      */
     protected boolean isDefaultFullDetail() {
         return defaultFullDetail;
@@ -1929,7 +1929,7 @@ protected boolean isDefaultFullDetail() {
     /**
      * Gets whether the field separator should be added at the end of each buffer.
      *
-     * @return fieldSeparatorAtEnd flag.
+     * @return fieldSeparatorAtEnd flag
      * @since 2.0
      */
     protected boolean isFieldSeparatorAtEnd() {
@@ -1939,7 +1939,7 @@ protected boolean isFieldSeparatorAtEnd() {
     /**
      * Gets whether the field separator should be added at the start of each buffer.
      *
-     * @return the fieldSeparatorAtStart flag.
+     * @return the fieldSeparatorAtStart flag
      * @since 2.0
      */
     protected boolean isFieldSeparatorAtStart() {
@@ -1955,8 +1955,8 @@ protected boolean isFieldSeparatorAtStart() {
      * detail level is used.
      * </p>
      *
-     * @param fullDetailRequest the detail level requested.
-     * @return whether full detail is to be shown.
+     * @param fullDetailRequest the detail level requested
+     * @return whether full detail is to be shown
      */
     protected boolean isFullDetail(final Boolean fullDetailRequest) {
         if (fullDetailRequest == null) {
@@ -1971,7 +1971,7 @@ protected boolean isFullDetail(final Boolean fullDetailRequest) {
     /**
      * Gets whether to use the class name.
      *
-     * @return the current useClassName flag.
+     * @return the current useClassName flag
      */
     protected boolean isUseClassName() {
         return useClassName;
@@ -1980,7 +1980,7 @@ protected boolean isUseClassName() {
     /**
      * Gets whether to use the field names passed in.
      *
-     * @return the current useFieldNames flag.
+     * @return the current useFieldNames flag
      */
     protected boolean isUseFieldNames() {
         return useFieldNames;
@@ -1989,7 +1989,7 @@ protected boolean isUseFieldNames() {
     /**
      * Gets whether to use the identity hash code.
      *
-     * @return the current useIdentityHashCode flag.
+     * @return the current useIdentityHashCode flag
      */
     protected boolean isUseIdentityHashCode() {
         return useIdentityHashCode;
@@ -1998,7 +1998,7 @@ protected boolean isUseIdentityHashCode() {
     /**
      * Gets whether to output short or long class names.
      *
-     * @return the current useShortClassName flag.
+     * @return the current useShortClassName flag
      * @since 2.0
      */
     protected boolean isUseShortClassName() {
@@ -2008,9 +2008,9 @@ protected boolean isUseShortClassName() {
     /**
      * Appends to the {@code toString} the detail of an array type.
      *
-     * @param buffer    the {@link StringBuffer} to populate.
-     * @param fieldName the field name, typically not used as already appended.
-     * @param array     the array to add to the {@code toString}, not {@code null}.
+     * @param buffer    the {@link StringBuffer} to populate
+     * @param fieldName the field name, typically not used as already appended
+     * @param array     the array to add to the {@code toString}, not {@code null}
      * @since 2.0
      */
     protected void reflectionAppendArrayDetail(final StringBuffer buffer, final String fieldName, final Object array) {
@@ -2025,7 +2025,7 @@ protected void reflectionAppendArrayDetail(final StringBuffer buffer, final Stri
     /**
      * Remove the last field separator from the buffer.
      *
-     * @param buffer the {@link StringBuffer} to populate.
+     * @param buffer the {@link StringBuffer} to populate
      * @since 2.0
      */
     protected void removeLastFieldSeparator(final StringBuffer buffer) {
@@ -2037,7 +2037,7 @@ protected void removeLastFieldSeparator(final StringBuffer buffer) {
     /**
      * Sets whether to output array content detail.
      *
-     * @param arrayContentDetail the new arrayContentDetail flag.
+     * @param arrayContentDetail the new arrayContentDetail flag
      */
     protected void setArrayContentDetail(final boolean arrayContentDetail) {
         this.arrayContentDetail = arrayContentDetail;
@@ -2050,7 +2050,7 @@ protected void setArrayContentDetail(final boolean arrayContentDetail) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param arrayEnd the new array end text.
+     * @param arrayEnd the new array end text
      */
     protected void setArrayEnd(final String arrayEnd) {
         this.arrayEnd = ObjectUtils.toString(arrayEnd);
@@ -2063,7 +2063,7 @@ protected void setArrayEnd(final String arrayEnd) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param arraySeparator the new array separator text.
+     * @param arraySeparator the new array separator text
      */
     protected void setArraySeparator(final String arraySeparator) {
         this.arraySeparator = ObjectUtils.toString(arraySeparator);
@@ -2076,7 +2076,7 @@ protected void setArraySeparator(final String arraySeparator) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param arrayStart the new array start text.
+     * @param arrayStart the new array start text
      */
     protected void setArrayStart(final String arrayStart) {
         this.arrayStart = ObjectUtils.toString(arrayStart);
@@ -2089,7 +2089,7 @@ protected void setArrayStart(final String arrayStart) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param contentEnd the new content end text.
+     * @param contentEnd the new content end text
      */
     protected void setContentEnd(final String contentEnd) {
         this.contentEnd = ObjectUtils.toString(contentEnd);
@@ -2102,7 +2102,7 @@ protected void setContentEnd(final String contentEnd) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param contentStart the new content start text.
+     * @param contentStart the new content start text
      */
     protected void setContentStart(final String contentStart) {
         this.contentStart = ObjectUtils.toString(contentStart);
@@ -2111,7 +2111,7 @@ protected void setContentStart(final String contentStart) {
     /**
      * Sets whether to use full detail when the caller doesn't specify.
      *
-     * @param defaultFullDetail the new defaultFullDetail flag.
+     * @param defaultFullDetail the new defaultFullDetail flag
      */
     protected void setDefaultFullDetail(final boolean defaultFullDetail) {
         this.defaultFullDetail = defaultFullDetail;
@@ -2124,7 +2124,7 @@ protected void setDefaultFullDetail(final boolean defaultFullDetail) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param fieldNameValueSeparator the new field name value separator text.
+     * @param fieldNameValueSeparator the new field name value separator text
      */
     protected void setFieldNameValueSeparator(final String fieldNameValueSeparator) {
         this.fieldNameValueSeparator = ObjectUtils.toString(fieldNameValueSeparator);
@@ -2137,7 +2137,7 @@ protected void setFieldNameValueSeparator(final String fieldNameValueSeparator)
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param fieldSeparator the new field separator text.
+     * @param fieldSeparator the new field separator text
      */
     protected void setFieldSeparator(final String fieldSeparator) {
         this.fieldSeparator = ObjectUtils.toString(fieldSeparator);
@@ -2146,7 +2146,7 @@ protected void setFieldSeparator(final String fieldSeparator) {
     /**
      * Sets whether the field separator should be added at the end of each buffer.
      *
-     * @param fieldSeparatorAtEnd the fieldSeparatorAtEnd flag.
+     * @param fieldSeparatorAtEnd the fieldSeparatorAtEnd flag
      * @since 2.0
      */
     protected void setFieldSeparatorAtEnd(final boolean fieldSeparatorAtEnd) {
@@ -2156,7 +2156,7 @@ protected void setFieldSeparatorAtEnd(final boolean fieldSeparatorAtEnd) {
     /**
      * Sets whether the field separator should be added at the start of each buffer.
      *
-     * @param fieldSeparatorAtStart the fieldSeparatorAtStart flag.
+     * @param fieldSeparatorAtStart the fieldSeparatorAtStart flag
      * @since 2.0
      */
     protected void setFieldSeparatorAtStart(final boolean fieldSeparatorAtStart) {
@@ -2170,7 +2170,7 @@ protected void setFieldSeparatorAtStart(final boolean fieldSeparatorAtStart) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param nullText the new text to output when null found.
+     * @param nullText the new text to output when null found
      */
     protected void setNullText(final String nullText) {
         this.nullText = ObjectUtils.toString(nullText);
@@ -2187,7 +2187,7 @@ protected void setNullText(final String nullText) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param sizeEndText the new end of size text.
+     * @param sizeEndText the new end of size text
      */
     protected void setSizeEndText(final String sizeEndText) {
         this.sizeEndText = ObjectUtils.toString(sizeEndText);
@@ -2204,7 +2204,7 @@ protected void setSizeEndText(final String sizeEndText) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param sizeStartText the new start of size text.
+     * @param sizeStartText the new start of size text
      */
     protected void setSizeStartText(final String sizeStartText) {
         this.sizeStartText = ObjectUtils.toString(sizeStartText);
@@ -2221,7 +2221,7 @@ protected void setSizeStartText(final String sizeStartText) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param summaryObjectEndText the new end of summary text.
+     * @param summaryObjectEndText the new end of summary text
      */
     protected void setSummaryObjectEndText(final String summaryObjectEndText) {
         this.summaryObjectEndText = ObjectUtils.toString(summaryObjectEndText);
@@ -2238,7 +2238,7 @@ protected void setSummaryObjectEndText(final String summaryObjectEndText) {
      * {@code null} is accepted, but will be converted to an empty String.
      * </p>
      *
-     * @param summaryObjectStartText the new start of summary text.
+     * @param summaryObjectStartText the new start of summary text
      */
     protected void setSummaryObjectStartText(final String summaryObjectStartText) {
         this.summaryObjectStartText = ObjectUtils.toString(summaryObjectStartText);
@@ -2247,7 +2247,7 @@ protected void setSummaryObjectStartText(final String summaryObjectStartText) {
     /**
      * Sets whether to use the class name.
      *
-     * @param useClassName the new useClassName flag.
+     * @param useClassName the new useClassName flag
      */
     protected void setUseClassName(final boolean useClassName) {
         this.useClassName = useClassName;
@@ -2256,7 +2256,7 @@ protected void setUseClassName(final boolean useClassName) {
     /**
      * Sets whether to use the field names passed in.
      *
-     * @param useFieldNames the new useFieldNames flag.
+     * @param useFieldNames the new useFieldNames flag
      */
     protected void setUseFieldNames(final boolean useFieldNames) {
         this.useFieldNames = useFieldNames;
@@ -2265,7 +2265,7 @@ protected void setUseFieldNames(final boolean useFieldNames) {
     /**
      * Sets whether to use the identity hash code.
      *
-     * @param useIdentityHashCode the new useIdentityHashCode flag.
+     * @param useIdentityHashCode the new useIdentityHashCode flag
      */
     protected void setUseIdentityHashCode(final boolean useIdentityHashCode) {
         this.useIdentityHashCode = useIdentityHashCode;
@@ -2274,7 +2274,7 @@ protected void setUseIdentityHashCode(final boolean useIdentityHashCode) {
     /**
      * Sets whether to output short or long class names.
      *
-     * @param useShortClassName the new useShortClassName flag.
+     * @param useShortClassName the new useShortClassName flag
      * @since 2.0
      */
     protected void setUseShortClassName(final boolean useShortClassName) {
diff --git a/src/main/java/org/apache/commons/lang3/compare/ComparableUtils.java b/src/main/java/org/apache/commons/lang3/compare/ComparableUtils.java
index be75a6390c1..76da4a7c3d6 100644
--- a/src/main/java/org/apache/commons/lang3/compare/ComparableUtils.java
+++ b/src/main/java/org/apache/commons/lang3/compare/ComparableUtils.java
@@ -34,7 +34,7 @@ public class ComparableUtils {
     /**
      * Compares objects of a given generic type {@code A}.
      *
-     * @param <A> the type of objects that this object may be compared against.
+     * @param <A> the type of objects that this object may be compared against
      */
     public static class ComparableCheckBuilder<A extends Comparable<A>> {
 
@@ -212,10 +212,10 @@ public static <A extends Comparable<A>> Predicate<A> lt(final A b) {
      * For three or more values, use {@link ObjectUtils#max(Comparable...)}.
      * </p>
      *
-     * @param <A> Type of what we are comparing.
-     * @param comparable1 the first comparable, may be null.
-     * @param comparable2 the second comparable, may be null.
-     * @return the largest of {@code comparable1} and {@code comparable2}.
+     * @param <A> type of what we are comparing
+     * @param comparable1 the first comparable, may be null
+     * @param comparable2 the second comparable, may be null
+     * @return the largest of {@code comparable1} and {@code comparable2}
      * @see ObjectUtils#max(Comparable...)
      * @since 3.13.0
      */
@@ -229,10 +229,10 @@ public static <A extends Comparable<A>> A max(final A comparable1, final A compa
      * For three or more values, use {@link ObjectUtils#min(Comparable...)}.
      * </p>
      *
-     * @param <A> Type of what we are comparing.
-     * @param comparable1 the first comparable, may be null.
-     * @param comparable2 the second comparable, may be null.
-     * @return the smallest of {@code comparable1} and {@code comparable2}.
+     * @param <A> type of what we are comparing
+     * @param comparable1 the first comparable, may be null
+     * @param comparable2 the second comparable, may be null
+     * @return the smallest of {@code comparable1} and {@code comparable2}
      * @see ObjectUtils#min(Comparable...)
      * @since 3.13.0
      */
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer.java
index 57e4d915e78..b31a527a697 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializer.java
@@ -27,8 +27,8 @@
 /**
  * Abstracts and defines operations for {@link ConcurrentInitializer} implementations.
  *
- * @param <T> the type of the object managed by this initializer class.
- * @param <E> The exception type thrown by {@link #initialize()}.
+ * @param <T> the type of the object managed by this initializer class
+ * @param <E> the exception type thrown by {@link #initialize()}
  * @since 3.14.0
  */
 public abstract class AbstractConcurrentInitializer<T, E extends Exception> implements ConcurrentInitializer<T> {
@@ -36,10 +36,10 @@ public abstract class AbstractConcurrentInitializer<T, E extends Exception> impl
     /**
      * Builds a new instance for subclasses.
      *
-     * @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()}.
+     * @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>
             extends AbstractSupplier<I, B, E> {
@@ -64,7 +64,7 @@ public AbstractBuilder() {
         /**
          * Gets the closer consumer called by {@link #close()}.
          *
-         * @return the closer consumer called by {@link #close()}.
+         * @return the closer consumer called by {@link #close()}
          */
         public FailableConsumer<T, ? extends Exception> getCloser() {
             return closer;
@@ -73,7 +73,7 @@ public AbstractBuilder() {
         /**
          * Gets the initializer supplier called by {@link #initialize()}.
          *
-         * @return the initializer supplier called by {@link #initialize()}.
+         * @return the initializer supplier called by {@link #initialize()}
          */
         public FailableSupplier<T, ? extends Exception> getInitializer() {
             return initializer;
@@ -82,8 +82,8 @@ public AbstractBuilder() {
         /**
          * Sets the closer consumer called by {@link #close()}.
          *
-         * @param closer the consumer called by {@link #close()}.
-         * @return {@code this} instance.
+         * @param closer the consumer called by {@link #close()}
+         * @return {@code this} instance
          */
         public B setCloser(final FailableConsumer<T, ? extends Exception> closer) {
             this.closer = closer != null ? closer : FailableConsumer.nop();
@@ -93,8 +93,8 @@ public B setCloser(final FailableConsumer<T, ? extends Exception> closer) {
         /**
          * Sets the initializer supplier called by {@link #initialize()}.
          *
-         * @param initializer the supplier called by {@link #initialize()}.
-         * @return {@code this} instance.
+         * @param initializer the supplier called by {@link #initialize()}
+         * @return {@code this} instance
          */
         public B setInitializer(final FailableSupplier<T, ? extends Exception> initializer) {
             this.initializer = initializer != null ? initializer : FailableSupplier.nul();
@@ -123,8 +123,8 @@ public AbstractConcurrentInitializer() {
     /**
      * Constructs a new instance.
      *
-     * @param initializer the initializer supplier called by {@link #initialize()}.
-     * @param closer the closer consumer called by {@link #close()}.
+     * @param initializer the initializer supplier called by {@link #initialize()}
+     * @param closer the closer consumer called by {@link #close()}
      */
     AbstractConcurrentInitializer(final FailableSupplier<? extends T, ? extends Exception> initializer, final FailableConsumer<? super T, ? extends Exception> closer) {
         this.closer = Objects.requireNonNull(closer, "closer");
@@ -134,7 +134,7 @@ public AbstractConcurrentInitializer() {
     /**
      * Calls the closer with the manager object.
      *
-     * @throws ConcurrentException Thrown by the closer.
+     * @throws ConcurrentException thrown by the closer
      * @since 3.14.0
      */
     public void close() throws ConcurrentException {
@@ -157,8 +157,8 @@ public void close() throws ConcurrentException {
     /**
      * Gets an Exception with a type of E as defined by a concrete subclass of this class.
      *
-     * @param e The actual exception that was thrown.
-     * @return a new exception with the actual type of E, that wraps e.
+     * @param e the actual exception that was thrown
+     * @return a new exception with the actual type of E, that wraps e
      */
     protected abstract E getTypedException(Exception e);
 
@@ -170,8 +170,8 @@ public void close() throws ConcurrentException {
      * Subclasses and clients that do not provide an initializer are expected to implement this method.
      * </p>
      *
-     * @return the managed data object.
-     * @throws E if an error occurs during object creation.
+     * @return the managed data object
+     * @throws E if an error occurs during object creation
      */
     @SuppressWarnings("unchecked")
     protected T initialize() throws E {
@@ -197,7 +197,7 @@ protected T initialize() throws E {
      * call to initialize completes successfully. If the implementation of ConcurrentInitializer can initialize multiple objects, this will only return true if
      * all objects have been initialized.
      *
-     * @return true if all initialization is complete, otherwise false.
+     * @return true if all initialization is complete, otherwise false
      */
     protected abstract boolean isInitialized();
 
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AbstractFutureProxy.java b/src/main/java/org/apache/commons/lang3/concurrent/AbstractFutureProxy.java
index 9793dfe1f74..2645ac5a5af 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AbstractFutureProxy.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AbstractFutureProxy.java
@@ -25,7 +25,7 @@
 /**
  * Proxies to a {@link Future} for subclassing.
  *
- * @param <V> The result type returned by this Future's {@link #get()} and {@link #get(long, TimeUnit)} methods.
+ * @param <V> the result type returned by this Future's {@link #get()} and {@link #get(long, TimeUnit)} methods
  * @since 3.13.0
  */
 public abstract class AbstractFutureProxy<V> implements Future<V> {
@@ -35,7 +35,7 @@ public abstract class AbstractFutureProxy<V> implements Future<V> {
     /**
      * Constructs a new instance.
      *
-     * @param future the delegate.
+     * @param future the delegate
      */
     public AbstractFutureProxy(final Future<V> future) {
         this.future = Objects.requireNonNull(future, "future");
@@ -59,7 +59,7 @@ public V get(final long timeout, final TimeUnit unit) throws InterruptedExceptio
     /**
      * Gets the delegate.
      *
-     * @return the delegate.
+     * @return the delegate
      */
     public Future<V> getFuture() {
         return future;
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
index 649ea161d37..13d5ec0a5ac 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
@@ -62,7 +62,7 @@
  * {@link LazyInitializer} is more appropriate.
  * </p>
  *
- * @param <T> the type of the object managed by this initializer class.
+ * @param <T> the type of the object managed by this initializer class
  * @since 3.0
  */
 public class AtomicInitializer<T> extends AbstractConcurrentInitializer<T, ConcurrentException> {
@@ -70,8 +70,8 @@ public class AtomicInitializer<T> extends AbstractConcurrentInitializer<T, Concu
     /**
      * Builds a new instance.
      *
-     * @param <T> The type of results supplied by this builder.
-     * @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> {
@@ -96,8 +96,8 @@ public I get() {
     /**
      * Creates a new builder.
      *
-     * @param <T> the type of object to build.
-     * @return a new builder.
+     * @param <T> the type of object to build
+     * @return a new builder
      * @since 3.14.0
      */
     public static <T> Builder<AtomicInitializer<T>, T> builder() {
@@ -117,8 +117,8 @@ public AtomicInitializer() {
     /**
      * Constructs a new instance.
      *
-     * @param initializer the initializer supplier called by {@link #initialize()}.
-     * @param closer the closer consumer called by {@link #close()}.
+     * @param initializer the initializer supplier called by {@link #initialize()}
+     * @param closer the closer consumer called by {@link #close()}
      */
     private AtomicInitializer(final FailableSupplier<T, ConcurrentException> initializer, final FailableConsumer<T, ConcurrentException> closer) {
         super(initializer, closer);
@@ -128,8 +128,8 @@ private AtomicInitializer(final FailableSupplier<T, ConcurrentException> initial
      * Gets the object managed by this initializer. The object is created if it is not available yet and stored internally. This method always returns the same
      * object.
      *
-     * @return the object created by this {@link AtomicInitializer}.
-     * @throws ConcurrentException if an error occurred during initialization of the object.
+     * @return the object created by this {@link AtomicInitializer}
+     * @throws ConcurrentException if an error occurred during initialization of the object
      */
     @Override
     public T get() throws ConcurrentException {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
index dce8cccdbb2..4b19c2ad286 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
@@ -60,8 +60,8 @@ public class AtomicSafeInitializer<T> extends AbstractConcurrentInitializer<T, C
     /**
      * Builds a new instance.
      *
-     * @param <T> The type of results supplied by this builder.
-     * @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> {
@@ -86,8 +86,8 @@ public I get() {
     /**
      * Creates a new builder.
      *
-     * @param <T> the type of object to build.
-     * @return a new builder.
+     * @param <T> the type of object to build
+     * @return a new builder
      * @since 3.14.0
      */
     public static <T> Builder<AtomicSafeInitializer<T>, T> builder() {
@@ -110,8 +110,8 @@ public AtomicSafeInitializer() {
     /**
      * Constructs a new instance.
      *
-     * @param initializer the initializer supplier called by {@link #initialize()}.
-     * @param closer the closer consumer called by {@link #close()}.
+     * @param initializer the initializer supplier called by {@link #initialize()}
+     * @param closer the closer consumer called by {@link #close()}
      */
     private AtomicSafeInitializer(final FailableSupplier<T, ConcurrentException> initializer, final FailableConsumer<T, ConcurrentException> closer) {
         super(initializer, closer);
@@ -120,8 +120,8 @@ private AtomicSafeInitializer(final FailableSupplier<T, ConcurrentException> ini
     /**
      * Gets (and initialize, if not initialized yet) the required object.
      *
-     * @return lazily initialized object.
-     * @throws ConcurrentException if the initialization of the object causes an exception.
+     * @return lazily initialized object
+     * @throws ConcurrentException if the initialization of the object causes an exception
      */
     @Override
     public final T get() throws ConcurrentException {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
index 2be935ad014..d024389c3bd 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
+++ b/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 results supplied by this builder.
-     * @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> {
@@ -117,9 +117,9 @@ public I get() {
         /**
          * Sets the external executor service for executing tasks. null is a permitted value.
          *
+         * @param externalExecutor the {@link ExecutorService} to be used
+         * @return {@code this} instance
          * @see org.apache.commons.lang3.concurrent.BackgroundInitializer#setExternalExecutor(ExecutorService)
-         * @param externalExecutor the {@link ExecutorService} to be used.
-         * @return {@code this} instance.
          */
         public Builder<I, T> setExternalExecutor(final ExecutorService externalExecutor) {
             this.externalExecutor = externalExecutor;
@@ -164,8 +164,8 @@ public T call() throws Exception {
     /**
      * Creates a new builder.
      *
-     * @param <T> the type of object to build.
-     * @return a new builder.
+     * @param <T> the type of object to build
+     * @return a new builder
      * @since 3.14.0
      */
     public static <T> Builder<BackgroundInitializer<T>, T> builder() {
@@ -206,8 +206,8 @@ protected BackgroundInitializer(final ExecutorService exec) {
     /**
      * Constructs a new instance.
      *
-     * @param initializer the initializer supplier called by {@link #initialize()}.
-     * @param closer the closer consumer called by {@link #close()}.
+     * @param initializer the initializer supplier called by {@link #initialize()}
+     * @param closer the closer consumer called by {@link #close()}
      * @param exec the {@link ExecutorService} to be used @see #setExternalExecutor(ExecutorService)
      */
     private BackgroundInitializer(final FailableSupplier<T, ConcurrentException> initializer, final FailableConsumer<T, ConcurrentException> closer, final ExecutorService exec) {
@@ -219,7 +219,7 @@ private BackgroundInitializer(final FailableSupplier<T, ConcurrentException> ini
      * Creates the {@link ExecutorService} to be used. This method is called if
      * no {@link ExecutorService} was provided at construction time.
      *
-     * @return the {@link ExecutorService} to be used.
+     * @return the {@link ExecutorService} to be used
      */
     private ExecutorService createExecutor() {
         return Executors.newFixedThreadPool(getTaskCount());
@@ -233,8 +233,8 @@ private ExecutorService createExecutor() {
      * at the end of the task.
      *
      * @param execDestroy the {@link ExecutorService} to be destroyed by the
-     * task.
-     * @return a task for the background initialization.
+     * task
+     * @return a task for the background initialization
      */
     private Callable<T> createTask(final ExecutorService execDestroy) {
         return new InitializationTask(execDestroy);
@@ -249,10 +249,10 @@ private Callable<T> createTask(final ExecutorService execDestroy) {
      * was called causes an {@link IllegalStateException} exception to be
      * thrown.
      *
-     * @return the object produced by this initializer.
+     * @return the object produced by this initializer
      * @throws ConcurrentException if a checked exception occurred during
-     * background processing.
-     * @throws IllegalStateException if {@link #start()} has not been called.
+     * background processing
+     * @throws IllegalStateException if {@link #start()} has not been called
      */
     @Override
     public T get() throws ConcurrentException {
@@ -275,7 +275,7 @@ public T get() throws ConcurrentException {
      * was set, this is also the active executor. Otherwise this method returns
      * the temporary executor that was created by this object.
      *
-     * @return the {@link ExecutorService} for executing the background task.
+     * @return the {@link ExecutorService} for executing the background task
      */
     protected final synchronized ExecutorService getActiveExecutor() {
         return executor;
@@ -284,7 +284,7 @@ protected final synchronized ExecutorService getActiveExecutor() {
     /**
      * Gets the external {@link ExecutorService} to be used by this class.
      *
-     * @return the {@link ExecutorService}.
+     * @return the {@link ExecutorService}
      */
     public final synchronized ExecutorService getExternalExecutor() {
         return externalExecutor;
@@ -295,8 +295,8 @@ public final synchronized ExecutorService getExternalExecutor() {
      * was called. Therefore this method can only be called after {@code
      * start()}.
      *
-     * @return the {@link Future} object wrapped by this initializer.
-     * @throws IllegalStateException if {@link #start()} has not been called.
+     * @return the {@link Future} object wrapped by this initializer
+     * @throws IllegalStateException if {@link #start()} has not been called
      */
     public synchronized Future<T> getFuture() {
         if (future == null) {
@@ -314,7 +314,7 @@ public synchronized Future<T> getFuture() {
      * method. Therefore overriding methods should be careful with obtaining
      * other locks and return as fast as possible.
      *
-     * @return the number of background tasks required by this initializer.
+     * @return the number of background tasks required by this initializer
      */
     protected int getTaskCount() {
         return 1;
@@ -334,7 +334,7 @@ protected Exception getTypedException(final Exception e) {
      * If initialization failed then the failure will be cached and this will never return
      * true.
      *
-     * @return true if initialization completed successfully, otherwise false.
+     * @return true if initialization completed successfully, otherwise false
      * @since 3.14.0
      */
     @Override
@@ -355,7 +355,7 @@ public synchronized boolean isInitialized() {
      * been started.
      *
      * @return a flag whether the {@link #start()} method has already been
-     * called.
+     * called
      */
     public synchronized boolean isStarted() {
         return future != null;
@@ -371,9 +371,9 @@ public synchronized boolean isStarted() {
      * method must be called before {@link #start()}; otherwise an exception is
      * thrown.
      *
-     * @param externalExecutor the {@link ExecutorService} to be used.
+     * @param externalExecutor the {@link ExecutorService} to be used
      * @throws IllegalStateException if this initializer has already been
-     * started.
+     * started
      */
     public final synchronized void setExternalExecutor(final ExecutorService externalExecutor) {
         if (isStarted()) {
@@ -390,7 +390,7 @@ public final synchronized void setExternalExecutor(final ExecutorService externa
      * successful: only the first invocation of this method returns <strong>true</strong>,
      * following invocations will return <strong>false</strong>.
      *
-     * @return a flag whether the initializer could be started successfully.
+     * @return a flag whether the initializer could be started successfully
      */
     public synchronized boolean start() {
         // Not yet started?
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
index 8fd0348617e..6fcd20af2ae 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
@@ -237,7 +237,7 @@ public Builder wrappedFactory(final ThreadFactory factory) {
     /**
      * Creates a new builder.
      *
-     * @return a new builder.
+     * @return a new builder
      * @since 3.18.0
      */
     public static Builder builder() {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
index 7d7d077770c..32964b93cfc 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
@@ -73,8 +73,8 @@ public class CallableBackgroundInitializer<T> extends BackgroundInitializer<T> {
      * Creates a new instance of {@link CallableBackgroundInitializer} and sets
      * the {@link Callable} to be executed in a background thread.
      *
-     * @param call the {@link Callable} (must not be <strong>null</strong>).
-     * @throws IllegalArgumentException if the {@link Callable} is <strong>null</strong>.
+     * @param call the {@link Callable} (must not be <strong>null</strong>)
+     * @throws IllegalArgumentException if the {@link Callable} is <strong>null</strong>
      */
     public CallableBackgroundInitializer(final Callable<T> call) {
         checkCallable(call);
@@ -85,9 +85,9 @@ public CallableBackgroundInitializer(final Callable<T> call) {
      * Creates a new instance of {@link CallableBackgroundInitializer} and initializes it with the {@link Callable} to be executed in a background thread and
      * the {@link ExecutorService} for managing the background execution.
      *
-     * @param call the {@link Callable} (must not be <strong>null</strong>).
-     * @param exec an external {@link ExecutorService} to be used for task execution.
-     * @throws IllegalArgumentException if the {@link Callable} is <strong>null</strong>.
+     * @param call the {@link Callable} (must not be <strong>null</strong>)
+     * @param exec an external {@link ExecutorService} to be used for task execution
+     * @throws IllegalArgumentException if the {@link Callable} is <strong>null</strong>
      */
     public CallableBackgroundInitializer(final Callable<T> call, final ExecutorService exec) {
         super(exec);
@@ -98,8 +98,8 @@ public CallableBackgroundInitializer(final Callable<T> call, final ExecutorServi
     /**
      * Tests the passed in {@link Callable} and throws an exception if it is undefined.
      *
-     * @param callable the object to check.
-     * @throws IllegalArgumentException if the {@link Callable} is <strong>null</strong>.
+     * @param callable the object to check
+     * @throws IllegalArgumentException if the {@link Callable} is <strong>null</strong>
      */
     private void checkCallable(final Callable<T> callable) {
         Objects.requireNonNull(callable, "callable");
@@ -117,8 +117,8 @@ protected Exception getTypedException(final Exception e) {
     /**
      * Performs initialization in a background thread. This implementation delegates to the {@link Callable} passed at construction time of this object.
      *
-     * @return the result of the initialization.
-     * @throws Exception if an error occurs.
+     * @return the result of the initialization
+     * @throws Exception if an error occurs
      */
     @Override
     protected T initialize() throws Exception {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/CircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/CircuitBreaker.java
index 910d30e257f..236b6ffbcb9 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/CircuitBreaker.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/CircuitBreaker.java
@@ -46,7 +46,7 @@ public interface CircuitBreaker<T> {
      * of <strong>true</strong> typically means that the current operation can continue.
      *
      * @return <strong>true</strong> if the circuit breaker is now closed;
-     * <strong>false</strong> otherwise.
+     * <strong>false</strong> otherwise
      */
     boolean checkState();
 
@@ -72,7 +72,7 @@ public interface CircuitBreaker<T> {
      * <strong>true</strong> means that the circuit breaker is currently closed. This
      * means that everything is okay with the monitored subsystem.
      *
-     * @return the current closed state of this circuit breaker.
+     * @return the current closed state of this circuit breaker
      */
     boolean isClosed();
 
@@ -81,7 +81,7 @@ public interface CircuitBreaker<T> {
      * <strong>true</strong> means that the circuit breaker is currently open indicating a
      * problem in the monitored subsystem.
      *
-     * @return the current open state of this circuit breaker.
+     * @return the current open state of this circuit breaker
      */
     boolean isOpen();
 
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java
index d29dca1fec8..5305aa230f9 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java
@@ -37,7 +37,7 @@
  * An implementation throws {@link ConcurrentException} if an error occurred during initialization of the object.
  * </p>
  *
- * @param <T> the type of the object managed by this initializer class.
+ * @param <T> the type of the object managed by this initializer class
  * @since 3.0
  */
 public interface ConcurrentInitializer<T> extends FailableSupplier<T, ConcurrentException> {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
index f7ee310ae6f..76860f02c59 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
@@ -117,7 +117,7 @@ public int hashCode() {
      * As a {@link ConstantInitializer} is initialized on construction this will
      * always return true.
      *
-     * @return true.
+     * @return true
      * @since 3.14.0
      */
     public boolean isInitialized() {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/FutureTasks.java b/src/main/java/org/apache/commons/lang3/concurrent/FutureTasks.java
index 86e52169b52..5cc8c1ade8b 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/FutureTasks.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/FutureTasks.java
@@ -29,9 +29,9 @@ public class FutureTasks {
     /**
      * Creates a {@link FutureTask} and runs the given {@link Callable}.
      *
-     * @param <V> The result type returned by this FutureTask's {@code get} methods.
-     * @param callable the Callable task.
-     * @return a new FutureTask.
+     * @param <V> the result type returned by this FutureTask's {@code get} methods
+     * @param callable the Callable task
+     * @return a new FutureTask
      */
     public static <V> FutureTask<V> run(final Callable<V> callable) {
         final FutureTask<V> futureTask = new FutureTask<>(callable);
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
index a5271eba6e5..1e5933b0519 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
@@ -66,7 +66,7 @@
  * method are pretty fast because no synchronization is needed (only an access to a <strong>volatile</strong> member field).
  * </p>
  *
- * @param <T> the type of the object managed by the initializer.
+ * @param <T> the type of the object managed by the initializer
  * @since 3.0
  */
 public class LazyInitializer<T> extends AbstractConcurrentInitializer<T, ConcurrentException> {
@@ -74,8 +74,8 @@ public class LazyInitializer<T> extends AbstractConcurrentInitializer<T, Concurr
     /**
      * Builds a new instance.
      *
-     * @param <T> The type of results supplied by this builder.
-     * @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> {
@@ -103,8 +103,8 @@ public I get() {
     /**
      * Creates a new builder.
      *
-     * @param <T> the type of object to build.
-     * @return a new builder.
+     * @param <T> the type of object to build
+     * @return a new builder
      * @since 3.14.0
      */
     public static <T> Builder<LazyInitializer<T>, T> builder() {
@@ -125,8 +125,8 @@ public LazyInitializer() {
     /**
      * Constructs a new instance.
      *
-     * @param initializer the initializer supplier called by {@link #initialize()}.
-     * @param closer the closer consumer called by {@link #close()}.
+     * @param initializer the initializer supplier called by {@link #initialize()}
+     * @param closer the closer consumer called by {@link #close()}
      */
     private LazyInitializer(final FailableSupplier<T, ConcurrentException> initializer, final FailableConsumer<T, ConcurrentException> closer) {
         super(initializer, closer);
@@ -135,8 +135,8 @@ private LazyInitializer(final FailableSupplier<T, ConcurrentException> initializ
     /**
      * Gets the object wrapped by this instance. On first access the object is created. After that it is cached and can be accessed pretty fast.
      *
-     * @return the object initialized by this {@link LazyInitializer}.
-     * @throws ConcurrentException if an error occurred during initialization of the object.
+     * @return the object initialized by this {@link LazyInitializer}
+     * @throws ConcurrentException if an error occurred during initialization of the object
      */
     @Override
     public T get() throws ConcurrentException {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
index 813155b25ae..ff0d96b0b6a 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
@@ -120,9 +120,9 @@ public static class MultiBackgroundInitializerResults {
          * Creates a new instance of {@link MultiBackgroundInitializerResults} and initializes it with maps for the {@link BackgroundInitializer} objects, their
          * result objects and the exceptions thrown by them.
          *
-         * @param initializers  the {@link BackgroundInitializer} objects.
-         * @param resultObjects the result objects.
-         * @param exceptions    the exceptions.
+         * @param initializers  the {@link BackgroundInitializer} objects
+         * @param resultObjects the result objects
+         * @param exceptions    the exceptions
          */
         private MultiBackgroundInitializerResults(final Map<String, BackgroundInitializer<?>> initializers, final Map<String, Object> resultObjects,
                 final Map<String, ConcurrentException> exceptions) {
@@ -136,9 +136,9 @@ private MultiBackgroundInitializerResults(final Map<String, BackgroundInitialize
          * throws an exception. If it exists, the associated child initializer
          * is returned.
          *
-         * @param name the name to check.
-         * @return the initializer with this name.
-         * @throws NoSuchElementException if the name is unknown.
+         * @param name the name to check
+         * @return the initializer with this name
+         * @throws NoSuchElementException if the name is unknown
          */
         private BackgroundInitializer<?> checkName(final String name) {
             final BackgroundInitializer<?> init = initializers.get(name);
@@ -154,9 +154,9 @@ private BackgroundInitializer<?> checkName(final String name) {
          * initializer did not throw an exception, the return value is
          * <strong>null</strong>. If the name cannot be resolved, an exception is thrown.
          *
-         * @param name the name of the {@link BackgroundInitializer}.
-         * @return the exception thrown by this initializer.
-         * @throws NoSuchElementException if the name cannot be resolved.
+         * @param name the name of the {@link BackgroundInitializer}
+         * @return the exception thrown by this initializer
+         * @throws NoSuchElementException if the name cannot be resolved
          */
         public ConcurrentException getException(final String name) {
             checkName(name);
@@ -167,9 +167,9 @@ public ConcurrentException getException(final String name) {
          * Gets the {@link BackgroundInitializer} with the given name. If the
          * name cannot be resolved, an exception is thrown.
          *
-         * @param name the name of the {@link BackgroundInitializer}.
-         * @return the {@link BackgroundInitializer} with this name.
-         * @throws NoSuchElementException if the name cannot be resolved.
+         * @param name the name of the {@link BackgroundInitializer}
+         * @return the {@link BackgroundInitializer} with this name
+         * @throws NoSuchElementException if the name cannot be resolved
          */
         public BackgroundInitializer<?> getInitializer(final String name) {
             return checkName(name);
@@ -180,9 +180,9 @@ public BackgroundInitializer<?> getInitializer(final String name) {
          * BackgroundInitializer} with the given name. This is the object returned by the initializer's {@code initialize()} method. If this
          * {@link BackgroundInitializer} caused an exception, <strong>null</strong> is returned. If the name cannot be resolved, an exception is thrown.
          *
-         * @param name the name of the {@link BackgroundInitializer}.
-         * @return the result object produced by this {@code BackgroundInitializer}.
-         * @throws NoSuchElementException if the name cannot be resolved.
+         * @param name the name of the {@link BackgroundInitializer}
+         * @return the result object produced by this {@code BackgroundInitializer}
+         * @throws NoSuchElementException if the name cannot be resolved
          */
         public Object getResultObject(final String name) {
             checkName(name);
@@ -192,7 +192,7 @@ public Object getResultObject(final String name) {
         /**
          * Returns a set with the names of all {@link BackgroundInitializer} objects managed by the {@link MultiBackgroundInitializer}.
          *
-         * @return an (unmodifiable) set with the names of the managed {@code BackgroundInitializer} objects.
+         * @return an (unmodifiable) set with the names of the managed {@code BackgroundInitializer} objects
          */
         public Set<String> initializerNames() {
             return Collections.unmodifiableSet(initializers.keySet());
@@ -202,9 +202,9 @@ public Set<String> initializerNames() {
          * Tests whether the {@link BackgroundInitializer} with the
          * given name caused an exception.
          *
-         * @param name the name of the {@link BackgroundInitializer}.
-         * @return a flag whether this initializer caused an exception.
-         * @throws NoSuchElementException if the name cannot be resolved.
+         * @param name the name of the {@link BackgroundInitializer}
+         * @return a flag whether this initializer caused an exception
+         * @throws NoSuchElementException if the name cannot be resolved
          */
         public boolean isException(final String name) {
             checkName(name);
@@ -215,7 +215,7 @@ public boolean isException(final String name) {
          * Tests whether the whole initialization was successful. This
          * is the case if no child initializer has thrown an exception.
          *
-         * @return a flag whether the initialization was successful.
+         * @return a flag whether the initialization was successful
          */
         public boolean isSuccessful() {
             return exceptions.isEmpty();
@@ -235,7 +235,7 @@ public MultiBackgroundInitializer() {
      * Constructs a new instance of {@link MultiBackgroundInitializer} and
      * initializes it with the given external {@link ExecutorService}.
      *
-     * @param exec the {@link ExecutorService} for executing the background tasks.
+     * @param exec the {@link ExecutorService} for executing the background tasks
      */
     public MultiBackgroundInitializer(final ExecutorService exec) {
         super(exec);
@@ -245,10 +245,10 @@ public MultiBackgroundInitializer(final ExecutorService exec) {
      * Adds a new {@link BackgroundInitializer} to this object. When this {@link MultiBackgroundInitializer} is started, the given initializer will be
      * processed. This method must not be called after {@link #start()} has been invoked.
      *
-     * @param name                  the name of the initializer (must not be <strong>null</strong>).
-     * @param backgroundInitializer the {@link BackgroundInitializer} to add (must not be <strong>null</strong>).
-     * @throws NullPointerException  if either {@code name} or {@code backgroundInitializer} is {@code null}.
-     * @throws IllegalStateException if {@code start()} has already been called.
+     * @param name                  the name of the initializer (must not be <strong>null</strong>)
+     * @param backgroundInitializer the {@link BackgroundInitializer} to add (must not be <strong>null</strong>)
+     * @throws IllegalStateException if {@code start()} has already been called
+     * @throws NullPointerException  if either {@code name} or {@code backgroundInitializer} is {@code null}
      */
     public void addInitializer(final String name, final BackgroundInitializer<?> backgroundInitializer) {
         Objects.requireNonNull(name, "name");
@@ -300,7 +300,7 @@ public void close() throws ConcurrentException {
      * ). Then it adds 1 for the control task that waits for the completion of
      * the children.
      *
-     * @return the number of tasks required for background processing.
+     * @return the number of tasks required for background processing
      */
     @Override
     protected int getTaskCount() {
@@ -314,8 +314,8 @@ protected int getTaskCount() {
      * data. If a child initializer throws a checked exceptions, it is added to
      * the results object. Unchecked exceptions are propagated.
      *
-     * @return the results object.
-     * @throws Exception if an error occurs.
+     * @return the results object
+     * @throws Exception if an error occurs
      */
     @Override
     protected MultiBackgroundInitializerResults initialize() throws Exception {
@@ -349,7 +349,7 @@ protected MultiBackgroundInitializerResults initialize() throws Exception {
     /**
      * Tests whether this all child {@code BackgroundInitializer} objects are initialized. Once initialized, always returns true.
      *
-     * @return Whether all child {@code BackgroundInitializer} objects instance are initialized. Once initialized, always returns true. If there are no child
+     * @return whether all child {@code BackgroundInitializer} objects instance are initialized. Once initialized, always returns true. If there are no child
      *         {@code BackgroundInitializer} objects return false.
      * @since 3.14.0
      */
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java
index 6b7d8719ceb..da138af24d5 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java
@@ -70,7 +70,7 @@ public class ThresholdCircuitBreaker extends AbstractCircuitBreaker<Long> {
     /**
      * Creates a new instance of {@link ThresholdCircuitBreaker} and initializes the threshold.
      *
-     * @param threshold the threshold.
+     * @param threshold the threshold
      */
     public ThresholdCircuitBreaker(final long threshold) {
         this.used = new AtomicLong(INITIAL_COUNT);
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java b/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
index 941f403997f..fdde23b7619 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
@@ -139,8 +139,8 @@ public TimedSemaphore get() {
         /**
          * Sets the limit.
          *
-         * @param limit The limit.
-         * @return {@code this} instance.
+         * @param limit the limit
+         * @return {@code this} instance
          */
         public Builder setLimit(final int limit) {
             this.limit = limit;
@@ -150,8 +150,8 @@ public Builder setLimit(final int limit) {
         /**
          * Sets the time period.
          *
-         * @param period The time period.
-         * @return {@code this} instance.
+         * @param period the time period
+         * @return {@code this} instance
          */
         public Builder setPeriod(final long period) {
             this.period = period;
@@ -161,8 +161,8 @@ public Builder setPeriod(final long period) {
         /**
          * Sets the executor service.
          *
-         * @param service The executor service.
-         * @return {@code this} instance.
+         * @param service the executor service
+         * @return {@code this} instance
          */
         public Builder setService(final ScheduledExecutorService service) {
             this.service = service;
@@ -172,8 +172,8 @@ public Builder setService(final ScheduledExecutorService service) {
         /**
          * Sets the time unit for the period.
          *
-         * @param timeUnit The time unit for the period.
-         * @return {@code this} instance.
+         * @param timeUnit the time unit for the period
+         * @return {@code this} instance
          */
         public Builder setTimeUnit(final TimeUnit timeUnit) {
             this.timeUnit = timeUnit;
@@ -193,7 +193,7 @@ public Builder setTimeUnit(final TimeUnit timeUnit) {
     /**
      * Constructs a new Builder.
      *
-     * @return a new Builder.
+     * @return a new Builder
      * @since 3.20.0
      */
     public static Builder builder() {
@@ -255,10 +255,10 @@ private TimedSemaphore(final Builder builder) {
     /**
      * Constructs a new instance of {@link TimedSemaphore} and initializes it with the given time period and the limit.
      *
-     * @param timePeriod the time period.
-     * @param timeUnit   the unit for the period.
-     * @param limit      the limit for the semaphore.
-     * @throws IllegalArgumentException if the period is less or equals 0.
+     * @param timePeriod the time period
+     * @param timeUnit   the unit for the period
+     * @param limit      the limit for the semaphore
+     * @throws IllegalArgumentException if the period is less or equals 0
      * @deprecated Use {@link #builder()} and {@link Builder}.
      */
     @Deprecated
@@ -270,11 +270,11 @@ public TimedSemaphore(final long timePeriod, final TimeUnit timeUnit, final int
      * Constructs a new instance of {@link TimedSemaphore} and initializes it with an executor service, the given time period, and the limit. The executor service
      * will be used for creating a periodic task for monitoring the time period. It can be <strong>null</strong>, then a default service will be created.
      *
-     * @param service    the executor service.
-     * @param timePeriod the time period.
-     * @param timeUnit   the unit for the period.
-     * @param limit      the limit for the semaphore.
-     * @throws IllegalArgumentException if the period is less or equals 0.
+     * @param service    the executor service
+     * @param timePeriod the time period
+     * @param timeUnit   the unit for the period
+     * @param limit      the limit for the semaphore
+     * @throws IllegalArgumentException if the period is less or equals 0
      * @deprecated Use {@link #builder()} and {@link Builder}.
      */
     @Deprecated
@@ -287,8 +287,8 @@ public TimedSemaphore(final ScheduledExecutorService service, final long timePer
      * already been invoked, calling this method will cause an exception. The very first call of this method starts the timer task which monitors the time
      * period set for this {@link TimedSemaphore}. From now on the semaphore is active.
      *
-     * @throws InterruptedException  if the thread gets interrupted.
-     * @throws IllegalStateException if this semaphore is already shut down.
+     * @throws IllegalStateException if this semaphore is already shut down
+     * @throws InterruptedException  if the thread gets interrupted
      */
     public synchronized void acquire() throws InterruptedException {
         prepareAcquire();
@@ -305,7 +305,7 @@ public synchronized void acquire() throws InterruptedException {
      * Internal helper method for acquiring a permit. This method checks whether currently a permit can be acquired and - if so - increases the internal
      * counter. The return value indicates whether a permit could be acquired. This method must be called with the lock of this object held.
      *
-     * @return a flag whether a permit could be acquired.
+     * @return a flag whether a permit could be acquired
      */
     private boolean acquirePermit() {
         if (getLimit() <= NO_LIMIT || acquireCount < getLimit()) {
@@ -330,7 +330,7 @@ synchronized void endOfPeriod() {
     /**
      * Gets the number of invocations of the {@link #acquire()} method for the current period. This may be useful for testing or debugging purposes.
      *
-     * @return the current number of {@link #acquire()} invocations.
+     * @return the current number of {@link #acquire()} invocations
      */
     public synchronized int getAcquireCount() {
         return acquireCount;
@@ -341,7 +341,7 @@ public synchronized int getAcquireCount() {
      * indication whether it is safe to call the {@link #acquire()} method without risking to be suspended. However, there is no guarantee that a subsequent
      * call to {@link #acquire()} actually is not-blocking because in the meantime other threads may have invoked the semaphore.
      *
-     * @return the current number of available {@link #acquire()} calls in the current period.
+     * @return the current number of available {@link #acquire()} calls in the current period
      */
     public synchronized int getAvailablePermits() {
         return getLimit() - getAcquireCount();
@@ -351,7 +351,7 @@ public synchronized int getAvailablePermits() {
      * Gets the average number of successful (i.e. non-blocking) {@link #acquire()} invocations for the entire life-time of this {@code
      * TimedSemaphore}. This method can be used for instance for statistical calculations.
      *
-     * @return the average number of {@link #acquire()} invocations per time unit.
+     * @return the average number of {@link #acquire()} invocations per time unit
      */
     public synchronized double getAverageCallsPerPeriod() {
         return periodCount == 0 ? 0 : (double) totalAcquireCount / (double) periodCount;
@@ -360,7 +360,7 @@ public synchronized double getAverageCallsPerPeriod() {
     /**
      * Gets the executor service used by this instance.
      *
-     * @return the executor service.
+     * @return the executor service
      */
     protected ScheduledExecutorService getExecutorService() {
         return executorService;
@@ -371,7 +371,7 @@ protected ScheduledExecutorService getExecutorService() {
      * blocking. This can be useful for testing or debugging purposes or to determine a meaningful threshold value. If a limit is set, the value returned by
      * this method won't be greater than this limit.
      *
-     * @return the number of non-blocking invocations of the {@link #acquire()} method.
+     * @return the number of non-blocking invocations of the {@link #acquire()} method
      */
     public synchronized int getLastAcquiresPerPeriod() {
         return lastCallsPerPeriod;
@@ -380,7 +380,7 @@ public synchronized int getLastAcquiresPerPeriod() {
     /**
      * Gets the limit enforced by this semaphore. The limit determines how many invocations of {@link #acquire()} are allowed within the monitored period.
      *
-     * @return the limit.
+     * @return the limit
      */
     public final synchronized int getLimit() {
         return limit;
@@ -390,7 +390,7 @@ public final synchronized int getLimit() {
      * Gets the time period. This is the time monitored by this semaphore. Only a given number of invocations of the {@link #acquire()} method is possible in
      * this period.
      *
-     * @return the time period.
+     * @return the time period
      */
     public long getPeriod() {
         return period;
@@ -399,7 +399,7 @@ public long getPeriod() {
     /**
      * Gets the time unit. This is the unit used by {@link #getPeriod()}.
      *
-     * @return the time unit.
+     * @return the time unit
      */
     public TimeUnit getUnit() {
         return unit;
@@ -409,7 +409,7 @@ public TimeUnit getUnit() {
      * Tests whether the {@link #shutdown()} method has been called on this object. If this method returns <strong>true</strong>, this instance cannot be used
      * any longer.
      *
-     * @return a flag whether a shutdown has been performed.
+     * @return a flag whether a shutdown has been performed
      */
     public synchronized boolean isShutdown() {
         return shutdown;
@@ -433,7 +433,7 @@ private void prepareAcquire() {
      * further invocations of {@link #acquire()} will block. Setting the limit to a value &lt;= {@link #NO_LIMIT} will cause the limit to be disabled, i.e. an
      * arbitrary number of{@link #acquire()} invocations is allowed in the time period.
      *
-     * @param limit the limit.
+     * @param limit the limit
      */
     public final synchronized void setLimit(final int limit) {
         this.limit = limit;
@@ -461,7 +461,7 @@ public synchronized void shutdown() {
      * Starts the timer. This method is called when {@link #acquire()} is called for the first time. It schedules a task to be executed at fixed rate to monitor
      * the time period specified.
      *
-     * @return a future object representing the task scheduled.
+     * @return a future object representing the task scheduled
      */
     protected ScheduledFuture<?> startTimer() {
         return getExecutorService().scheduleAtFixedRate(this::endOfPeriod, getPeriod(), getPeriod(), getUnit());
@@ -471,8 +471,8 @@ protected ScheduledFuture<?> startTimer() {
      * Tries to acquire a permit from this semaphore. If the limit of this semaphore has not yet been reached, a permit is acquired, and this method returns
      * <strong>true</strong>. Otherwise, this method returns immediately with the result <strong>false</strong>.
      *
-     * @return <strong>true</strong> if a permit could be acquired; <strong>false</strong> otherwise.
-     * @throws IllegalStateException if this semaphore is already shut down.
+     * @return <strong>true</strong> if a permit could be acquired; <strong>false</strong> otherwise
+     * @throws IllegalStateException if this semaphore is already shut down
      * @since 3.5
      */
     public synchronized boolean tryAcquire() {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFuture.java b/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFuture.java
index be49dd28e4b..c2e7e6f5ecc 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFuture.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFuture.java
@@ -30,7 +30,7 @@
 /**
  * An {@link Future} that throws unchecked instead checked exceptions.
  *
- * @param <V> The result type returned by this Future's {@link #get()} and {@link #get(long, TimeUnit)} methods.
+ * @param <V> the result type returned by this Future's {@link #get()} and {@link #get(long, TimeUnit)} methods
  * @see Future
  * @see Exception
  * @since 3.13.0
@@ -40,9 +40,9 @@ public interface UncheckedFuture<V> extends Future<V> {
     /**
      * Maps the given instances as unchecked.
      *
-     * @param <T> The result type returned by the Futures' {@link #get()} and {@link #get(long, TimeUnit)} methods.
-     * @param futures The Futures to uncheck.
-     * @return a new stream.
+     * @param <T> the result type returned by the Futures' {@link #get()} and {@link #get(long, TimeUnit)} methods
+     * @param futures the Futures to uncheck
+     * @return a new stream
      */
     static <T> Stream<UncheckedFuture<T>> map(final Collection<Future<T>> futures) {
         return futures.stream().map(UncheckedFuture::on);
@@ -51,9 +51,9 @@ static <T> Stream<UncheckedFuture<T>> map(final Collection<Future<T>> futures) {
     /**
      * Maps the given instances as unchecked.
      *
-     * @param <T> The result type returned by the Futures' {@link #get()} and {@link #get(long, TimeUnit)} methods.
-     * @param futures The Futures to uncheck.
-     * @return a new collection.
+     * @param <T> the result type returned by the Futures' {@link #get()} and {@link #get(long, TimeUnit)} methods
+     * @param futures the Futures to uncheck
+     * @return a new collection
      */
     static <T> Collection<UncheckedFuture<T>> on(final Collection<Future<T>> futures) {
         return map(futures).collect(Collectors.toList());
@@ -62,9 +62,9 @@ static <T> Collection<UncheckedFuture<T>> on(final Collection<Future<T>> futures
     /**
      * Creates a new instance on the given Future.
      *
-     * @param <T> The result type returned by this Future's {@link #get()} and {@link #get(long, TimeUnit)} methods.
-     * @param future The Future to uncheck.
-     * @return a new instance.
+     * @param <T> the result type returned by this Future's {@link #get()} and {@link #get(long, TimeUnit)} methods
+     * @param future the Future to uncheck
+     * @return a new instance
      */
     static <T> UncheckedFuture<T> on(final Future<T> future) {
         return new UncheckedFutureImpl<>(future);
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFutureImpl.java b/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFutureImpl.java
index 6b92e8e7123..9c9f586b79e 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFutureImpl.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/UncheckedFutureImpl.java
@@ -27,7 +27,7 @@
 /**
  * An {@link Future} implementation that throws unchecked instead of checked exceptions.
  *
- * @param <V> The result type returned by this UncheckedFuture's {@link #get()} and {@link #get(long, TimeUnit)} methods.
+ * @param <V> the result type returned by this UncheckedFuture's {@link #get()} and {@link #get(long, TimeUnit)} methods
  * @see Future
  * @since 3.13.0
  */
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/locks/LockingVisitors.java b/src/main/java/org/apache/commons/lang3/concurrent/locks/LockingVisitors.java
index ddbdf6bc5d8..3ce79b14e57 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/locks/LockingVisitors.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/locks/LockingVisitors.java
@@ -138,8 +138,8 @@ public class LockingVisitors {
     /**
      * Wraps a domain object and a lock for access by lambdas.
      *
-     * @param <O> the wrapped object type.
-     * @param <L> the wrapped lock type.
+     * @param <O> the wrapped object type
+     * @param <L> the wrapped lock type
      * @see LockingVisitors
      */
     public static class LockVisitor<O, L> {
@@ -147,9 +147,9 @@ public static class LockVisitor<O, L> {
         /**
          * Builds {@link LockVisitor} instances.
          *
-         * @param <O> the wrapped object type.
-         * @param <L> the wrapped lock type.
-         * @param <B> the builder type.
+         * @param <O> the wrapped object type
+         * @param <L> the wrapped lock type
+         * @param <B> the builder type
          * @since 3.18.0
          */
         public static class LVBuilder<O, L, B extends LVBuilder<O, L, B>> extends AbstractSupplier<LockVisitor<O, L>, B, RuntimeException> {
@@ -199,8 +199,8 @@ Supplier<Lock> getWriteLockSupplier() {
             /**
              * Set the lock used from accept methods.
              *
-             * @param lock the lock.
-             * @return {@code this} instance.
+             * @param lock the lock
+             * @return {@code this} instance
              */
             public B setLock(final L lock) {
                 this.lock = lock;
@@ -210,8 +210,8 @@ public B setLock(final L lock) {
             /**
              * Set the resource.
              *
-             * @param object the resource.
-             * @return {@code this} instance.
+             * @param object the resource
+             * @return {@code this} instance
              */
             public B setObject(final O object) {
                 this.object = object;
@@ -221,8 +221,8 @@ public B setObject(final O object) {
             /**
              * Supplies the read lock.
              *
-             * @param readLockSupplier Supplies the read lock.
-             * @return {@code this} instance.
+             * @param readLockSupplier supplies the read lock
+             * @return {@code this} instance
              */
             public B setReadLockSupplier(final Supplier<Lock> readLockSupplier) {
                 this.readLockSupplier = readLockSupplier;
@@ -232,8 +232,8 @@ public B setReadLockSupplier(final Supplier<Lock> readLockSupplier) {
             /**
              * Supplies the write lock.
              *
-             * @param writeLockSupplier Supplies the write lock.
-             * @return {@code this} instance.
+             * @param writeLockSupplier supplies the write lock
+             * @return {@code this} instance
              */
             public B setWriteLockSupplier(final Supplier<Lock> writeLockSupplier) {
                 this.writeLockSupplier = writeLockSupplier;
@@ -265,7 +265,7 @@ public B setWriteLockSupplier(final Supplier<Lock> writeLockSupplier) {
         /**
          * Constructs an instance from a builder.
          *
-         * @param builder The builder.
+         * @param builder the builder
          */
         private LockVisitor(final LVBuilder<O, L, ?> builder) {
             this.object = Objects.requireNonNull(builder.object, "object");
@@ -277,10 +277,10 @@ private LockVisitor(final LVBuilder<O, L, ?> builder) {
         /**
          * Constructs an instance.
          *
-         * @param object The object to guard.
-         * @param lock The locking object.
-         * @param readLockSupplier Supplies the read lock, usually from the lock object.
-         * @param writeLockSupplier Supplies the write lock, usually from the lock object.
+         * @param object the object to guard
+         * @param lock the locking object
+         * @param readLockSupplier supplies the read lock, usually from the lock object
+         * @param writeLockSupplier supplies the write lock, usually from the lock object
          */
         protected LockVisitor(final O object, final L lock, final Supplier<Lock> readLockSupplier, final Supplier<Lock> writeLockSupplier) {
             this.object = Objects.requireNonNull(object, "object");
@@ -301,8 +301,8 @@ protected LockVisitor(final O object, final L lock, final Supplier<Lock> readLoc
          * lock will be released anyways.</li>
          * </ol>
          *
-         * @param consumer The consumer, which is being invoked to use the hidden object, which will be passed as the
-         *        consumers parameter.
+         * @param consumer the consumer, which is being invoked to use the hidden object, which will be passed as the
+         *        consumers parameter
          * @see #acceptWriteLocked(FailableConsumer)
          * @see #applyReadLocked(FailableFunction)
          */
@@ -322,8 +322,8 @@ public void acceptReadLocked(final FailableConsumer<O, ?> consumer) {
          * lock will be released anyways.</li>
          * </ol>
          *
-         * @param consumer The consumer, which is being invoked to use the hidden object, which will be passed as the
-         *        consumers parameter.
+         * @param consumer the consumer, which is being invoked to use the hidden object, which will be passed as the
+         *        consumers parameter
          * @see #acceptReadLocked(FailableConsumer)
          * @see #applyWriteLocked(FailableFunction)
          */
@@ -358,11 +358,11 @@ public void acceptWriteLocked(final FailableConsumer<O, ?> consumer) {
          * }
          * </pre>
          *
-         * @param <T> The result type (both the functions, and this method's.)
-         * @param function The function, which is being invoked to compute the result. The function will receive the
+         * @param <T> the result type (both the functions, and this method's.)
+         * @param function the function, which is being invoked to compute the result. The function will receive the
          *        hidden object.
-         * @return The result object, which has been returned by the functions invocation.
-         * @throws IllegalStateException The result object would be, in fact, the hidden object. This would extend
+         * @return the result object, which has been returned by the functions invocation
+         * @throws IllegalStateException the result object would be, in fact, the hidden object. This would extend
          *         access to the hidden object beyond this methods lifetime and will therefore be prevented.
          * @see #acceptReadLocked(FailableConsumer)
          * @see #applyWriteLocked(FailableFunction)
@@ -385,11 +385,11 @@ public <T> T applyReadLocked(final FailableFunction<O, T, ?> function) {
          * <li>Return the result object, that has been received from the functions invocation.</li>
          * </ol>
          *
-         * @param <T> The result type (both the functions, and this method's.)
-         * @param function The function, which is being invoked to compute the result. The function will receive the
+         * @param <T> the result type (both the functions, and this method's.)
+         * @param function the function, which is being invoked to compute the result. The function will receive the
          *        hidden object.
-         * @return The result object, which has been returned by the functions invocation.
-         * @throws IllegalStateException The result object would be, in fact, the hidden object. This would extend
+         * @return the result object, which has been returned by the functions invocation
+         * @throws IllegalStateException the result object would be, in fact, the hidden object. This would extend
          *         access to the hidden object beyond this methods lifetime and will therefore be prevented.
          * @see #acceptReadLocked(FailableConsumer)
          * @see #applyWriteLocked(FailableFunction)
@@ -401,7 +401,7 @@ public <T> T applyWriteLocked(final FailableFunction<O, T, ?> function) {
         /**
          * Gets the lock.
          *
-         * @return the lock.
+         * @return the lock
          */
         public L getLock() {
             return lock;
@@ -410,7 +410,7 @@ public L getLock() {
         /**
          * Gets the guarded object.
          *
-         * @return the object.
+         * @return the object
          */
         public O getObject() {
             return object;
@@ -420,10 +420,10 @@ public O getObject() {
          * This method provides the default implementation for {@link #acceptReadLocked(FailableConsumer)}, and
          * {@link #acceptWriteLocked(FailableConsumer)}.
          *
-         * @param lockSupplier A supplier for the lock. (This provides, in fact, a long, because a {@link StampedLock} is used
+         * @param lockSupplier a supplier for the lock. (This provides, in fact, a long, because a {@link StampedLock} is used
          *        internally.)
-         * @param consumer The consumer, which is to be given access to The object to protect, which will be passed
-         *        as a parameter.
+         * @param consumer the consumer, which is to be given access to The object to protect, which will be passed
+         *        as a parameter
          * @see #acceptReadLocked(FailableConsumer)
          * @see #acceptWriteLocked(FailableConsumer)
          */
@@ -441,13 +441,13 @@ protected void lockAcceptUnlock(final Supplier<Lock> lockSupplier, final Failabl
          * This method provides the actual implementation for {@link #applyReadLocked(FailableFunction)}, and
          * {@link #applyWriteLocked(FailableFunction)}.
          *
-         * @param <T> The result type (both the functions, and this method's.)
-         * @param lockSupplier A supplier for the lock. (This provides, in fact, a long, because a {@link StampedLock} is used
+         * @param <T> the result type (both the functions, and this method's.)
+         * @param lockSupplier a supplier for the lock. (This provides, in fact, a long, because a {@link StampedLock} is used
          *        internally.)
-         * @param function The function, which is being invoked to compute the result object. This function will receive
+         * @param function the function, which is being invoked to compute the result object. This function will receive
          *        The object to protect as a parameter.
-         * @return The result object, which has been returned by the functions invocation.
-         * @throws IllegalStateException The result object would be, in fact, the hidden object. This would extend
+         * @return the result object, which has been returned by the functions invocation
+         * @throws IllegalStateException the result object would be, in fact, the hidden object. This would extend
          *         access to the hidden object beyond this methods lifetime and will therefore be prevented.
          * @see #applyReadLocked(FailableFunction)
          * @see #applyWriteLocked(FailableFunction)
@@ -469,7 +469,7 @@ protected <T> T lockApplyUnlock(final Supplier<Lock> lockSupplier, final Failabl
      * {@link #acceptWriteLocked(FailableConsumer)}, {@link #applyReadLocked(FailableFunction)}, and {@link #applyWriteLocked(FailableFunction)}. The visitor
      * holds the lock while the consumer or function is called.
      *
-     * @param <O> The type of the object to protect.
+     * @param <O> the type of the object to protect
      * @see LockingVisitors#create(Object, ReadWriteLock)
      */
     public static class ReadWriteLockVisitor<O> extends LockVisitor<O, ReadWriteLock> {
@@ -477,7 +477,7 @@ public static class ReadWriteLockVisitor<O> extends LockVisitor<O, ReadWriteLock
         /**
          * Builds {@link LockVisitor} instances.
          *
-         * @param <O> the wrapped object type.
+         * @param <O> the wrapped object type
          * @since 3.18.0
          */
         public static class Builder<O> extends LVBuilder<O, ReadWriteLock, Builder<O>> {
@@ -505,8 +505,8 @@ public Builder<O> setLock(final ReadWriteLock readWriteLock) {
         /**
          * Creates a new builder.
          *
-         * @param <O> the wrapped object type.
-         * @return a new builder.
+         * @param <O> the wrapped object type
+         * @return a new builder
          * @since 3.18.0
          */
         public static <O> Builder<O> builder() {
@@ -516,7 +516,7 @@ public static <O> Builder<O> builder() {
         /**
          * Constructs a new instance from a builder.
          *
-         * @param builder a builder.
+         * @param builder a builder
          */
         private ReadWriteLockVisitor(final Builder<O> builder) {
             super(builder);
@@ -525,8 +525,8 @@ private ReadWriteLockVisitor(final Builder<O> builder) {
         /**
          * Creates a new instance with the given object and lock.
          *
-         * @param object The object to protect. The caller is supposed to drop all references to the locked object.
-         * @param readWriteLock the lock to use.
+         * @param object the object to protect. The caller is supposed to drop all references to the locked object.
+         * @param readWriteLock the lock to use
          * @see LockingVisitors
          */
         protected ReadWriteLockVisitor(final O object, final ReadWriteLock readWriteLock) {
@@ -540,7 +540,7 @@ protected ReadWriteLockVisitor(final O object, final ReadWriteLock readWriteLock
      * {@link #acceptWriteLocked(FailableConsumer)}, {@link #applyReadLocked(FailableFunction)}, and {@link #applyWriteLocked(FailableFunction)}. The visitor
      * holds the lock while the consumer or function is called.
      *
-     * @param <O> The type of the object to protect.
+     * @param <O> the type of the object to protect
      * @see LockingVisitors#reentrantLockVisitor(Object)
      * @since 3.18.0
      */
@@ -549,7 +549,7 @@ public static class ReentrantLockVisitor<O> extends LockVisitor<O, ReentrantLock
         /**
          * Builds {@link LockVisitor} instances.
          *
-         * @param <O> the wrapped object type.
+         * @param <O> the wrapped object type
          * @since 3.18.0
          */
         public static class Builder<O> extends LVBuilder<O, ReentrantLock, Builder<O>> {
@@ -578,8 +578,8 @@ public Builder<O> setLock(final ReentrantLock reentrantLock) {
         /**
          * Creates a new builder.
          *
-         * @param <O> the wrapped object type.
-         * @return a new builder.
+         * @param <O> the wrapped object type
+         * @return a new builder
          * @since 3.18.0
          */
         public static <O> Builder<O> builder() {
@@ -589,7 +589,7 @@ public static <O> Builder<O> builder() {
         /**
          * Constructs a new instance from a builder.
          *
-         * @param builder a builder.
+         * @param builder a builder
          */
         private ReentrantLockVisitor(final Builder<O> builder) {
             super(builder);
@@ -602,8 +602,8 @@ private ReentrantLockVisitor(final Builder<O> builder) {
          * This visitor uses the given ReentrantLock for all of its accept and apply methods.
          * </p>
          *
-         * @param object The object to protect. The caller is supposed to drop all references to the locked object.
-         * @param reentrantLock the lock to use.
+         * @param object the object to protect. The caller is supposed to drop all references to the locked object.
+         * @param reentrantLock the lock to use
          * @see LockingVisitors
          */
         protected ReentrantLockVisitor(final O object, final ReentrantLock reentrantLock) {
@@ -616,7 +616,7 @@ protected ReentrantLockVisitor(final O object, final ReentrantLock reentrantLock
      * {@link #acceptWriteLocked(FailableConsumer)}, {@link #applyReadLocked(FailableFunction)}, and {@link #applyWriteLocked(FailableFunction)}. The visitor
      * holds the lock while the consumer or function is called.
      *
-     * @param <O> The type of the object to protect.
+     * @param <O> the type of the object to protect
      * @see LockingVisitors#stampedLockVisitor(Object)
      */
     public static class StampedLockVisitor<O> extends LockVisitor<O, StampedLock> {
@@ -624,7 +624,7 @@ public static class StampedLockVisitor<O> extends LockVisitor<O, StampedLock> {
         /**
          * Builds {@link LockVisitor} instances.
          *
-         * @param <O> the wrapped object type.
+         * @param <O> the wrapped object type
          * @since 3.18.0
          */
         public static class Builder<O> extends LVBuilder<O, StampedLock, Builder<O>> {
@@ -653,8 +653,8 @@ public Builder<O> setLock(final StampedLock stampedLock) {
         /**
          * Creates a new builder.
          *
-         * @param <O> the wrapped object type.
-         * @return a new builder.
+         * @param <O> the wrapped object type
+         * @return a new builder
          * @since 3.18.0
          */
         public static <O> Builder<O> builder() {
@@ -664,7 +664,7 @@ public static <O> Builder<O> builder() {
         /**
          * Constructs a new instance from a builder.
          *
-         * @param builder a builder.
+         * @param builder a builder
          */
         private StampedLockVisitor(final Builder<O> builder) {
             super(builder);
@@ -673,8 +673,8 @@ private StampedLockVisitor(final Builder<O> builder) {
         /**
          * Creates a new instance with the given object and lock.
          *
-         * @param object The object to protect. The caller is supposed to drop all references to the locked object.
-         * @param stampedLock the lock to use.
+         * @param object the object to protect. The caller is supposed to drop all references to the locked object.
+         * @param stampedLock the lock to use
          * @see LockingVisitors
          */
         protected StampedLockVisitor(final O object, final StampedLock stampedLock) {
@@ -685,10 +685,10 @@ protected StampedLockVisitor(final O object, final StampedLock stampedLock) {
     /**
      * Creates a new instance of {@link ReadWriteLockVisitor} with the given object and lock.
      *
-     * @param <O> The type of the object to protect.
-     * @param object The object to protect.
-     * @param readWriteLock The lock to use.
-     * @return A new {@link ReadWriteLockVisitor}.
+     * @param <O> the type of the object to protect
+     * @param object the object to protect
+     * @param readWriteLock the lock to use
+     * @return a new {@link ReadWriteLockVisitor}
      * @see LockingVisitors
      * @since 3.13.0
      */
@@ -699,10 +699,10 @@ public static <O> ReadWriteLockVisitor<O> create(final O object, final ReadWrite
     /**
      * Creates a new instance of {@link ReentrantLockVisitor} with the given object and lock.
      *
-     * @param <O> The type of the object to protect.
-     * @param object The object to protect.
-     * @param reentrantLock The lock to use.
-     * @return A new {@link ReentrantLockVisitor}.
+     * @param <O> the type of the object to protect
+     * @param object the object to protect
+     * @param reentrantLock the lock to use
+     * @return a new {@link ReentrantLockVisitor}
      * @see LockingVisitors
      * @since 3.18.0
      */
@@ -713,9 +713,9 @@ public static <O> ReentrantLockVisitor<O> create(final O object, final Reentrant
     /**
      * Creates a new instance of {@link ReentrantLockVisitor} with the given object.
      *
-     * @param <O> The type of the object to protect.
-     * @param object The object to protect.
-     * @return A new {@link ReentrantLockVisitor}.
+     * @param <O> the type of the object to protect
+     * @param object the object to protect
+     * @return a new {@link ReentrantLockVisitor}
      * @see LockingVisitors
      * @since 3.18.0
      */
@@ -726,9 +726,9 @@ public static <O> ReentrantLockVisitor<O> reentrantLockVisitor(final O object) {
     /**
      * Creates a new instance of {@link ReadWriteLockVisitor} with the given object.
      *
-     * @param <O> The type of the object to protect.
-     * @param object The object to protect.
-     * @return A new {@link ReadWriteLockVisitor}.
+     * @param <O> the type of the object to protect
+     * @param object the object to protect
+     * @return a new {@link ReadWriteLockVisitor}
      * @see LockingVisitors
      */
     public static <O> ReadWriteLockVisitor<O> reentrantReadWriteLockVisitor(final O object) {
@@ -738,9 +738,9 @@ public static <O> ReadWriteLockVisitor<O> reentrantReadWriteLockVisitor(final O
     /**
      * Creates a new instance of {@link StampedLockVisitor} with the given object.
      *
-     * @param <O> The type of the object to protect.
-     * @param object The object to protect.
-     * @return A new {@link StampedLockVisitor}.
+     * @param <O> the type of the object to protect
+     * @param object the object to protect
+     * @return a new {@link StampedLockVisitor}
      * @see LockingVisitors
      */
     public static <O> StampedLockVisitor<O> stampedLockVisitor(final O object) {
diff --git a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
index 8eee97144b5..77a360815e7 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
@@ -61,7 +61,7 @@
  * Serializing an {@link EventListenerSupport} instance will result in any non-{@link Serializable} listeners being silently dropped.
  * </p>
  *
- * @param <L> the type of event listener that is supported by this proxy.
+ * @param <L> the type of event listener that is supported by this proxy
  * @since 3.0
  */
 public class EventListenerSupport<L> implements Serializable {
@@ -83,7 +83,7 @@ public ProxyInvocationHandler() {
         /**
          * Constructs a new instance.
          *
-         * @param handler Handles Throwables.
+         * @param handler handles Throwables
          * @since 3.15.0
          */
         public ProxyInvocationHandler(final FailableConsumer<Throwable, IllegalAccessException> handler) {
@@ -93,10 +93,10 @@ public ProxyInvocationHandler(final FailableConsumer<Throwable, IllegalAccessExc
         /**
          * Handles an exception thrown by a listener. By default rethrows the given Throwable.
          *
-         * @param t The Throwable
-         * @throws IllegalAccessException thrown by the listener.
-         * @throws IllegalArgumentException thrown by the listener.
-         * @throws InvocationTargetException thrown by the listener.
+         * @param t the Throwable
+         * @throws IllegalAccessException thrown by the listener
+         * @throws IllegalArgumentException thrown by the listener
+         * @throws InvocationTargetException thrown by the listener
          * @since 3.15.0
          */
         protected void handle(final Throwable t) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
@@ -110,12 +110,12 @@ protected void handle(final Throwable t) throws IllegalAccessException, IllegalA
          * </p>
          *
          * @param unusedProxy the proxy object representing a listener on which the invocation was called; not used
-         * @param method the listener method that will be called on all of the listeners.
-         * @param args event arguments to propagate to the listeners.
+         * @param method the listener method that will be called on all of the listeners
+         * @param args event arguments to propagate to the listeners
          * @return the result of the method call
-         * @throws InvocationTargetException if an error occurs
-         * @throws IllegalArgumentException if an error occurs
          * @throws IllegalAccessException if an error occurs
+         * @throws IllegalArgumentException if an error occurs
+         * @throws InvocationTargetException if an error occurs
          */
         @Override
         public Object invoke(final Object unusedProxy, final Method method, final Object[] args)
@@ -131,7 +131,7 @@ public Object invoke(final Object unusedProxy, final Method method, final Object
         }
     }
 
-    /** Serialization version */
+    /** Serialization version. */
     private static final long serialVersionUID = 3593265990380473632L;
 
     /**
@@ -140,15 +140,13 @@ public Object invoke(final Object unusedProxy, final Method method, final Object
      *
      * @param <T> the type of the listener interface
      * @param listenerInterface the type of listener interface that will receive
-     *        events posted using this class.
-     *
+     *        events posted using this class
      * @return an EventListenerSupport object which supports the specified
-     *         listener type.
-     *
-     * @throws NullPointerException if {@code listenerInterface} is
-     *         {@code null}.
+     *         listener type
      * @throws IllegalArgumentException if {@code listenerInterface} is
-     *         not an interface.
+     *         not an interface
+     * @throws NullPointerException if {@code listenerInterface} is
+     *         {@code null}
      */
     public static <T> EventListenerSupport<T> create(final Class<T> listenerInterface) {
         return new EventListenerSupport<>(listenerInterface);
@@ -183,12 +181,11 @@ private EventListenerSupport() {
      * listener interface.
      *
      * @param listenerInterface the type of listener interface that will receive
-     *        events posted using this class.
-     *
-     * @throws NullPointerException if {@code listenerInterface} is
-     *         {@code null}.
+     *        events posted using this class
      * @throws IllegalArgumentException if {@code listenerInterface} is
-     *         not an interface.
+     *         not an interface
+     * @throws NullPointerException if {@code listenerInterface} is
+     *         {@code null}
      */
     public EventListenerSupport(final Class<L> listenerInterface) {
         this(listenerInterface, Thread.currentThread().getContextClassLoader());
@@ -199,12 +196,12 @@ public EventListenerSupport(final Class<L> listenerInterface) {
      * listener interface using the specified class loader to create the JDK
      * dynamic proxy.
      *
-     * @param listenerInterface the listener interface.
-     * @param classLoader       the class loader.
-     * @throws NullPointerException if {@code listenerInterface} or
-     *         {@code classLoader} is {@code null}.
+     * @param listenerInterface the listener interface
+     * @param classLoader       the class loader
      * @throws IllegalArgumentException if {@code listenerInterface} is
-     *         not an interface.
+     *         not an interface
+     * @throws NullPointerException if {@code listenerInterface} or
+     *         {@code classLoader} is {@code null}
      */
     public EventListenerSupport(final Class<L> listenerInterface, final ClassLoader classLoader) {
         this();
@@ -220,8 +217,8 @@ public EventListenerSupport(final Class<L> listenerInterface, final ClassLoader
      * Listeners are called in the order added.
      * </p>
      *
-     * @param listener the event listener (may not be {@code null}).
-     * @throws NullPointerException if {@code listener} is {@code null}.
+     * @param listener the event listener (may not be {@code null})
+     * @throws NullPointerException if {@code listener} is {@code null}
      */
     public void addListener(final L listener) {
         addListener(listener, true);
@@ -233,10 +230,9 @@ public void addListener(final L listener) {
      * Listeners are called in the order added.
      * </p>
      *
-     * @param listener       the event listener (may not be {@code null}).
-     * @param allowDuplicate the flag for determining if duplicate listener objects are allowed to be registered.
-     *
-     * @throws NullPointerException if {@code listener} is {@code null}.
+     * @param listener       the event listener (may not be {@code null})
+     * @param allowDuplicate the flag for determining if duplicate listener objects are allowed to be registered
+     * @throws NullPointerException if {@code listener} is {@code null}
      * @since 3.5
      */
     public void addListener(final L listener, final boolean allowDuplicate) {
@@ -281,7 +277,7 @@ public L fire() {
     /**
      * Gets the number of registered listeners.
      *
-     * @return the number of registered listeners.
+     * @return the number of registered listeners
      */
     int getListenerCount() {
         return listeners.size();
@@ -314,8 +310,8 @@ private void initializeTransientFields(final Class<L> listenerInterface, final C
      * Deserializes the next object into this instance.
      *
      * @param objectInputStream the input stream
-     * @throws IOException if an IO error occurs
      * @throws ClassNotFoundException if the class cannot be resolved
+     * @throws IOException if an IO error occurs
      */
     private void readObject(final ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException {
         @SuppressWarnings("unchecked") // Will throw CCE here if not correct
@@ -328,9 +324,9 @@ private void readObject(final ObjectInputStream objectInputStream) throws IOExce
     /**
      * Removes an event listener.
      *
-     * @param listener the event listener (may not be {@code null}).
+     * @param listener the event listener (may not be {@code null})
      * @throws NullPointerException if {@code listener} is
-     *         {@code null}.
+     *         {@code null}
      */
     public void removeListener(final L listener) {
         listeners.remove(Objects.requireNonNull(listener, "listener"));
diff --git a/src/main/java/org/apache/commons/lang3/event/EventUtils.java b/src/main/java/org/apache/commons/lang3/event/EventUtils.java
index 717be028cf0..0b742c93c26 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventUtils.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventUtils.java
@@ -41,9 +41,9 @@ private static final class EventBindingInvocationHandler implements InvocationHa
         /**
          * Creates a new instance of {@link EventBindingInvocationHandler}.
          *
-         * @param target the target object for method invocations.
-         * @param methodName the name of the method to be invoked.
-         * @param eventTypes the names of the supported event types.
+         * @param target the target object for method invocations
+         * @param methodName the name of the method to be invoked
+         * @param eventTypes the names of the supported event types
          */
         EventBindingInvocationHandler(final Object target, final String methodName, final String[] eventTypes) {
             this.target = target;
@@ -54,8 +54,8 @@ private static final class EventBindingInvocationHandler implements InvocationHa
         /**
          * Checks whether a method for the passed in parameters can be found.
          *
-         * @param method the listener method invoked.
-         * @return a flag whether the parameters could be matched.
+         * @param method the listener method invoked
+         * @return a flag whether the parameters could be matched
          */
         private boolean hasMatchingParametersMethod(final Method method) {
             return MethodUtils.getAccessibleMethod(target.getClass(), methodName, method.getParameterTypes()) != null;
@@ -64,13 +64,13 @@ private boolean hasMatchingParametersMethod(final Method method) {
         /**
          * Handles a method invocation on the proxy object.
          *
-         * @param proxy the proxy instance.
-         * @param method the method to be invoked.
-         * @param parameters the parameters for the method invocation.
-         * @return the result of the method call.
-         * @throws SecurityException if an underlying accessible object's method denies the request.
-         * @see SecurityManager#checkPermission
+         * @param proxy the proxy instance
+         * @param method the method to be invoked
+         * @param parameters the parameters for the method invocation
+         * @return the result of the method call
+         * @throws SecurityException if an underlying accessible object's method denies the request
          * @throws Throwable if an error occurs
+         * @see SecurityManager#checkPermission
          */
         @Override
         public Object invoke(final Object proxy, final Method method, final Object[] parameters) throws Throwable {
@@ -88,11 +88,11 @@ public Object invoke(final Object proxy, final Method method, final Object[] par
      * Adds an event listener to the specified source.  This looks for an "add" method corresponding to the event
      * type (addActionListener, for example).
      *
-     * @param eventSource   the event source.
-     * @param listenerType  the event listener type.
-     * @param listener      the listener.
-     * @param <L>           the event listener type.
-     * @throws IllegalArgumentException if the object doesn't support the listener type.
+     * @param eventSource   the event source
+     * @param listenerType  the event listener type
+     * @param listener      the listener
+     * @param <L>           the event listener type
+     * @throws IllegalArgumentException if the object doesn't support the listener type
      */
     public static <L> void addEventListener(final Object eventSource, final Class<L> listenerType, final L listener) {
         try {
@@ -107,13 +107,13 @@ public static <L> void addEventListener(final Object eventSource, final Class<L>
     /**
      * Binds an event listener to a specific method on a specific object.
      *
-     * @param <L>          the event listener type.
-     * @param target       the target object.
-     * @param methodName   the name of the method to be called.
-     * @param eventSource  the object which is generating events (JButton, JList, etc.).
-     * @param listenerType the listener interface (ActionListener.class, SelectionListener.class, etc.).
+     * @param <L>          the event listener type
+     * @param target       the target object
+     * @param methodName   the name of the method to be called
+     * @param eventSource  the object which is generating events (JButton, JList, etc.)
+     * @param listenerType the listener interface (ActionListener.class, SelectionListener.class, etc.)
      * @param eventTypes   the event types (method names) from the listener interface (if none specified, all will be
-     *                     supported).
+     *                     supported)
      */
     public static <L> void bindEventsToMethod(final Object target, final String methodName, final Object eventSource,
             final Class<L> listenerType, final String... eventTypes) {
diff --git a/src/main/java/org/apache/commons/lang3/exception/ContextedException.java b/src/main/java/org/apache/commons/lang3/exception/ContextedException.java
index ad6b6dcfa8e..73754d123cc 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ContextedException.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ContextedException.java
@@ -105,7 +105,7 @@ public ContextedException() {
      * <p>
      * The context information is stored using a default implementation.
      *
-     * @param message  the exception message, may be null
+     * @param message the exception message, may be null
      */
     public ContextedException(final String message) {
         super(message);
@@ -145,7 +145,7 @@ public ContextedException(final String message, final Throwable cause, Exception
      * <p>
      * The context information is stored using a default implementation.
      *
-     * @param cause  the underlying cause of the exception, may be null
+     * @param cause the underlying cause of the exception, may be null
      */
     public ContextedException(final Throwable cause) {
         super(cause);
@@ -214,8 +214,8 @@ public String getFormattedExceptionMessage(final String baseMessage) {
     /**
      * Provides the message explaining the exception, including the contextual data.
      *
-     * @see Throwable#getMessage()
      * @return the message, never null
+     * @see Throwable#getMessage()
      */
     @Override
     public String getMessage() {
@@ -225,8 +225,8 @@ public String getMessage() {
     /**
      * Provides the message explaining the exception without the contextual data.
      *
-     * @see Throwable#getMessage()
      * @return the message
+     * @see Throwable#getMessage()
      * @since 3.0.1
      */
     public String getRawMessage() {
diff --git a/src/main/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java b/src/main/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java
index 550276268d3..a0be04cb105 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java
@@ -105,7 +105,7 @@ public ContextedRuntimeException() {
      * <p>
      * The context information is stored using a default implementation.
      *
-     * @param message  the exception message, may be null
+     * @param message the exception message, may be null
      */
     public ContextedRuntimeException(final String message) {
         super(message);
@@ -145,7 +145,7 @@ public ContextedRuntimeException(final String message, final Throwable cause, Ex
      * <p>
      * The context information is stored using a default implementation.
      *
-     * @param cause  the underlying cause of the exception, may be null
+     * @param cause the underlying cause of the exception, may be null
      */
     public ContextedRuntimeException(final Throwable cause) {
         super(cause);
@@ -214,8 +214,8 @@ public String getFormattedExceptionMessage(final String baseMessage) {
     /**
      * Provides the message explaining the exception, including the contextual data.
      *
-     * @see Throwable#getMessage()
      * @return the message, never null
+     * @see Throwable#getMessage()
      */
     @Override
     public String getMessage() {
@@ -225,8 +225,8 @@ public String getMessage() {
     /**
      * Provides the message explaining the exception without the contextual data.
      *
-     * @see Throwable#getMessage()
      * @return the message
+     * @see Throwable#getMessage()
      * @since 3.0.1
      */
     public String getRawMessage() {
diff --git a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
index 405b57e9018..433b35c3c57 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
@@ -133,14 +133,14 @@ public class ExceptionUtils {
      * </p>
      *
      * @param throwable
-     *            The throwable to rethrow.
-     * @param <T> The type of the returned value.
-     * @return Never actually returned, this generic type matches any type
+     *            The throwable to rethrow
+     * @param <T> the type of the returned value
+     * @return never actually returned, this generic type matches any type
      *         which the calling site requires. "Returning" the results of this
      *         method, as done in the propagateExample above, will satisfy the
      *         Java compiler requirement that all code paths return a value.
-     * @since 3.14.0
      * @see #wrapAndThrow(Throwable)
+     * @since 3.14.0
      */
     public static <T extends RuntimeException> T asRuntimeException(final Throwable throwable) {
         // claim that the typeErasure invocation throws a RuntimeException
@@ -171,8 +171,8 @@ private static <R, T extends Throwable> R eraseType(final Throwable throwable) t
      * processed until the end is reached, or until the next item in the chain is already in the result set.
      * </p>
      *
-     * @param throwable The Throwable to traverse.
-     * @param consumer a non-interfering action to perform on the elements.
+     * @param throwable the Throwable to traverse
+     * @param consumer a non-interfering action to perform on the elements
      * @since 3.13.0
      */
     public static void forEach(final Throwable throwable, final Consumer<Throwable> consumer) {
@@ -205,8 +205,8 @@ public static void forEach(final Throwable throwable, final Consumer<Throwable>
      * If none of the above is found, returns {@code null}.
      * </p>
      *
-     * @param throwable the throwable to introspect for a cause, may be null.
-     * @return the cause of the {@link Throwable}, {@code null} if none found or null throwable input.
+     * @param throwable the throwable to introspect for a cause, may be null
+     * @return the cause of the {@link Throwable}, {@code null} if none found or null throwable input
      * @since 1.0
      * @deprecated This feature will be removed in Lang 4, use {@link Throwable#getCause} instead.
      */
@@ -222,9 +222,9 @@ public static Throwable getCause(final Throwable throwable) {
      * A {@code null} set of method names means use the default set. A {@code null} in the set of method names will be ignored.
      * </p>
      *
-     * @param throwable   the throwable to introspect for a cause, may be null.
-     * @param methodNames the method names, null treated as default set.
-     * @return the cause of the {@link Throwable}, {@code null} if none found or null throwable input.
+     * @param throwable   the throwable to introspect for a cause, may be null
+     * @param methodNames the method names, null treated as default set
+     * @return the cause of the {@link Throwable}, {@code null} if none found or null throwable input
      * @since 1.0
      * @deprecated This feature will be removed in Lang 4, use {@link Throwable#getCause} instead.
      */
@@ -246,9 +246,9 @@ public static Throwable getCause(final Throwable throwable, String[] methodNames
     /**
      * Gets a {@link Throwable} by method name.
      *
-     * @param throwable  the exception to examine.
-     * @param methodName  the name of the method to find and invoke.
-     * @return the wrapped exception, or {@code null} if not found.
+     * @param throwable  the exception to examine
+     * @param methodName  the name of the method to find and invoke
+     * @return the wrapped exception, or {@code null} if not found
      */
     // TODO: Remove in Lang 4
     private static Throwable getCauseUsingMethodName(final Throwable throwable, final String methodName) {
@@ -270,7 +270,7 @@ private static Throwable getCauseUsingMethodName(final Throwable throwable, fina
      *
      * <p>This may be modified and used in the overloaded getCause(Throwable, String[]) method.</p>
      *
-     * @return cloned array of the default method names.
+     * @return cloned array of the default method names
      * @since 3.0
      * @deprecated This feature will be removed in Lang 4.
      */
@@ -286,8 +286,8 @@ public static String[] getDefaultCauseMethodNames() {
      * {ClassNameWithoutPackage}: {ThrowableMessage}
      * </p>
      *
-     * @param th  the throwable to get a message for, null returns empty string.
-     * @return the message, non-null.
+     * @param th  the throwable to get a message for, null returns empty string
+     * @return the message, non-null
      * @since 2.2
      */
     public static String getMessage(final Throwable th) {
@@ -310,9 +310,9 @@ public static String getMessage(final Throwable th) {
      * the end, or until the next item in the chain is already
      * processed. If we detect a loop, then return the element before the loop.</p>
      *
-     * @param throwable  the throwable to get the root cause for, may be null.
+     * @param throwable  the throwable to get the root cause for, may be null
      * @return the root cause of the {@link Throwable},
-     *  {@code null} if null throwable input.
+     *  {@code null} if null throwable input
      */
     public static Throwable getRootCause(final Throwable throwable) {
         final List<Throwable> list = getThrowableList(throwable);
@@ -326,8 +326,8 @@ public static Throwable getRootCause(final Throwable throwable) {
      * {ClassNameWithoutPackage}: {ThrowableMessage}
      * </p>
      *
-     * @param throwable  the throwable to get a message for, null returns empty string.
-     * @return the message, non-null.
+     * @param throwable  the throwable to get a message for, null returns empty string
+     * @return the message, non-null
      * @since 2.2
      */
     public static String getRootCauseMessage(final Throwable throwable) {
@@ -344,8 +344,8 @@ public static String getRootCauseMessage(final Throwable throwable) {
      * exceptions separated by '[wrapped]'. Note that this is the opposite
      * order to the JDK1.4 display.</p>
      *
-     * @param throwable  the throwable to examine, may be null.
-     * @return an array of stack trace frames, never null.
+     * @param throwable  the throwable to examine, may be null
+     * @return an array of stack trace frames, never null
      * @since 2.0
      */
     public static String[] getRootCauseStackTrace(final Throwable throwable) {
@@ -360,8 +360,8 @@ public static String[] getRootCauseStackTrace(final Throwable throwable) {
      * its wrapping exceptions separated by '[wrapped]'. Note that this is the opposite order to the JDK1.4 display.
      * </p>
      *
-     * @param throwable the throwable to examine, may be null.
-     * @return a list of stack trace frames, never null.
+     * @param throwable the throwable to examine, may be null
+     * @return a list of stack trace frames, never null
      * @since 3.13.0
      */
     public static List<String> getRootCauseStackTraceList(final Throwable throwable) {
@@ -396,8 +396,8 @@ public static List<String> getRootCauseStackTraceList(final Throwable throwable)
      * <p>This works in most cases and will only fail if the exception
      * message contains a line that starts with: {@code "<whitespace>at"}.</p>
      *
-     * @param throwable is any throwable.
-     * @return List of stack frames.
+     * @param throwable is any throwable
+     * @return list of stack frames
      */
     static List<String> getStackFrameList(final Throwable throwable) {
         final String stackTrace = getStackTrace(throwable);
@@ -424,8 +424,8 @@ static List<String> getStackFrameList(final Throwable throwable) {
      *
      * <p>The end of line is determined by the value of {@link System#lineSeparator()}.</p>
      *
-     * @param stackTrace  a stack trace String.
-     * @return an array where each element is a line from the argument.
+     * @param stackTrace  a stack trace String
+     * @return an array where each element is a line from the argument
      */
     static String[] getStackFrames(final String stackTrace) {
         return new IterableStringTokenizer(stackTrace, System.lineSeparator()).toArray();
@@ -441,8 +441,8 @@ static String[] getStackFrames(final String stackTrace) {
      * uses {@link Throwable#printStackTrace(java.io.PrintWriter)}.
      * </p>
      *
-     * @param throwable  the {@link Throwable} to examine, may be null.
-     * @return an array of strings describing each stack frame, never null.
+     * @param throwable  the {@link Throwable} to examine, may be null
+     * @return an array of strings describing each stack frame, never null
      */
     public static String[] getStackFrames(final Throwable throwable) {
         if (throwable == null) {
@@ -459,9 +459,9 @@ public static String[] getStackFrames(final Throwable throwable) {
      * uses {@link Throwable#printStackTrace(java.io.PrintWriter)}.
      * </p>
      *
-     * @param throwable  the {@link Throwable} to be examined, may be null.
+     * @param throwable  the {@link Throwable} to be examined, may be null
      * @return the stack trace as generated by the exception's
-     * {@code printStackTrace(PrintWriter)} method, or an empty String if {@code null} input.
+     * {@code printStackTrace(PrintWriter)} method, or an empty String if {@code null} input
      */
     public static String getStackTrace(final Throwable throwable) {
         if (throwable == null) {
@@ -485,8 +485,8 @@ public static String getStackTrace(final Throwable throwable) {
      * processed until the end, or until the next item in the
      * chain is already in the result.</p>
      *
-     * @param throwable  the throwable to inspect, may be null.
-     * @return the count of throwables, zero on null input.
+     * @param throwable  the throwable to inspect, may be null
+     * @return the count of throwables, zero on null input
      */
     public static int getThrowableCount(final Throwable throwable) {
         return getThrowableList(throwable).size();
@@ -507,8 +507,8 @@ public static int getThrowableCount(final Throwable throwable) {
      * the end, or until the next item in the chain is already
      * in the result list.</p>
      *
-     * @param throwable  the throwable to inspect, may be null.
-     * @return the list of throwables, never null.
+     * @param throwable  the throwable to inspect, may be null
+     * @return the list of throwables, never null
      * @since 2.2
      */
     public static List<Throwable> getThrowableList(Throwable throwable) {
@@ -535,8 +535,8 @@ public static List<Throwable> getThrowableList(Throwable throwable) {
      * processed until the end, or until the next item in the
      * chain is already in the result array.</p>
      *
-     * @param throwable  the throwable to inspect, may be null.
-     * @return the array of throwables, never null.
+     * @param throwable  the throwable to inspect, may be null
+     * @return the array of throwables, never null
      * @see #getThrowableList(Throwable)
      */
     public static Throwable[] getThrowables(final Throwable throwable) {
@@ -548,13 +548,13 @@ public static Throwable[] getThrowables(final Throwable throwable) {
      * of the given type?
      *
      * @param chain
-     *            The root of a Throwable causal chain.
+     *            The root of a Throwable causal chain
      * @param type
-     *            The exception type to test.
+     *            The exception type to test
      * @return true, if chain is an instance of type or is an
-     *         UndeclaredThrowableException wrapping a cause.
-     * @since 3.5
+     *         UndeclaredThrowableException wrapping a cause
      * @see #wrapAndThrow(Throwable)
+     * @since 3.5
      */
     public static boolean hasCause(Throwable chain,
             final Class<? extends Throwable> type) {
@@ -567,11 +567,11 @@ public static boolean hasCause(Throwable chain,
     /**
      * Worker method for the {@code indexOfType} methods.
      *
-     * @param throwable the throwable to inspect, may be null.
-     * @param type      the type to search for, subclasses match, null returns -1.
-     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns -1.
-     * @param subclass  if {@code true}, compares with {@link Class#isAssignableFrom(Class)}, otherwise compares using references.
-     * @return index of the {@code type} within throwables nested within the specified {@code throwable}.
+     * @param throwable the throwable to inspect, may be null
+     * @param type      the type to search for, subclasses match, null returns -1
+     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns -1
+     * @param subclass  if {@code true}, compares with {@link Class#isAssignableFrom(Class)}, otherwise compares using references
+     * @return index of the {@code type} within throwables nested within the specified {@code throwable}
      */
     private static int indexOf(final Throwable throwable, final Class<? extends Throwable> type, int fromIndex, final boolean subclass) {
         if (throwable == null || type == null) {
@@ -610,9 +610,9 @@ private static int indexOf(final Throwable throwable, final Class<? extends Thro
      * A {@code null} type returns {@code -1}.
      * No match in the chain returns {@code -1}.</p>
      *
-     * @param throwable  the throwable to inspect, may be null.
-     * @param clazz  the class to search for, subclasses do not match, null returns -1.
-     * @return the index into the throwable chain, -1 if no match or null input.
+     * @param throwable  the throwable to inspect, may be null
+     * @param clazz  the class to search for, subclasses do not match, null returns -1
+     * @return the index into the throwable chain, -1 if no match or null input
      */
     public static int indexOfThrowable(final Throwable throwable, final Class<? extends Throwable> clazz) {
         return indexOf(throwable, clazz, 0, false);
@@ -627,10 +627,10 @@ public static int indexOfThrowable(final Throwable throwable, final Class<? exte
      * treated as zero. A start index greater than the number of throwables returns {@code -1}.
      * </p>
      *
-     * @param throwable the throwable to inspect, may be null.
-     * @param clazz     the class to search for, subclasses do not match, null returns -1.
-     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns -1.
-     * @return the index into the throwable chain, -1 if no match or null input.
+     * @param throwable the throwable to inspect, may be null
+     * @param clazz     the class to search for, subclasses do not match, null returns -1
+     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns -1
+     * @return the index into the throwable chain, -1 if no match or null input
      */
     public static int indexOfThrowable(final Throwable throwable, final Class<? extends Throwable> clazz, final int fromIndex) {
         return indexOf(throwable, clazz, fromIndex, false);
@@ -646,9 +646,9 @@ public static int indexOfThrowable(final Throwable throwable, final Class<? exte
      * A {@code null} type returns {@code -1}.
      * No match in the chain returns {@code -1}.</p>
      *
-     * @param throwable  the throwable to inspect, may be null.
-     * @param type  the type to search for, subclasses match, null returns -1.
-     * @return the index into the throwable chain, -1 if no match or null input.
+     * @param throwable  the throwable to inspect, may be null
+     * @param type  the type to search for, subclasses match, null returns -1
+     * @return the index into the throwable chain, -1 if no match or null input
      * @since 2.1
      */
     public static int indexOfType(final Throwable throwable, final Class<? extends Throwable> type) {
@@ -664,10 +664,10 @@ public static int indexOfType(final Throwable throwable, final Class<? extends T
      * treated as zero. A start index greater than the number of throwables returns {@code -1}.
      * </p>
      *
-     * @param throwable the throwable to inspect, may be null.
-     * @param type      the type to search for, subclasses match, null returns -1.
-     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns -1.
-     * @return the index into the throwable chain, -1 if no match or null input.
+     * @param throwable the throwable to inspect, may be null
+     * @param type      the type to search for, subclasses match, null returns -1
+     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns -1
+     * @return the index into the throwable chain, -1 if no match or null input
      * @since 2.1
      */
     public static int indexOfType(final Throwable throwable, final Class<? extends Throwable> type, final int fromIndex) {
@@ -675,11 +675,11 @@ public static int indexOfType(final Throwable throwable, final Class<? extends T
     }
 
     /**
-     * Checks if a throwable represents a checked exception
+     * Checks if a throwable represents a checked exception.
      *
      * @param throwable
-     *            The throwable to check.
-     * @return True if the given Throwable is a checked exception.
+     *            The throwable to check
+     * @return true if the given Throwable is a checked exception
      * @since 3.13.0
      */
     public static boolean isChecked(final Throwable throwable) {
@@ -687,11 +687,11 @@ public static boolean isChecked(final Throwable throwable) {
     }
 
     /**
-     * Checks if a throwable represents an unchecked exception
+     * Checks if a throwable represents an unchecked exception.
      *
      * @param throwable
-     *            The throwable to check.
-     * @return True if the given Throwable is an unchecked exception.
+     *            The throwable to check
+     * @return true if the given Throwable is an unchecked exception
      * @since 3.13.0
      */
     public static boolean isUnchecked(final Throwable throwable) {
@@ -715,7 +715,7 @@ public static boolean isUnchecked(final Throwable throwable) {
      * that don't have nested causes.
      * </p>
      *
-     * @param throwable  the throwable to output.
+     * @param throwable  the throwable to output
      * @since 2.0
      */
     public static void printRootCauseStackTrace(final Throwable throwable) {
@@ -736,9 +736,9 @@ public static void printRootCauseStackTrace(final Throwable throwable) {
      * <p>The method is equivalent to {@code printStackTrace} for throwables
      * that don't have nested causes.</p>
      *
-     * @param throwable  the throwable to output, may be null.
-     * @param printStream  the stream to output to, may not be null.
-     * @throws NullPointerException if the printStream is {@code null}.
+     * @param throwable  the throwable to output, may be null
+     * @param printStream  the stream to output to, may not be null
+     * @throws NullPointerException if the printStream is {@code null}
      * @since 2.0
      */
     @SuppressWarnings("resource")
@@ -765,9 +765,9 @@ public static void printRootCauseStackTrace(final Throwable throwable, final Pri
      * <p>The method is equivalent to {@code printStackTrace} for throwables
      * that don't have nested causes.</p>
      *
-     * @param throwable  the throwable to output, may be null.
-     * @param printWriter  the writer to output to, may not be null.
-     * @throws NullPointerException if the printWriter is {@code null}.
+     * @param throwable  the throwable to output, may be null
+     * @param printWriter  the writer to output to, may not be null
+     * @throws NullPointerException if the printWriter is {@code null}
      * @since 2.0
      */
     @SuppressWarnings("resource")
@@ -783,9 +783,9 @@ public static void printRootCauseStackTrace(final Throwable throwable, final Pri
     /**
      * Removes common frames from the cause trace given the two stack traces.
      *
-     * @param causeFrames  stack trace of a cause throwable.
-     * @param wrapperFrames  stack trace of a wrapper throwable.
-     * @throws NullPointerException if either argument is null.
+     * @param causeFrames  stack trace of a cause throwable
+     * @param wrapperFrames  stack trace of a wrapper throwable
+     * @throws NullPointerException if either argument is null
      * @since 2.0
      */
     public static void removeCommonFrames(final List<String> causeFrames, final List<String> wrapperFrames) {
@@ -861,14 +861,14 @@ public static void removeCommonFrames(final List<String> causeFrames, final List
      * </p>
      *
      * @param throwable
-     *            The throwable to rethrow.
-     * @param <T> The type of the return value.
-     * @return Never actually returns, this generic type matches any type
+     *            The throwable to rethrow
+     * @param <T> the type of the return value
+     * @return never actually returns, this generic type matches any type
      *         which the calling site requires. "Returning" the results of this
      *         method, as done in the propagateExample above, will satisfy the
      *         Java compiler requirement that all code paths return a value.
-     * @since 3.5
      * @see #wrapAndThrow(Throwable)
+     * @since 3.5
      */
     public static <T> T rethrow(final Throwable throwable) {
         // claim that the typeErasure invocation throws a RuntimeException
@@ -888,8 +888,8 @@ public static <T> T rethrow(final Throwable throwable) {
      * processed until the end, or until the next item in the chain is already in the result.
      * </p>
      *
-     * @param throwable The Throwable to traverse.
-     * @return A new Stream of Throwable causes.
+     * @param throwable the Throwable to traverse
+     * @return a new Stream of Throwable causes
      * @since 3.13.0
      */
     public static Stream<Throwable> stream(final Throwable throwable) {
@@ -900,14 +900,14 @@ public static Stream<Throwable> stream(final Throwable throwable) {
     /**
      * Worker method for the {@code throwableOfType} methods.
      *
-     * @param <T> the type of Throwable you are searching.
-     * @param throwable  the throwable to inspect, may be null.
-     * @param type  the type to search, subclasses match, null returns null.
+     * @param <T> the type of Throwable you are searching
+     * @param throwable  the throwable to inspect, may be null
+     * @param type  the type to search, subclasses match, null returns null
      * @param fromIndex  the (zero-based) index of the starting position,
-     *  negative treated as zero, larger than chain size returns null.
+     *  negative treated as zero, larger than chain size returns null
      * @param subclass if {@code true}, compares with {@link Class#isAssignableFrom(Class)}, otherwise compares
-     * using references.
-     * @return throwable of the {@code type} within throwables nested within the specified {@code throwable}.
+     * using references
+     * @return throwable of the {@code type} within throwables nested within the specified {@code throwable}
      */
     private static <T extends Throwable> T throwableOf(final Throwable throwable, final Class<T> type, int fromIndex, final boolean subclass) {
         if (throwable == null || type == null) {
@@ -946,10 +946,10 @@ private static <T extends Throwable> T throwableOf(final Throwable throwable, fi
      * A {@code null} type returns {@code null}.
      * No match in the chain returns {@code null}.</p>
      *
-     * @param <T> the type of Throwable you are searching.
-     * @param throwable  the throwable to inspect, may be null.
-     * @param clazz  the class to search for, subclasses do not match, null returns null.
-     * @return the first matching throwable from the throwable chain, null if no match or null input.
+     * @param <T> the type of Throwable you are searching
+     * @param throwable  the throwable to inspect, may be null
+     * @param clazz  the class to search for, subclasses do not match, null returns null
+     * @return the first matching throwable from the throwable chain, null if no match or null input
      * @since 3.10
      */
     public static <T extends Throwable> T throwableOfThrowable(final Throwable throwable, final Class<T> clazz) {
@@ -965,11 +965,11 @@ public static <T extends Throwable> T throwableOfThrowable(final Throwable throw
      * index is treated as zero. A start index greater than the number of throwables returns {@code null}.
      * </p>
      *
-     * @param <T>       the type of Throwable you are searching.
-     * @param throwable the throwable to inspect, may be null.
-     * @param clazz     the class to search for, subclasses do not match, null returns null.
-     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns null.
-     * @return the first matching throwable from the throwable chain, null if no match or null input.
+     * @param <T>       the type of Throwable you are searching
+     * @param throwable the throwable to inspect, may be null
+     * @param clazz     the class to search for, subclasses do not match, null returns null
+     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns null
+     * @return the first matching throwable from the throwable chain, null if no match or null input
      * @since 3.10
      */
     public static <T extends Throwable> T throwableOfThrowable(final Throwable throwable, final Class<T> clazz, final int fromIndex) {
@@ -986,10 +986,10 @@ public static <T extends Throwable> T throwableOfThrowable(final Throwable throw
      * A {@code null} type returns {@code null}.
      * No match in the chain returns {@code null}.</p>
      *
-     * @param <T> the type of Throwable you are searching.
-     * @param throwable  the throwable to inspect, may be null.
-     * @param type  the type to search for, subclasses match, null returns null.
-     * @return the first matching throwable from the throwable chain, null if no match or null input.
+     * @param <T> the type of Throwable you are searching
+     * @param throwable  the throwable to inspect, may be null
+     * @param type  the type to search for, subclasses match, null returns null
+     * @return the first matching throwable from the throwable chain, null if no match or null input
      * @since 3.10
      */
     public static <T extends Throwable> T throwableOfType(final Throwable throwable, final Class<T> type) {
@@ -1005,11 +1005,11 @@ public static <T extends Throwable> T throwableOfType(final Throwable throwable,
      * index is treated as zero. A start index greater than the number of throwables returns {@code null}.
      * </p>
      *
-     * @param <T>       the type of Throwable you are searching.
-     * @param throwable the throwable to inspect, may be null.
-     * @param type      the type to search for, subclasses match, null returns null.
-     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns null.
-     * @return the first matching throwable from the throwable chain, null if no match or null input.
+     * @param <T>       the type of Throwable you are searching
+     * @param throwable the throwable to inspect, may be null
+     * @param type      the type to search for, subclasses match, null returns null
+     * @param fromIndex the (zero-based) index of the starting position, negative treated as zero, larger than chain size returns null
+     * @return the first matching throwable from the throwable chain, null if no match or null input
      * @since 3.10
      */
     public static <T extends Throwable> T throwableOfType(final Throwable throwable, final Class<T> type, final int fromIndex) {
@@ -1019,9 +1019,9 @@ public static <T extends Throwable> T throwableOfType(final Throwable throwable,
     /**
      * Tests whether the specified {@link Throwable} is unchecked and throws it if so.
      *
-     * @param <T> The Throwable type.
-     * @param throwable the throwable to test and throw or return.
-     * @return the given throwable.
+     * @param <T> the Throwable type
+     * @param throwable the throwable to test and throw or return
+     * @return the given throwable
      * @since 3.13.0
      * @deprecated Use {@link #throwUnchecked(Throwable)}.
      */
@@ -1039,9 +1039,9 @@ public static <T> T throwUnchecked(final T throwable) {
     /**
      * Tests whether the specified {@link Throwable} is unchecked and throws it if so.
      *
-     * @param <T> The Throwable type.
-     * @param throwable the throwable to test and throw or return.
-     * @return the given throwable.
+     * @param <T> the Throwable type
+     * @param throwable the throwable to test and throw or return
+     * @return the given throwable
      * @since 3.14.0
      */
     public static <T extends Throwable> T throwUnchecked(final T throwable) {
@@ -1063,15 +1063,15 @@ public static <T extends Throwable> T throwUnchecked(final T throwable) {
      * </p>
      *
      * @param throwable
-     *            The throwable to rethrow.
-     * @param <R> The type of the returned value.
-     * @return Never actually returned, this generic type matches any type
+     *            The throwable to rethrow
+     * @param <R> the type of the returned value
+     * @return never actually returned, this generic type matches any type
      *         which the calling site requires. "Returning" the results of this
      *         method will satisfy the Java compiler requirement that all code
      *         paths return a value.
-     * @since 3.5
      * @see #asRuntimeException(Throwable)
      * @see #hasCause(Throwable, Class)
+     * @since 3.5
      */
     public static <R> R wrapAndThrow(final Throwable throwable) {
         throw new UndeclaredThrowableException(throwUnchecked(throwable));
diff --git a/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java b/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java
index 820937960f5..e8c8500951e 100644
--- a/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java
@@ -29,13 +29,13 @@
 @FunctionalInterface
 public interface BooleanConsumer {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     BooleanConsumer NOP = t -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @return The NOP singleton.
+     * @return the NOP singleton
      */
     static BooleanConsumer nop() {
         return NOP;
diff --git a/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java b/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java
index c3e79da232d..04ad21645dc 100644
--- a/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java
@@ -29,14 +29,14 @@
 @FunctionalInterface
 public interface ByteConsumer {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     ByteConsumer NOP = t -> {
         /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @return The NOP singleton.
+     * @return the NOP singleton
      */
     static ByteConsumer nop() {
         return NOP;
diff --git a/src/main/java/org/apache/commons/lang3/function/ByteSupplier.java b/src/main/java/org/apache/commons/lang3/function/ByteSupplier.java
index 22eb4ef92ca..d44bc052dee 100644
--- a/src/main/java/org/apache/commons/lang3/function/ByteSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/ByteSupplier.java
@@ -30,7 +30,7 @@ public interface ByteSupplier {
     /**
      * Supplies a byte.
      *
-     * @return a result.
+     * @return a result
      */
     byte getAsByte();
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/Consumers.java b/src/main/java/org/apache/commons/lang3/function/Consumers.java
index d27747d672f..9f5727eacbc 100644
--- a/src/main/java/org/apache/commons/lang3/function/Consumers.java
+++ b/src/main/java/org/apache/commons/lang3/function/Consumers.java
@@ -34,9 +34,9 @@ public class Consumers {
     /**
      * Applies the given {@link Consumer} action to the object if the consumer is not {@code null}. Otherwise, does nothing.
      *
-     * @param consumer the consumer to consume.
-     * @param object   the object to be consumed.
-     * @param <T>      the type of the argument the consumer accepts.
+     * @param consumer the consumer to consume
+     * @param object   the object to be consumed
+     * @param <T>      the type of the argument the consumer accepts
      * @since 3.15.0
      */
     public static <T> void accept(final Consumer<T> consumer, final T object) {
@@ -48,8 +48,8 @@ public static <T> void accept(final Consumer<T> consumer, final T object) {
     /**
      * Gets the NOP Consumer singleton.
      *
-     * @param <T> type type to consume.
-     * @return the NOP Consumer singleton.
+     * @param <T> type type to consume
+     * @return the NOP Consumer singleton
      */
     @SuppressWarnings("unchecked")
     public static <T> Consumer<T> nop() {
diff --git a/src/main/java/org/apache/commons/lang3/function/Failable.java b/src/main/java/org/apache/commons/lang3/function/Failable.java
index cd906cc648a..487baa859a2 100644
--- a/src/main/java/org/apache/commons/lang3/function/Failable.java
+++ b/src/main/java/org/apache/commons/lang3/function/Failable.java
@@ -75,7 +75,7 @@ public class Failable {
     /**
      * Consumes a consumer and rethrows any exception as a {@link RuntimeException}.
      *
-     * @param consumer the consumer to accept, may be null for a noop.
+     * @param consumer the consumer to accept, may be null for a noop
      * @param object1 the first object to consume by {@code consumer}
      * @param object2 the second object to consume by {@code consumer}
      * @param <T> the type of the first argument the consumer accepts
@@ -90,7 +90,7 @@ public static <T, U, E extends Throwable> void accept(final FailableBiConsumer<T
     /**
      * Consumes a consumer and rethrows any exception as a {@link RuntimeException}.
      *
-     * @param consumer the consumer to accept, may be null for a noop.
+     * @param consumer the consumer to accept, may be null for a noop
      * @param object the object to consume by {@code consumer}
      * @param <T> the type the consumer accepts
      * @param <E> the type of checked exception the consumer may throw
@@ -102,7 +102,7 @@ public static <T, E extends Throwable> void accept(final FailableConsumer<T, E>
     /**
      * Consumes a consumer and rethrows any exception as a {@link RuntimeException}.
      *
-     * @param consumer the consumer to accept, may be null for a noop.
+     * @param consumer the consumer to accept, may be null for a noop
      * @param value the value to consume by {@code consumer}
      * @param <E> the type of checked exception the consumer may throw
      */
@@ -113,7 +113,7 @@ public static <E extends Throwable> void accept(final FailableDoubleConsumer<E>
     /**
      * Consumes a consumer and rethrows any exception as a {@link RuntimeException}.
      *
-     * @param consumer the consumer to accept, may be null for a noop.
+     * @param consumer the consumer to accept, may be null for a noop
      * @param value the value to consume by {@code consumer}
      * @param <E> the type of checked exception the consumer may throw
      */
@@ -124,7 +124,7 @@ public static <E extends Throwable> void accept(final FailableIntConsumer<E> con
     /**
      * Consumes a consumer and rethrows any exception as a {@link RuntimeException}.
      *
-     * @param consumer the consumer to accept, may be null for a noop.
+     * @param consumer the consumer to accept, may be null for a noop
      * @param value the value to consume by {@code consumer}
      * @param <E> the type of checked exception the consumer may throw
      */
@@ -191,13 +191,13 @@ public static <E extends Throwable> double applyAsDouble(final FailableDoubleBin
      * evaluating expressions twice. Provides an alternative to using {@link Optional} that is shorter and has less allocation.
      * </p>
      *
-     * @param <T>    The type of the input of this method and the function.
-     * @param <R>    The type of the result of the function and this method.
-     * @param <E>    The type of thrown exception or error.
-     * @param value  The value to apply the function to, may be {@code null}.
-     * @param mapper The function to apply, must not be {@code null}.
-     * @return The result of the function (which may be {@code null}) or {@code null} if the input value is {@code null}.
-     * @throws E Thrown by the given function.
+     * @param <T>    the type of the input of this method and the function
+     * @param <R>    the type of the result of the function and this method
+     * @param <E>    the type of thrown exception or error
+     * @param value  the value to apply the function to, may be {@code null}
+     * @param mapper the function to apply, must not be {@code null}
+     * @return the result of the function (which may be {@code null}) or {@code null} if the input value is {@code null}
+     * @throws E thrown by the given function
      * @see #applyNonNull(Object, FailableFunction, FailableFunction)
      * @see #applyNonNull(Object, FailableFunction, FailableFunction, FailableFunction)
      * @since 3.19.0
@@ -221,17 +221,17 @@ public static <T, R, E extends Throwable> R applyNonNull(final T value, final Fa
      * evaluating expressions twice. Provides an alternative to using {@link Optional} that is shorter and has less allocation.
      * </p>
      *
-     * @param <T>     The type of the input of this method and the first function.
-     * @param <U>     The type of the result of the first function and the input to the second function.
-     * @param <R>     The type of the result of the second function and this method.
-     * @param <E1>    The type of thrown exception or error by the first function.
-     * @param <E2>    The type of thrown exception or error by the second function.
-     * @param value1  The value to apply the functions to, may be {@code null}.
-     * @param mapper1 The first function to apply, must not be {@code null}.
-     * @param mapper2 The second function to apply, must not be {@code null}.
-     * @return The result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}.
-     * @throws E1 Thrown by the first function.
-     * @throws E2 Thrown by the second function.
+     * @param <T>     the type of the input of this method and the first function
+     * @param <U>     the type of the result of the first function and the input to the second function
+     * @param <R>     the type of the result of the second function and this method
+     * @param <E1>    the type of thrown exception or error by the first function
+     * @param <E2>    the type of thrown exception or error by the second function
+     * @param value1  the value to apply the functions to, may be {@code null}
+     * @param mapper1 the first function to apply, must not be {@code null}
+     * @param mapper2 the second function to apply, must not be {@code null}
+     * @return the result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}
+     * @throws E1 thrown by the first function
+     * @throws E2 thrown by the second function
      * @see #applyNonNull(Object, FailableFunction)
      * @see #applyNonNull(Object, FailableFunction, FailableFunction, FailableFunction)
      * @since 3.19.0
@@ -257,21 +257,21 @@ public static <T, U, R, E1 extends Throwable, E2 extends Throwable> R applyNonNu
      * evaluating expressions twice. Provides an alternative to using {@link Optional} that is shorter and has less allocation.
      * </p>
      *
-     * @param <T>     The type of the input of this method and the first function.
-     * @param <U>     The type of the result of the first function and the input to the second function.
-     * @param <V>     The type of the result of the second function and the input to the third function.
-     * @param <R>     The type of the result of the third function and this method.
-     * @param <E1>    The type of thrown exception or error by the first function.
-     * @param <E2>    The type of thrown exception or error by the second function.
-     * @param <E3>    The type of thrown exception or error by the second function.
-     * @param value1  The value to apply the first function, may be {@code null}.
-     * @param mapper1 The first function to apply, must not be {@code null}.
-     * @param mapper2 The second function to apply, must not be {@code null}.
-     * @param mapper3 The third function to apply, must not be {@code null}.
-     * @return The result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}.
-     * @throws E1 Thrown by the first function.
-     * @throws E2 Thrown by the second function.
-     * @throws E3 Thrown by the third function.
+     * @param <T>     the type of the input of this method and the first function
+     * @param <U>     the type of the result of the first function and the input to the second function
+     * @param <V>     the type of the result of the second function and the input to the third function
+     * @param <R>     the type of the result of the third function and this method
+     * @param <E1>    the type of thrown exception or error by the first function
+     * @param <E2>    the type of thrown exception or error by the second function
+     * @param <E3>    the type of thrown exception or error by the second function
+     * @param value1  the value to apply the first function, may be {@code null}
+     * @param mapper1 the first function to apply, must not be {@code null}
+     * @param mapper2 the second function to apply, must not be {@code null}
+     * @param mapper3 the third function to apply, must not be {@code null}
+     * @return the result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}
+     * @throws E1 thrown by the first function
+     * @throws E2 thrown by the second function
+     * @throws E3 thrown by the third function
      * @see #applyNonNull(Object, FailableFunction)
      * @see #applyNonNull(Object, FailableFunction, FailableFunction)
      * @since 3.19.0
@@ -400,10 +400,10 @@ public static <V, E extends Throwable> V call(final FailableCallable<V, E> calla
     /**
      * Invokes a supplier, and returns the result.
      *
-     * @param supplier The supplier to invoke.
-     * @param <T> The suppliers output type.
-     * @param <E> The type of checked exception, which the supplier can throw.
-     * @return The object, which has been created by the supplier
+     * @param supplier the supplier to invoke
+     * @param <T> the suppliers output type
+     * @param <E> the type of checked exception, which the supplier can throw
+     * @return the object, which has been created by the supplier
      */
     public static <T, E extends Throwable> T get(final FailableSupplier<T, E> supplier) {
         try {
@@ -416,9 +416,9 @@ public static <T, E extends Throwable> T get(final FailableSupplier<T, E> suppli
     /**
      * Invokes a boolean supplier, and returns the result.
      *
-     * @param supplier The boolean supplier to invoke.
-     * @param <E> The type of checked exception, which the supplier can throw.
-     * @return The boolean, which has been created by the supplier
+     * @param supplier the boolean supplier to invoke
+     * @param <E> the type of checked exception, which the supplier can throw
+     * @return the boolean, which has been created by the supplier
      */
     public static <E extends Throwable> boolean getAsBoolean(final FailableBooleanSupplier<E> supplier) {
         try {
@@ -431,9 +431,9 @@ public static <E extends Throwable> boolean getAsBoolean(final FailableBooleanSu
     /**
      * Invokes a double supplier, and returns the result.
      *
-     * @param supplier The double supplier to invoke.
-     * @param <E> The type of checked exception, which the supplier can throw.
-     * @return The double, which has been created by the supplier
+     * @param supplier the double supplier to invoke
+     * @param <E> the type of checked exception, which the supplier can throw
+     * @return the double, which has been created by the supplier
      */
     public static <E extends Throwable> double getAsDouble(final FailableDoubleSupplier<E> supplier) {
         try {
@@ -446,9 +446,9 @@ public static <E extends Throwable> double getAsDouble(final FailableDoubleSuppl
     /**
      * Invokes an int supplier, and returns the result.
      *
-     * @param supplier The int supplier to invoke.
-     * @param <E> The type of checked exception, which the supplier can throw.
-     * @return The int, which has been created by the supplier
+     * @param supplier the int supplier to invoke
+     * @param <E> the type of checked exception, which the supplier can throw
+     * @return the int, which has been created by the supplier
      */
     public static <E extends Throwable> int getAsInt(final FailableIntSupplier<E> supplier) {
         try {
@@ -461,9 +461,9 @@ public static <E extends Throwable> int getAsInt(final FailableIntSupplier<E> su
     /**
      * Invokes a long supplier, and returns the result.
      *
-     * @param supplier The long supplier to invoke.
-     * @param <E> The type of checked exception, which the supplier can throw.
-     * @return The long, which has been created by the supplier
+     * @param supplier the long supplier to invoke
+     * @param <E> the type of checked exception, which the supplier can throw
+     * @return the long, which has been created by the supplier
      */
     public static <E extends Throwable> long getAsLong(final FailableLongSupplier<E> supplier) {
         try {
@@ -476,9 +476,9 @@ public static <E extends Throwable> long getAsLong(final FailableLongSupplier<E>
     /**
      * Invokes a short supplier, and returns the result.
      *
-     * @param supplier The short supplier to invoke.
-     * @param <E> The type of checked exception, which the supplier can throw.
-     * @return The short, which has been created by the supplier
+     * @param supplier the short supplier to invoke
+     * @param <E> the type of checked exception, which the supplier can throw
+     * @return the short, which has been created by the supplier
      */
     public static <E extends Throwable> short getAsShort(final FailableShortSupplier<E> supplier) {
         try {
@@ -510,8 +510,8 @@ public static <E extends Throwable> short getAsShort(final FailableShortSupplier
      * follow the method call, like a {@code return} statement from a value returning method.
      * </p>
      *
-     * @param throwable The throwable to rethrow possibly wrapped into an unchecked exception
-     * @return Never returns anything, this method never terminates normally.
+     * @param throwable the throwable to rethrow possibly wrapped into an unchecked exception
+     * @return never returns anything, this method never terminates normally
      */
     public static RuntimeException rethrow(final Throwable throwable) {
         Objects.requireNonNull(throwable, "throwable");
@@ -525,8 +525,8 @@ public static RuntimeException rethrow(final Throwable throwable) {
     /**
      * Runs a runnable and rethrows any exception as a {@link RuntimeException}.
      *
-     * @param runnable The runnable to run, may be null for a noop.
-     * @param <E> the type of checked exception the runnable may throw.
+     * @param runnable the runnable to run, may be null for a noop
+     * @param <E> the type of checked exception the runnable may throw
      */
     public static <E extends Throwable> void run(final FailableRunnable<E> runnable) {
         if (runnable != null) {
@@ -556,9 +556,9 @@ private static <E extends Throwable> void run(final Object test, final FailableR
      * Functions.stream(collection.stream());
      * </pre>
      *
-     * @param collection The collection, which is being converted into a {@link FailableStream}.
-     * @param <E> The collections element type. (In turn, the result streams element type.)
-     * @return The created {@link FailableStream}.
+     * @param collection the collection, which is being converted into a {@link FailableStream}
+     * @param <E> the collections element type. (In turn, the result streams element type.)
+     * @return the created {@link FailableStream}
      */
     public static <E> FailableStream<E> stream(final Collection<E> collection) {
         return new FailableStream<>(collection.stream());
@@ -570,9 +570,9 @@ public static <E> FailableStream<E> stream(final Collection<E> collection) {
      * {@link FailableFunction}, and {@link FailableConsumer} may be applied, rather than {@link Predicate},
      * {@link Function}, {@link Consumer}, etc.
      *
-     * @param stream The stream, which is being converted into a {@link FailableStream}.
-     * @param <T> The streams element type.
-     * @return The created {@link FailableStream}.
+     * @param stream the stream, which is being converted into a {@link FailableStream}
+     * @param <T> the streams element type
+     * @return the created {@link FailableStream}
      */
     public static <T> FailableStream<T> stream(final Stream<T> stream) {
         return new FailableStream<>(stream);
@@ -619,10 +619,10 @@ public static <T, E extends Throwable> boolean test(final FailablePredicate<T, E
      * Functions.tryWithResources(useInputStream(fis), null, () -> fis.close());
      * }</pre>
      *
-     * @param action The action to execute. This object <em>will</em> always be invoked.
-     * @param errorHandler An optional error handler, which will be invoked finally, if any error occurred. The error
+     * @param action the action to execute. This object <em>will</em> always be invoked.
+     * @param errorHandler an optional error handler, which will be invoked finally, if any error occurred. The error
      *        handler will receive the first error, AKA {@link Throwable}.
-     * @param resources The resource actions to execute. <em>All</em> resource actions will be invoked, in the given
+     * @param resources the resource actions to execute. <em>All</em> resource actions will be invoked, in the given
      *        order. A resource action is an instance of {@link FailableRunnable}, which will be executed.
      * @see #tryWithResources(FailableRunnable, FailableRunnable...)
      */
@@ -675,8 +675,8 @@ public static void tryWithResources(final FailableRunnable<? extends Throwable>
      * Functions.tryWithResources(useInputStream(fis), () -> fis.close());
      * }</pre>
      *
-     * @param action The action to execute. This object <em>will</em> always be invoked.
-     * @param resources The resource actions to execute. <em>All</em> resource actions will be invoked, in the given
+     * @param action the action to execute. This object <em>will</em> always be invoked.
+     * @param resources the resource actions to execute. <em>All</em> resource actions will be invoked, in the given
      *        order. A resource action is an instance of {@link FailableRunnable}, which will be executed.
      * @see #tryWithResources(FailableRunnable, FailableConsumer, FailableRunnable...)
      */
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java
index a807b7fcbe0..aecd07d3121 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java
@@ -23,25 +23,25 @@
 /**
  * A functional interface like {@link BiConsumer} that declares a {@link Throwable}.
  *
- * @param <T> Consumed type 1.
- * @param <U> Consumed type 2.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> consumed type 1
+ * @param <U> consumed type 2
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableBiConsumer<T, U, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableBiConsumer NOP = (t, u) -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <T> Consumed type 1.
-     * @param <U> Consumed type 2.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> consumed type 1
+     * @param <U> consumed type 2
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, U, E extends Throwable> FailableBiConsumer<T, U, E> nop() {
@@ -53,16 +53,16 @@ static <T, U, E extends Throwable> FailableBiConsumer<T, U, E> nop() {
      *
      * @param t the first parameter for the consumable to accept
      * @param u the second parameter for the consumable to accept
-     * @throws E Thrown when the consumer fails.
+     * @throws E thrown when the consumer fails
      */
     void accept(T t, U u) throws E;
 
     /**
      * Returns a composed {@link FailableBiConsumer} like {@link BiConsumer#andThen(BiConsumer)}.
      *
-     * @param after the operation to perform after this one.
-     * @return a composed {@link FailableBiConsumer} like {@link BiConsumer#andThen(BiConsumer)}.
-     * @throws NullPointerException when {@code after} is null.
+     * @param after the operation to perform after this one
+     * @return a composed {@link FailableBiConsumer} like {@link BiConsumer#andThen(BiConsumer)}
+     * @throws NullPointerException when {@code after} is null
      */
     default FailableBiConsumer<T, U, E> andThen(final FailableBiConsumer<? super T, ? super U, E> after) {
         Objects.requireNonNull(after);
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java
index d0911b3aab3..8b97a40d453 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java
@@ -24,27 +24,27 @@
 /**
  * A functional interface like {@link BiFunction} that declares a {@link Throwable}.
  *
- * @param <T> Input type 1.
- * @param <U> Input type 2.
- * @param <R> Return type.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> input type 1
+ * @param <U> input type 2
+ * @param <R> return type
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableBiFunction<T, U, R, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableBiFunction NOP = (t, u) -> null;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <T> Consumed type 1.
-     * @param <U> Consumed type 2.
-     * @param <R> Return type.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> consumed type 1
+     * @param <U> consumed type 2
+     * @param <R> return type
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, U, R, E extends Throwable> FailableBiFunction<T, U, R, E> nop() {
@@ -54,10 +54,10 @@ static <T, U, R, E extends Throwable> FailableBiFunction<T, U, R, E> nop() {
     /**
      * Returns a composed {@link FailableBiFunction} that like {@link BiFunction#andThen(Function)}.
      *
-     * @param <V> the output type of the {@code after} function, and of the composed function.
-     * @param after the operation to perform after this one.
-     * @return a composed {@link FailableBiFunction} that like {@link BiFunction#andThen(Function)}.
-     * @throws NullPointerException when {@code after} is null.
+     * @param <V> the output type of the {@code after} function, and of the composed function
+     * @param after the operation to perform after this one
+     * @return a composed {@link FailableBiFunction} that like {@link BiFunction#andThen(Function)}
+     * @throws NullPointerException when {@code after} is null
      */
     default <V> FailableBiFunction<T, U, V, E> andThen(final FailableFunction<? super R, ? extends V, E> after) {
         Objects.requireNonNull(after);
@@ -70,7 +70,7 @@ default <V> FailableBiFunction<T, U, V, E> andThen(final FailableFunction<? supe
      * @param input1 the first input for the function
      * @param input2 the second input for the function
      * @return the result of the function
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     R apply(T input1, U input2) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
index 1c94facd255..98a58409d27 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
@@ -23,29 +23,29 @@
 /**
  * A functional interface like {@link BiPredicate} that declares a {@link Throwable}.
  *
- * @param <T> Predicate type 1.
- * @param <U> Predicate type 2.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> predicate type 1
+ * @param <U> predicate type 2
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableBiPredicate<T, U, E extends Throwable> {
 
-    /** FALSE singleton */
+    /** FALSE singleton. */
     @SuppressWarnings("rawtypes")
     FailableBiPredicate FALSE = (t, u) -> false;
 
-    /** TRUE singleton */
+    /** TRUE singleton. */
     @SuppressWarnings("rawtypes")
     FailableBiPredicate TRUE = (t, u) -> true;
 
     /**
      * Gets the FALSE singleton.
      *
-     * @param <T> Consumed type 1.
-     * @param <U> Consumed type 2.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> consumed type 1
+     * @param <U> consumed type 2
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, U, E extends Throwable> FailableBiPredicate<T, U, E> falsePredicate() {
@@ -55,10 +55,10 @@ static <T, U, E extends Throwable> FailableBiPredicate<T, U, E> falsePredicate()
     /**
      * Gets the TRUE singleton.
      *
-     * @param <T> Consumed type 1.
-     * @param <U> Consumed type 2.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> consumed type 1
+     * @param <U> consumed type 2
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, U, E extends Throwable> FailableBiPredicate<T, U, E> truePredicate() {
@@ -68,8 +68,8 @@ static <T, U, E extends Throwable> FailableBiPredicate<T, U, E> truePredicate()
     /**
      * Returns a composed {@link FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}.
      *
-     * @param other a predicate that will be logically-ANDed with this predicate.
-     * @return a composed {@link FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}.
+     * @param other a predicate that will be logically-ANDed with this predicate
+     * @return a composed {@link FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableBiPredicate<T, U, E> and(final FailableBiPredicate<? super T, ? super U, E> other) {
@@ -80,7 +80,7 @@ default FailableBiPredicate<T, U, E> and(final FailableBiPredicate<? super T, ?
     /**
      * Returns a predicate that negates this predicate.
      *
-     * @return a predicate that negates this predicate.
+     * @return a predicate that negates this predicate
      */
     default FailableBiPredicate<T, U, E> negate() {
         return (final T t, final U u) -> !test(t, u);
@@ -89,8 +89,8 @@ default FailableBiPredicate<T, U, E> negate() {
     /**
      * Returns a composed {@link FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}.
      *
-     * @param other a predicate that will be logically-ORed with this predicate.
-     * @return a composed {@link FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}.
+     * @param other a predicate that will be logically-ORed with this predicate
+     * @return a composed {@link FailableBiPredicate} like {@link BiPredicate#and(BiPredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableBiPredicate<T, U, E> or(final FailableBiPredicate<? super T, ? super U, E> other) {
@@ -104,7 +104,7 @@ default FailableBiPredicate<T, U, E> or(final FailableBiPredicate<? super T, ? s
      * @param object1 the first object to test the predicate on
      * @param object2 the second object to test the predicate on
      * @return the predicate's evaluation
-     * @throws E Thrown when this predicate fails.
+     * @throws E thrown when this predicate fails
      */
     boolean test(T object1, U object2) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableBooleanSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableBooleanSupplier.java
index 80d618df261..a6ddce4543d 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBooleanSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBooleanSupplier.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link BooleanSupplier} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java
index af435249ab2..851c12490f9 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java
@@ -23,21 +23,21 @@
 /**
  * A functional interface like {@link ByteConsumer} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableByteConsumer<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableByteConsumer NOP = t -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableByteConsumer<E> nop() {
@@ -48,15 +48,15 @@ static <E extends Throwable> FailableByteConsumer<E> nop() {
      * Accepts the given arguments.
      *
      * @param value the parameter for the consumable to accept
-     * @throws E Thrown when the consumer fails.
+     * @throws E thrown when the consumer fails
      */
     void accept(byte value) throws E;
 
     /**
      * Returns a composed {@link FailableByteConsumer} like {@link IntConsumer#andThen(IntConsumer)}.
      *
-     * @param after the operation to perform after this one.
-     * @return a composed {@link FailableByteConsumer} like {@link IntConsumer#andThen(IntConsumer)}.
+     * @param after the operation to perform after this one
+     * @return a composed {@link FailableByteConsumer} like {@link IntConsumer#andThen(IntConsumer)}
      * @throws NullPointerException if {@code after} is null
      */
     default FailableByteConsumer<E> andThen(final FailableByteConsumer<E> after) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableByteSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableByteSupplier.java
index 507548cc51a..c55a450bbd7 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableByteSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableByteSupplier.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link IntSupplier}, but for a byte, that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.19
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableCallable.java b/src/main/java/org/apache/commons/lang3/function/FailableCallable.java
index 70bbb54159b..0408dea2213 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableCallable.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableCallable.java
@@ -20,8 +20,8 @@
 /**
  * A functional interface like {@link java.util.concurrent.Callable} that declares a {@link Throwable}.
  *
- * @param <R> Return type.
- * @param <E> The kind of thrown exception or error.
+ * @param <R> return type
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
@@ -30,7 +30,7 @@ public interface FailableCallable<R, E extends Throwable> {
     /**
      * Calls the callable.
      *
-     * @return The value returned from the callable
+     * @return the value returned from the callable
      * @throws E if the callable fails
      */
     R call() throws E;
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java
index b664314283d..a5b46664071 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java
@@ -29,22 +29,22 @@
  * </p>
  *
  * @param <T> the type of the input to the operation
- * @param <E> Thrown exception type.
+ * @param <E> thrown exception type
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableConsumer<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableConsumer NOP = Function.identity()::apply;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <T> Consumed type 1.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> consumed type 1
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableConsumer<T, E> nop() {
@@ -55,7 +55,7 @@ static <T, E extends Throwable> FailableConsumer<T, E> nop() {
      * Accepts the given arguments.
      *
      * @param object the parameter for the consumable to accept
-     * @throws E Thrown when the consumer fails.
+     * @throws E thrown when the consumer fails
      */
     void accept(T object) throws E;
 
@@ -63,7 +63,7 @@ static <T, E extends Throwable> FailableConsumer<T, E> nop() {
      * Returns a composed {@link Consumer} like {@link Consumer#andThen(Consumer)}.
      *
      * @param after the operation to perform after this operation
-     * @return a composed {@link Consumer} like {@link Consumer#andThen(Consumer)}.
+     * @return a composed {@link Consumer} like {@link Consumer#andThen(Consumer)}
      * @throws NullPointerException when {@code after} is null
      */
     default FailableConsumer<T, E> andThen(final FailableConsumer<? super T, E> after) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoubleBinaryOperator.java b/src/main/java/org/apache/commons/lang3/function/FailableDoubleBinaryOperator.java
index 61d38054116..479a9d1dba7 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoubleBinaryOperator.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoubleBinaryOperator.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link DoubleBinaryOperator} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java
index 49182dd39cc..73b17f02b9a 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java
@@ -23,21 +23,21 @@
 /**
  * A functional interface like {@link DoubleConsumer} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableDoubleConsumer<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableDoubleConsumer NOP = t -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableDoubleConsumer<E> nop() {
@@ -48,16 +48,16 @@ static <E extends Throwable> FailableDoubleConsumer<E> nop() {
      * Accepts the given arguments.
      *
      * @param value the parameter for the consumable to accept
-     * @throws E Thrown when the consumer fails.
+     * @throws E thrown when the consumer fails
      */
     void accept(double value) throws E;
 
     /**
      * Returns a composed {@link FailableDoubleConsumer} like {@link DoubleConsumer#andThen(DoubleConsumer)}.
      *
-     * @param after the operation to perform after this one.
-     * @return a composed {@link FailableDoubleConsumer} like {@link DoubleConsumer#andThen(DoubleConsumer)}.
-     * @throws NullPointerException when {@code after} is null.
+     * @param after the operation to perform after this one
+     * @return a composed {@link FailableDoubleConsumer} like {@link DoubleConsumer#andThen(DoubleConsumer)}
+     * @throws NullPointerException when {@code after} is null
      */
     default FailableDoubleConsumer<E> andThen(final FailableDoubleConsumer<E> after) {
         Objects.requireNonNull(after);
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoubleFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableDoubleFunction.java
index a07435d8192..ef64a085e27 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoubleFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoubleFunction.java
@@ -22,23 +22,23 @@
 /**
  * A functional interface like {@link DoubleFunction} that declares a {@link Throwable}.
  *
- * @param <R> Return type.
- * @param <E> The kind of thrown exception or error.
+ * @param <R> return type
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableDoubleFunction<R, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableDoubleFunction NOP = t -> null;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <R> Return type.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <R> return type
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <R, E extends Throwable> FailableDoubleFunction<R, E> nop() {
@@ -50,7 +50,7 @@ static <R, E extends Throwable> FailableDoubleFunction<R, E> nop() {
      *
      * @param input the input for the function
      * @return the result of the function
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     R apply(double input) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
index a46f6f00f4b..d8ada74aef3 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
@@ -23,25 +23,25 @@
 /**
  * A functional interface like {@link DoublePredicate} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableDoublePredicate<E extends Throwable> {
 
-    /** FALSE singleton */
+    /** FALSE singleton. */
     @SuppressWarnings("rawtypes")
     FailableDoublePredicate FALSE = t -> false;
 
-    /** TRUE singleton */
+    /** TRUE singleton. */
     @SuppressWarnings("rawtypes")
     FailableDoublePredicate TRUE = t -> true;
 
     /**
      * Gets the FALSE singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
    @SuppressWarnings("unchecked")
    static <E extends Throwable> FailableDoublePredicate<E> falsePredicate() {
@@ -51,8 +51,8 @@ static <E extends Throwable> FailableDoublePredicate<E> falsePredicate() {
     /**
      * Gets the TRUE singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
    @SuppressWarnings("unchecked")
    static <E extends Throwable> FailableDoublePredicate<E> truePredicate() {
@@ -62,8 +62,8 @@ static <E extends Throwable> FailableDoublePredicate<E> truePredicate() {
     /**
      * Returns a composed {@link FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}.
      *
-     * @param other a predicate that will be logically-ANDed with this predicate.
-     * @return a composed {@link FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}.
+     * @param other a predicate that will be logically-ANDed with this predicate
+     * @return a composed {@link FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableDoublePredicate<E> and(final FailableDoublePredicate<E> other) {
@@ -74,7 +74,7 @@ default FailableDoublePredicate<E> and(final FailableDoublePredicate<E> other) {
     /**
      * Returns a predicate that negates this predicate.
      *
-     * @return a predicate that negates this predicate.
+     * @return a predicate that negates this predicate
      */
     default FailableDoublePredicate<E> negate() {
         return t -> !test(t);
@@ -83,8 +83,8 @@ default FailableDoublePredicate<E> negate() {
     /**
      * Returns a composed {@link FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}.
      *
-     * @param other a predicate that will be logically-ORed with this predicate.
-     * @return a composed {@link FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}.
+     * @param other a predicate that will be logically-ORed with this predicate
+     * @return a composed {@link FailableDoublePredicate} like {@link DoublePredicate#and(DoublePredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableDoublePredicate<E> or(final FailableDoublePredicate<E> other) {
@@ -95,9 +95,9 @@ default FailableDoublePredicate<E> or(final FailableDoublePredicate<E> other) {
     /**
      * Tests the predicate.
      *
-     * @param value the parameter for the predicate to accept.
-     * @return {@code true} if the input argument matches the predicate, {@code false} otherwise.
-     * @throws E Thrown when the consumer fails.
+     * @param value the parameter for the predicate to accept
+     * @return {@code true} if the input argument matches the predicate, {@code false} otherwise
+     * @throws E thrown when the consumer fails
      */
     boolean test(double value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoubleSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableDoubleSupplier.java
index ae77f16b932..47418179f06 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoubleSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoubleSupplier.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link DoubleSupplier} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoubleToIntFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableDoubleToIntFunction.java
index 8da6b55836f..24962cb39a6 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoubleToIntFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoubleToIntFunction.java
@@ -22,21 +22,21 @@
 /**
  * A functional interface like {@link DoubleToIntFunction} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableDoubleToIntFunction<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableDoubleToIntFunction NOP = t -> 0;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableDoubleToIntFunction<E> nop() {
@@ -48,7 +48,7 @@ static <E extends Throwable> FailableDoubleToIntFunction<E> nop() {
      *
      * @param value the function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     int applyAsInt(double value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoubleToLongFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableDoubleToLongFunction.java
index 35d58c0d02f..610b4a9d382 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoubleToLongFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoubleToLongFunction.java
@@ -22,21 +22,21 @@
 /**
  * A functional interface like {@link DoubleToLongFunction} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableDoubleToLongFunction<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableDoubleToLongFunction NOP = t -> 0;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableDoubleToLongFunction<E> nop() {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java b/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java
index b0da6ee3c0a..1961a29cfa1 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java
@@ -23,19 +23,19 @@
 /**
  * A functional interface like {@link DoubleUnaryOperator} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 public interface FailableDoubleUnaryOperator<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableDoubleUnaryOperator NOP = t -> 0d;
 
     /**
      * Returns a unary operator that always returns its input argument.
      *
-     * @param <E> The kind of thrown exception or error.
+     * @param <E> the kind of thrown exception or error
      * @return a unary operator that always returns its input argument
      */
     static <E extends Throwable> FailableDoubleUnaryOperator<E> identity() {
@@ -45,8 +45,8 @@ static <E extends Throwable> FailableDoubleUnaryOperator<E> identity() {
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableDoubleUnaryOperator<E> nop() {
@@ -57,10 +57,10 @@ static <E extends Throwable> FailableDoubleUnaryOperator<E> nop() {
      * Returns a composed {@link FailableDoubleUnaryOperator} like
      * {@link DoubleUnaryOperator#andThen(DoubleUnaryOperator)}.
      *
-     * @param after the operator to apply after this one.
+     * @param after the operator to apply after this one
      * @return a composed {@link FailableDoubleUnaryOperator} like
-     *         {@link DoubleUnaryOperator#andThen(DoubleUnaryOperator)}.
-     * @throws NullPointerException if after is null.
+     *         {@link DoubleUnaryOperator#andThen(DoubleUnaryOperator)}
+     * @throws NullPointerException if after is null
      * @see #compose(FailableDoubleUnaryOperator)
      */
     default FailableDoubleUnaryOperator<E> andThen(final FailableDoubleUnaryOperator<E> after) {
@@ -73,7 +73,7 @@ default FailableDoubleUnaryOperator<E> andThen(final FailableDoubleUnaryOperator
      *
      * @param operand the operand
      * @return the operator result
-     * @throws E Thrown when a consumer fails.
+     * @throws E thrown when a consumer fails
      */
     double applyAsDouble(double operand) throws E;
 
@@ -81,10 +81,10 @@ default FailableDoubleUnaryOperator<E> andThen(final FailableDoubleUnaryOperator
      * Returns a composed {@link FailableDoubleUnaryOperator} like
      * {@link DoubleUnaryOperator#compose(DoubleUnaryOperator)}.
      *
-     * @param before the operator to apply before this one.
+     * @param before the operator to apply before this one
      * @return a composed {@link FailableDoubleUnaryOperator} like
-     *         {@link DoubleUnaryOperator#compose(DoubleUnaryOperator)}.
-     * @throws NullPointerException if before is null.
+     *         {@link DoubleUnaryOperator#compose(DoubleUnaryOperator)}
+     * @throws NullPointerException if before is null
      * @see #andThen(FailableDoubleUnaryOperator)
      */
     default FailableDoubleUnaryOperator<E> compose(final FailableDoubleUnaryOperator<E> before) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableFunction.java
index dfb101e2347..e4a4876f211 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableFunction.java
@@ -23,25 +23,25 @@
 /**
  * A functional interface like {@link Function} that declares a {@link Throwable}.
  *
- * @param <T> Input type 1.
- * @param <R> Return type.
- * @param <E> The type of thrown exception or error.
+ * @param <T> input type 1
+ * @param <R> return type
+ * @param <E> the type of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableFunction<T, R, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableFunction NOP = t -> null;
 
     /**
      * Starts a fluent chain like {@code function(foo::bar).andThen(...).andThen(...).apply(...);}
      *
-     * @param <T> Input type.
-     * @param <R> Return type.
-     * @param <E> The type of thrown exception or error.
-     * @param function   the argument to return.
+     * @param <T> input type
+     * @param <R> return type
+     * @param <E> the type of thrown exception or error
+     * @param function   the argument to return
      * @return the argument
      * @since 3.14.0
      */
@@ -53,7 +53,7 @@ static <T, R, E extends Throwable> FailableFunction<T, R, E> function(final Fail
      * Returns a function that always returns its input argument.
      *
      * @param <T> the type of the input and output objects to the function
-     * @param <E> The type of thrown exception or error.
+     * @param <E> the type of thrown exception or error
      * @return a function that always returns its input argument
      */
     static <T, E extends Throwable> FailableFunction<T, T, E> identity() {
@@ -63,10 +63,10 @@ static <T, E extends Throwable> FailableFunction<T, T, E> identity() {
     /**
      * Gets the NOP singleton.
      *
-     * @param <T> Consumed type.
-     * @param <R> Return type.
-     * @param <E> The type of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> consumed type
+     * @param <R> return type
+     * @param <E> the type of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, R, E extends Throwable> FailableFunction<T, R, E> nop() {
@@ -76,10 +76,10 @@ static <T, R, E extends Throwable> FailableFunction<T, R, E> nop() {
     /**
      * Returns a composed {@link FailableFunction} like {@link Function#andThen(Function)}.
      *
-     * @param <V> the output type of the {@code after} function, and of the composed function.
-     * @return a composed {@link FailableFunction} like {@link Function#andThen(Function)}.
-     * @param after the operation to perform after this one.
-     * @throws NullPointerException when {@code after} is null.
+     * @param <V> the output type of the {@code after} function, and of the composed function
+     * @param after the operation to perform after this one
+     * @return a composed {@link FailableFunction} like {@link Function#andThen(Function)}
+     * @throws NullPointerException when {@code after} is null
      */
     default <V> FailableFunction<T, V, E> andThen(final FailableFunction<? super R, ? extends V, E> after) {
         Objects.requireNonNull(after);
@@ -91,17 +91,17 @@ default <V> FailableFunction<T, V, E> andThen(final FailableFunction<? super R,
      *
      * @param input the input for the function
      * @return the result of the function
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     R apply(T input) throws E;
 
     /**
      * Returns a composed {@link FailableFunction} like {@link Function#compose(Function)}.
      *
-     * @param <V> the input type to the {@code before} function, and to the composed function.
-     * @param before the operator to apply before this one.
-     * @return a composed {@link FailableFunction} like {@link Function#compose(Function)}.
-     * @throws NullPointerException if before is null.
+     * @param <V> the input type to the {@code before} function, and to the composed function
+     * @param before the operator to apply before this one
+     * @return a composed {@link FailableFunction} like {@link Function#compose(Function)}
+     * @throws NullPointerException if before is null
      * @see #andThen(FailableFunction)
      */
     default <V> FailableFunction<V, R, E> compose(final FailableFunction<? super V, ? extends T, E> before) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntBinaryOperator.java b/src/main/java/org/apache/commons/lang3/function/FailableIntBinaryOperator.java
index f24e4018de1..5d961eacd02 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntBinaryOperator.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntBinaryOperator.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link IntBinaryOperator} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java
index f7fb36513ee..2fd4f70c841 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java
@@ -23,21 +23,21 @@
 /**
  * A functional interface like {@link IntConsumer} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableIntConsumer<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntConsumer NOP = t -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableIntConsumer<E> nop() {
@@ -48,15 +48,15 @@ static <E extends Throwable> FailableIntConsumer<E> nop() {
      * Accepts the given arguments.
      *
      * @param value the parameter for the consumable to accept
-     * @throws E Thrown when the consumer fails.
+     * @throws E thrown when the consumer fails
      */
     void accept(int value) throws E;
 
     /**
      * Returns a composed {@link FailableIntConsumer} like {@link IntConsumer#andThen(IntConsumer)}.
      *
-     * @param after the operation to perform after this one.
-     * @return a composed {@link FailableIntConsumer} like {@link IntConsumer#andThen(IntConsumer)}.
+     * @param after the operation to perform after this one
+     * @return a composed {@link FailableIntConsumer} like {@link IntConsumer#andThen(IntConsumer)}
      * @throws NullPointerException if {@code after} is null
      */
     default FailableIntConsumer<E> andThen(final FailableIntConsumer<E> after) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableIntFunction.java
index 0cf1c3107c8..77ce041bb1b 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntFunction.java
@@ -22,23 +22,23 @@
 /**
  * A functional interface like {@link IntFunction} that declares a {@link Throwable}.
  *
- * @param <R> Return type.
- * @param <E> The kind of thrown exception or error.
+ * @param <R> return type
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableIntFunction<R, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntFunction NOP = t -> null;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <R> Return type.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <R> return type
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <R, E extends Throwable> FailableIntFunction<R, E> nop() {
@@ -50,7 +50,7 @@ static <R, E extends Throwable> FailableIntFunction<R, E> nop() {
      *
      * @param input the input for the function
      * @return the result of the function
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     R apply(int input) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
index 3e035ab9f52..aab08eb3ec3 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
@@ -23,25 +23,25 @@
 /**
  * A functional interface like {@link IntPredicate} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableIntPredicate<E extends Throwable> {
 
-    /** FALSE singleton */
+    /** FALSE singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntPredicate FALSE = t -> false;
 
-    /** TRUE singleton */
+    /** TRUE singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntPredicate TRUE = t -> true;
 
     /**
      * Gets the FALSE singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableIntPredicate<E> falsePredicate() {
@@ -51,8 +51,8 @@ static <E extends Throwable> FailableIntPredicate<E> falsePredicate() {
     /**
      * Gets the TRUE singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableIntPredicate<E> truePredicate() {
@@ -62,8 +62,8 @@ static <E extends Throwable> FailableIntPredicate<E> truePredicate() {
     /**
      * Returns a composed {@link FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}.
      *
-     * @param other a predicate that will be logically-ANDed with this predicate.
-     * @return a composed {@link FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}.
+     * @param other a predicate that will be logically-ANDed with this predicate
+     * @return a composed {@link FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableIntPredicate<E> and(final FailableIntPredicate<E> other) {
@@ -74,7 +74,7 @@ default FailableIntPredicate<E> and(final FailableIntPredicate<E> other) {
     /**
      * Returns a predicate that negates this predicate.
      *
-     * @return a predicate that negates this predicate.
+     * @return a predicate that negates this predicate
      */
     default FailableIntPredicate<E> negate() {
         return t -> !test(t);
@@ -83,8 +83,8 @@ default FailableIntPredicate<E> negate() {
     /**
      * Returns a composed {@link FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}.
      *
-     * @param other a predicate that will be logically-ORed with this predicate.
-     * @return a composed {@link FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}.
+     * @param other a predicate that will be logically-ORed with this predicate
+     * @return a composed {@link FailableIntPredicate} like {@link IntPredicate#and(IntPredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableIntPredicate<E> or(final FailableIntPredicate<E> other) {
@@ -95,9 +95,9 @@ default FailableIntPredicate<E> or(final FailableIntPredicate<E> other) {
     /**
      * Tests the predicate.
      *
-     * @param value the parameter for the predicate to accept.
-     * @return {@code true} if the input argument matches the predicate, {@code false} otherwise.
-     * @throws E Thrown when the consumer fails.
+     * @param value the parameter for the predicate to accept
+     * @return {@code true} if the input argument matches the predicate, {@code false} otherwise
+     * @throws E thrown when the consumer fails
      */
     boolean test(int value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableIntSupplier.java
index 4065a093fcf..3118bb41261 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntSupplier.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link IntSupplier} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntToDoubleFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableIntToDoubleFunction.java
index 179697f8a34..33e899ec9ed 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntToDoubleFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntToDoubleFunction.java
@@ -22,21 +22,21 @@
 /**
  * A functional interface like {@link IntToDoubleFunction} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableIntToDoubleFunction<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntToDoubleFunction NOP = t -> 0d;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableIntToDoubleFunction<E> nop() {
@@ -48,7 +48,7 @@ static <E extends Throwable> FailableIntToDoubleFunction<E> nop() {
      *
      * @param value the function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     double applyAsDouble(int value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntToFloatFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableIntToFloatFunction.java
index 0115556fd51..2712752bb37 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntToFloatFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntToFloatFunction.java
@@ -22,21 +22,21 @@
 /**
  * A functional interface like {@link IntToDoubleFunction} but for {@code float} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.18.0
  */
 @FunctionalInterface
 public interface FailableIntToFloatFunction<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntToFloatFunction NOP = t -> 0f;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableIntToFloatFunction<E> nop() {
@@ -48,7 +48,7 @@ static <E extends Throwable> FailableIntToFloatFunction<E> nop() {
      *
      * @param value the function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     float applyAsFloat(int value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntToLongFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableIntToLongFunction.java
index 4b9912e08d1..d3b03028e3c 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntToLongFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntToLongFunction.java
@@ -22,21 +22,21 @@
 /**
  * A functional interface like {@link IntToLongFunction} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableIntToLongFunction<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntToLongFunction NOP = t -> 0L;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableIntToLongFunction<E> nop() {
@@ -48,7 +48,7 @@ static <E extends Throwable> FailableIntToLongFunction<E> nop() {
      *
      * @param value the function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     long applyAsLong(int value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java b/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java
index 21d6b2dcd02..24001117338 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java
@@ -23,19 +23,19 @@
 /**
  * A functional interface like {@link IntUnaryOperator} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 public interface FailableIntUnaryOperator<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableIntUnaryOperator NOP = t -> 0;
 
     /**
      * Returns a unary operator that always returns its input argument.
      *
-     * @param <E> The kind of thrown exception or error.
+     * @param <E> the kind of thrown exception or error
      * @return a unary operator that always returns its input argument
      */
     static <E extends Throwable> FailableIntUnaryOperator<E> identity() {
@@ -45,8 +45,8 @@ static <E extends Throwable> FailableIntUnaryOperator<E> identity() {
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableIntUnaryOperator<E> nop() {
@@ -56,9 +56,9 @@ static <E extends Throwable> FailableIntUnaryOperator<E> nop() {
     /**
      * Returns a composed {@link FailableDoubleUnaryOperator} like {@link IntUnaryOperator#andThen(IntUnaryOperator)}.
      *
-     * @param after the operator to apply after this one.
-     * @return a composed {@link FailableIntUnaryOperator} like {@link IntUnaryOperator#andThen(IntUnaryOperator)}.
-     * @throws NullPointerException if after is null.
+     * @param after the operator to apply after this one
+     * @return a composed {@link FailableIntUnaryOperator} like {@link IntUnaryOperator#andThen(IntUnaryOperator)}
+     * @throws NullPointerException if after is null
      * @see #compose(FailableIntUnaryOperator)
      */
     default FailableIntUnaryOperator<E> andThen(final FailableIntUnaryOperator<E> after) {
@@ -71,16 +71,16 @@ default FailableIntUnaryOperator<E> andThen(final FailableIntUnaryOperator<E> af
      *
      * @param operand the operand
      * @return the operator result
-     * @throws E Thrown when a consumer fails.
+     * @throws E thrown when a consumer fails
      */
     int applyAsInt(int operand) throws E;
 
     /**
      * Returns a composed {@link FailableIntUnaryOperator} like {@link IntUnaryOperator#compose(IntUnaryOperator)}.
      *
-     * @param before the operator to apply before this one.
-     * @return a composed {@link FailableIntUnaryOperator} like {@link IntUnaryOperator#compose(IntUnaryOperator)}.
-     * @throws NullPointerException if before is null.
+     * @param before the operator to apply before this one
+     * @return a composed {@link FailableIntUnaryOperator} like {@link IntUnaryOperator#compose(IntUnaryOperator)}
+     * @throws NullPointerException if before is null
      * @see #andThen(FailableIntUnaryOperator)
      */
     default FailableIntUnaryOperator<E> compose(final FailableIntUnaryOperator<E> before) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongBinaryOperator.java b/src/main/java/org/apache/commons/lang3/function/FailableLongBinaryOperator.java
index d0688f8f51e..253a7cb792c 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongBinaryOperator.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongBinaryOperator.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link LongBinaryOperator} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java
index e8efddbd3d9..8cca9969a81 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java
@@ -23,21 +23,21 @@
 /**
  * A functional interface like {@link LongConsumer} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableLongConsumer<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableLongConsumer NOP = t -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableLongConsumer<E> nop() {
@@ -48,15 +48,15 @@ static <E extends Throwable> FailableLongConsumer<E> nop() {
      * Accepts the given arguments.
      *
      * @param object the parameter for the consumable to accept
-     * @throws E Thrown when the consumer fails.
+     * @throws E thrown when the consumer fails
      */
     void accept(long object) throws E;
 
     /**
      * Returns a composed {@link FailableLongConsumer} like {@link LongConsumer#andThen(LongConsumer)}.
      *
-     * @param after the operation to perform after this one.
-     * @return a composed {@link FailableLongConsumer} like {@link LongConsumer#andThen(LongConsumer)}.
+     * @param after the operation to perform after this one
+     * @return a composed {@link FailableLongConsumer} like {@link LongConsumer#andThen(LongConsumer)}
      * @throws NullPointerException if {@code after} is null
      */
     default FailableLongConsumer<E> andThen(final FailableLongConsumer<E> after) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableLongFunction.java
index 6752841b4b0..9a894f271d7 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongFunction.java
@@ -22,23 +22,23 @@
 /**
  * A functional interface like {@link LongFunction} that declares a {@link Throwable}.
  *
- * @param <R> Return type.
- * @param <E> The kind of thrown exception or error.
+ * @param <R> return type
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableLongFunction<R, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableLongFunction NOP = t -> null;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <R> Return type.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <R> return type
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
    @SuppressWarnings("unchecked")
    static <R, E extends Throwable> FailableLongFunction<R, E> nop() {
@@ -50,7 +50,7 @@ static <R, E extends Throwable> FailableLongFunction<R, E> nop() {
      *
      * @param input the input for the function
      * @return the result of the function
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     R apply(long input) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java b/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
index 4b9a69cdfe0..a046c2b848b 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
@@ -23,25 +23,25 @@
 /**
  * A functional interface like {@link LongPredicate} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableLongPredicate<E extends Throwable> {
 
-    /** FALSE singleton */
+    /** FALSE singleton. */
     @SuppressWarnings("rawtypes")
     FailableLongPredicate FALSE = t -> false;
 
-    /** TRUE singleton */
+    /** TRUE singleton. */
     @SuppressWarnings("rawtypes")
     FailableLongPredicate TRUE = t -> true;
 
     /**
      * Gets the FALSE singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
    @SuppressWarnings("unchecked")
    static <E extends Throwable> FailableLongPredicate<E> falsePredicate() {
@@ -51,8 +51,8 @@ static <E extends Throwable> FailableLongPredicate<E> falsePredicate() {
     /**
      * Gets the TRUE singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableLongPredicate<E> truePredicate() {
@@ -62,8 +62,8 @@ static <E extends Throwable> FailableLongPredicate<E> truePredicate() {
     /**
      * Returns a composed {@link FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}.
      *
-     * @param other a predicate that will be logically-ANDed with this predicate.
-     * @return a composed {@link FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}.
+     * @param other a predicate that will be logically-ANDed with this predicate
+     * @return a composed {@link FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableLongPredicate<E> and(final FailableLongPredicate<E> other) {
@@ -74,7 +74,7 @@ default FailableLongPredicate<E> and(final FailableLongPredicate<E> other) {
     /**
      * Returns a predicate that negates this predicate.
      *
-     * @return a predicate that negates this predicate.
+     * @return a predicate that negates this predicate
      */
     default FailableLongPredicate<E> negate() {
         return t -> !test(t);
@@ -83,8 +83,8 @@ default FailableLongPredicate<E> negate() {
     /**
      * Returns a composed {@link FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}.
      *
-     * @param other a predicate that will be logically-ORed with this predicate.
-     * @return a composed {@link FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}.
+     * @param other a predicate that will be logically-ORed with this predicate
+     * @return a composed {@link FailableLongPredicate} like {@link LongPredicate#and(LongPredicate)}
      * @throws NullPointerException if other is null
      */
     default FailableLongPredicate<E> or(final FailableLongPredicate<E> other) {
@@ -95,9 +95,9 @@ default FailableLongPredicate<E> or(final FailableLongPredicate<E> other) {
     /**
      * Tests the predicate.
      *
-     * @param value the parameter for the predicate to accept.
-     * @return {@code true} if the input argument matches the predicate, {@code false} otherwise.
-     * @throws E Thrown when the consumer fails.
+     * @param value the parameter for the predicate to accept
+     * @return {@code true} if the input argument matches the predicate, {@code false} otherwise
+     * @throws E thrown when the consumer fails
      */
     boolean test(long value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableLongSupplier.java
index 73006cb5b08..0beea312d96 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongSupplier.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link LongSupplier} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongToDoubleFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableLongToDoubleFunction.java
index 67bb96d37e2..81c8b7e390e 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongToDoubleFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongToDoubleFunction.java
@@ -22,21 +22,21 @@
 /**
  * A functional interface like {@link LongToDoubleFunction} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableLongToDoubleFunction<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableLongToDoubleFunction NOP = t -> 0d;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableLongToDoubleFunction<E> nop() {
@@ -48,7 +48,7 @@ static <E extends Throwable> FailableLongToDoubleFunction<E> nop() {
      *
      * @param value the function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     double applyAsDouble(long value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongToIntFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableLongToIntFunction.java
index f5904ad1501..480b442be9f 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongToIntFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongToIntFunction.java
@@ -22,21 +22,21 @@
 /**
  * A functional interface like {@link LongToIntFunction} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableLongToIntFunction<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableLongToIntFunction NOP = t -> 0;
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableLongToIntFunction<E> nop() {
@@ -48,7 +48,7 @@ static <E extends Throwable> FailableLongToIntFunction<E> nop() {
      *
      * @param value the function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     int applyAsInt(long value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java b/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java
index f56391e8987..7545f037a5f 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java
@@ -23,19 +23,19 @@
 /**
  * A functional interface like {@link LongUnaryOperator} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 public interface FailableLongUnaryOperator<E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableLongUnaryOperator NOP = t -> 0L;
 
     /**
      * Returns a unary operator that always returns its input argument.
      *
-     * @param <E> The kind of thrown exception or error.
+     * @param <E> the kind of thrown exception or error
      * @return a unary operator that always returns its input argument
      */
     static <E extends Throwable> FailableLongUnaryOperator<E> identity() {
@@ -45,8 +45,8 @@ static <E extends Throwable> FailableLongUnaryOperator<E> identity() {
     /**
      * Gets the NOP singleton.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <E extends Throwable> FailableLongUnaryOperator<E> nop() {
@@ -56,9 +56,9 @@ static <E extends Throwable> FailableLongUnaryOperator<E> nop() {
     /**
      * Returns a composed {@link FailableDoubleUnaryOperator} like {@link LongUnaryOperator#andThen(LongUnaryOperator)}.
      *
-     * @param after the operator to apply after this one.
-     * @return a composed {@link FailableLongUnaryOperator} like {@link LongUnaryOperator#andThen(LongUnaryOperator)}.
-     * @throws NullPointerException if after is null.
+     * @param after the operator to apply after this one
+     * @return a composed {@link FailableLongUnaryOperator} like {@link LongUnaryOperator#andThen(LongUnaryOperator)}
+     * @throws NullPointerException if after is null
      * @see #compose(FailableLongUnaryOperator)
      */
     default FailableLongUnaryOperator<E> andThen(final FailableLongUnaryOperator<E> after) {
@@ -71,16 +71,16 @@ default FailableLongUnaryOperator<E> andThen(final FailableLongUnaryOperator<E>
      *
      * @param operand the operand
      * @return the operator result
-     * @throws E Thrown when a consumer fails.
+     * @throws E thrown when a consumer fails
      */
     long applyAsLong(long operand) throws E;
 
     /**
      * Returns a composed {@link FailableLongUnaryOperator} like {@link LongUnaryOperator#compose(LongUnaryOperator)}.
      *
-     * @param before the operator to apply before this one.
-     * @return a composed {@link FailableLongUnaryOperator} like {@link LongUnaryOperator#compose(LongUnaryOperator)}.
-     * @throws NullPointerException if before is null.
+     * @param before the operator to apply before this one
+     * @return a composed {@link FailableLongUnaryOperator} like {@link LongUnaryOperator#compose(LongUnaryOperator)}
+     * @throws NullPointerException if before is null
      * @see #andThen(FailableLongUnaryOperator)
      */
     default FailableLongUnaryOperator<E> compose(final FailableLongUnaryOperator<E> before) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableObjDoubleConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableObjDoubleConsumer.java
index e22ccc4716a..6b7589f7e1e 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableObjDoubleConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableObjDoubleConsumer.java
@@ -22,23 +22,23 @@
 /**
  * A functional interface like {@link ObjDoubleConsumer} that declares a {@link Throwable}.
  *
- * @param <T> the type of the object argument to the operation.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> the type of the object argument to the operation
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableObjDoubleConsumer<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableObjDoubleConsumer NOP = (t, u) -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <T> the type of the object argument to the operation.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> the type of the object argument to the operation
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableObjDoubleConsumer<T, E> nop() {
@@ -48,9 +48,9 @@ static <T, E extends Throwable> FailableObjDoubleConsumer<T, E> nop() {
     /**
      * Accepts the given arguments.
      *
-     * @param object the object parameter for the consumable to accept.
-     * @param value the double parameter for the consumable to accept.
-     * @throws E Thrown when the consumer fails.
+     * @param object the object parameter for the consumable to accept
+     * @param value the double parameter for the consumable to accept
+     * @throws E thrown when the consumer fails
      */
     void accept(T object, double value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableObjIntConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableObjIntConsumer.java
index 5ecd3e70342..e1280363294 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableObjIntConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableObjIntConsumer.java
@@ -22,23 +22,23 @@
 /**
  * A functional interface like {@link ObjIntConsumer} that declares a {@link Throwable}.
  *
- * @param <T> the type of the object argument to the operation.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> the type of the object argument to the operation
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableObjIntConsumer<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableObjIntConsumer NOP = (t, u) -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <T> the type of the object argument to the operation.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> the type of the object argument to the operation
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableObjIntConsumer<T, E> nop() {
@@ -48,9 +48,9 @@ static <T, E extends Throwable> FailableObjIntConsumer<T, E> nop() {
     /**
      * Accepts the given arguments.
      *
-     * @param object the object parameter for the consumable to accept.
-     * @param value the int parameter for the consumable to accept.
-     * @throws E Thrown when the consumer fails.
+     * @param object the object parameter for the consumable to accept
+     * @param value the int parameter for the consumable to accept
+     * @throws E thrown when the consumer fails
      */
     void accept(T object, int value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableObjLongConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableObjLongConsumer.java
index bc635ee3d18..824fbfb1d28 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableObjLongConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableObjLongConsumer.java
@@ -22,23 +22,23 @@
 /**
  * A functional interface like {@link ObjLongConsumer} that declares a {@link Throwable}.
  *
- * @param <T> the type of the object argument to the operation.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> the type of the object argument to the operation
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableObjLongConsumer<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableObjLongConsumer NOP = (t, u) -> { /* NOP */ };
 
     /**
      * Gets the NOP singleton.
      *
-     * @param <T> the type of the object argument to the operation.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> the type of the object argument to the operation
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableObjLongConsumer<T, E> nop() {
@@ -48,9 +48,9 @@ static <T, E extends Throwable> FailableObjLongConsumer<T, E> nop() {
     /**
      * Accepts the given arguments.
      *
-     * @param object the object parameter for the consumable to accept.
-     * @param value the long parameter for the consumable to accept.
-     * @throws E Thrown when the consumer fails.
+     * @param object the object parameter for the consumable to accept
+     * @param value the long parameter for the consumable to accept
+     * @throws E thrown when the consumer fails
      */
     void accept(T object, long value) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java b/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
index 565ff6e967f..d2181334cb3 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
@@ -23,27 +23,27 @@
 /**
  * A functional interface like {@link Predicate} that declares a {@link Throwable}.
  *
- * @param <T> Predicate type.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> predicate type
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailablePredicate<T, E extends Throwable> {
 
-    /** FALSE singleton */
+    /** FALSE singleton. */
     @SuppressWarnings("rawtypes")
     FailablePredicate FALSE = t -> false;
 
-    /** TRUE singleton */
+    /** TRUE singleton. */
     @SuppressWarnings("rawtypes")
     FailablePredicate TRUE = t -> true;
 
     /**
      * Gets the FALSE singleton.
      *
-     * @param <T> Predicate type.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> predicate type
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailablePredicate<T, E> falsePredicate() {
@@ -53,9 +53,9 @@ static <T, E extends Throwable> FailablePredicate<T, E> falsePredicate() {
     /**
      * Gets the TRUE singleton.
      *
-     * @param <T> Predicate type.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <T> predicate type
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailablePredicate<T, E> truePredicate() {
@@ -65,8 +65,8 @@ static <T, E extends Throwable> FailablePredicate<T, E> truePredicate() {
     /**
      * Returns a composed {@link FailablePredicate} like {@link Predicate#and(Predicate)}.
      *
-     * @param other a predicate that will be logically-ANDed with this predicate.
-     * @return a composed {@link FailablePredicate} like {@link Predicate#and(Predicate)}.
+     * @param other a predicate that will be logically-ANDed with this predicate
+     * @return a composed {@link FailablePredicate} like {@link Predicate#and(Predicate)}
      * @throws NullPointerException if other is null
      */
     default FailablePredicate<T, E> and(final FailablePredicate<? super T, E> other) {
@@ -77,7 +77,7 @@ default FailablePredicate<T, E> and(final FailablePredicate<? super T, E> other)
     /**
      * Returns a predicate that negates this predicate.
      *
-     * @return a predicate that negates this predicate.
+     * @return a predicate that negates this predicate
      */
     default FailablePredicate<T, E> negate() {
         return t -> !test(t);
@@ -86,8 +86,8 @@ default FailablePredicate<T, E> negate() {
     /**
      * Returns a composed {@link FailablePredicate} like {@link Predicate#and(Predicate)}.
      *
-     * @param other a predicate that will be logically-ORed with this predicate.
-     * @return a composed {@link FailablePredicate} like {@link Predicate#and(Predicate)}.
+     * @param other a predicate that will be logically-ORed with this predicate
+     * @return a composed {@link FailablePredicate} like {@link Predicate#and(Predicate)}
      * @throws NullPointerException if other is null
      */
     default FailablePredicate<T, E> or(final FailablePredicate<? super T, E> other) {
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableRunnable.java b/src/main/java/org/apache/commons/lang3/function/FailableRunnable.java
index d2068d26ebd..d08c2dcb660 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableRunnable.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableRunnable.java
@@ -20,7 +20,7 @@
 /**
  * A functional interface like {@link Runnable} that declares a kind of {@link Throwable}.
  *
- * @param <E> The kind of {@link Throwable}.
+ * @param <E> the kind of {@link Throwable}
  * @since 3.11
  */
 @FunctionalInterface
@@ -29,7 +29,7 @@ public interface FailableRunnable<E extends Throwable> {
     /**
      * Runs the function.
      *
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     void run() throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java
index 0f3f3b4e6d7..fc335a9b852 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java
@@ -22,7 +22,7 @@
 /**
  * A functional interface like {@link IntSupplier} but for {@code short} that declares a {@link Throwable}.
  *
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.12.0
  */
 @FunctionalInterface
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableSupplier.java
index 8531880e2ca..b2d172bd43b 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableSupplier.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableSupplier.java
@@ -22,8 +22,8 @@
 /**
  * A functional interface like {@link Supplier} that declares a {@link Throwable}.
  *
- * @param <T> The type of results supplied by this supplier.
- * @param <E> The kind of thrown exception or error.
+ * @param <T> the type of results supplied by this supplier
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
@@ -46,9 +46,9 @@ public interface FailableSupplier<T, E extends Throwable> {
      * This supplier never throws an exception.
      * </p>
      *
-     * @param <T> Supplied type.
-     * @param <E> The kind of thrown exception or error.
-     * @return The NUL singleton.
+     * @param <T> supplied type
+     * @param <E> the kind of thrown exception or error
+     * @return the NUL singleton
      * @since 3.14.0
      */
     @SuppressWarnings("unchecked")
@@ -57,7 +57,7 @@ static <T, E extends Exception> FailableSupplier<T, E> nul() {
     }
 
     /**
-     * Supplies an object
+     * Supplies an object.
      *
      * @return a result
      * @throws E if the supplier fails
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableToBooleanFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableToBooleanFunction.java
index f5d53828c71..23f86426769 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableToBooleanFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableToBooleanFunction.java
@@ -21,13 +21,13 @@
  * A functional interface like a {@code ToBooleanFunction} that declares a {@link Throwable}.
  *
  * @param <T> the type of the argument to the function
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.18
  */
 @FunctionalInterface
 public interface FailableToBooleanFunction<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableToBooleanFunction NOP = t -> false;
 
@@ -35,8 +35,8 @@ public interface FailableToBooleanFunction<T, E extends Throwable> {
      * Gets the NOP singleton.
      *
      * @param <T> the type of the argument to the function
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableToBooleanFunction<T, E> nop() {
@@ -48,7 +48,7 @@ static <T, E extends Throwable> FailableToBooleanFunction<T, E> nop() {
      *
      * @param t the first function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     boolean applyAsBoolean(T t) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableToDoubleBiFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableToDoubleBiFunction.java
index 3581dce82ea..bc458f6d285 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableToDoubleBiFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableToDoubleBiFunction.java
@@ -24,13 +24,13 @@
  *
  * @param <T> the type of the first argument to the function
  * @param <U> the type of the second argument to the function
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableToDoubleBiFunction<T, U, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableToDoubleBiFunction NOP = (t, u) -> 0d;
 
@@ -39,8 +39,8 @@ public interface FailableToDoubleBiFunction<T, U, E extends Throwable> {
      *
      * @param <T> the type of the first argument to the function
      * @param <U> the type of the second argument to the function
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, U, E extends Throwable> FailableToDoubleBiFunction<T, U, E> nop() {
@@ -53,7 +53,7 @@ static <T, U, E extends Throwable> FailableToDoubleBiFunction<T, U, E> nop() {
      * @param t the first function argument
      * @param u the second function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     double applyAsDouble(T t, U u) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableToDoubleFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableToDoubleFunction.java
index b314012951c..33476ec27c2 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableToDoubleFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableToDoubleFunction.java
@@ -23,13 +23,13 @@
  * A functional interface like {@link ToDoubleFunction} that declares a {@link Throwable}.
  *
  * @param <T> the type of the argument to the function
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableToDoubleFunction<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableToDoubleFunction NOP = t -> 0d;
 
@@ -37,8 +37,8 @@ public interface FailableToDoubleFunction<T, E extends Throwable> {
      * Gets the NOP singleton.
      *
      * @param <T> the type of the argument to the function
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableToDoubleFunction<T, E> nop() {
@@ -50,7 +50,7 @@ static <T, E extends Throwable> FailableToDoubleFunction<T, E> nop() {
      *
      * @param t the first function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     double applyAsDouble(T t) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableToIntBiFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableToIntBiFunction.java
index 15a624e5dc4..bce058a90af 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableToIntBiFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableToIntBiFunction.java
@@ -24,13 +24,13 @@
  *
  * @param <T> the type of the first argument to the function
  * @param <U> the type of the second argument to the function
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableToIntBiFunction<T, U, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableToIntBiFunction NOP = (t, u) -> 0;
 
@@ -39,8 +39,8 @@ public interface FailableToIntBiFunction<T, U, E extends Throwable> {
      *
      * @param <T> the type of the first argument to the function
      * @param <U> the type of the second argument to the function
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, U, E extends Throwable> FailableToIntBiFunction<T, U, E> nop() {
@@ -53,7 +53,7 @@ static <T, U, E extends Throwable> FailableToIntBiFunction<T, U, E> nop() {
      * @param t the first function argument
      * @param u the second function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     int applyAsInt(T t, U u) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableToIntFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableToIntFunction.java
index 6426cd9d9d0..ee40204ad0e 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableToIntFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableToIntFunction.java
@@ -23,13 +23,13 @@
  * A functional interface like {@link ToIntFunction} that declares a {@link Throwable}.
  *
  * @param <T> the type of the argument to the function
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableToIntFunction<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableToIntFunction NOP = t -> 0;
 
@@ -37,8 +37,8 @@ public interface FailableToIntFunction<T, E extends Throwable> {
      * Gets the NOP singleton.
      *
      * @param <T> the type of the argument to the function
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableToIntFunction<T, E> nop() {
@@ -50,7 +50,7 @@ static <T, E extends Throwable> FailableToIntFunction<T, E> nop() {
      *
      * @param t the first function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     int applyAsInt(T t) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableToLongBiFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableToLongBiFunction.java
index ab79c60bfd9..d20139edf09 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableToLongBiFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableToLongBiFunction.java
@@ -24,13 +24,13 @@
  *
  * @param <T> the type of the first argument to the function
  * @param <U> the type of the second argument to the function
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableToLongBiFunction<T, U, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableToLongBiFunction NOP = (t, u) -> 0;
 
@@ -39,8 +39,8 @@ public interface FailableToLongBiFunction<T, U, E extends Throwable> {
      *
      * @param <T> the type of the first argument to the function
      * @param <U> the type of the second argument to the function
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, U, E extends Throwable> FailableToLongBiFunction<T, U, E> nop() {
@@ -53,7 +53,7 @@ static <T, U, E extends Throwable> FailableToLongBiFunction<T, U, E> nop() {
      * @param t the first function argument
      * @param u the second function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     long applyAsLong(T t, U u) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/FailableToLongFunction.java b/src/main/java/org/apache/commons/lang3/function/FailableToLongFunction.java
index 605ff3306a1..de42e5c22a9 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableToLongFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableToLongFunction.java
@@ -23,13 +23,13 @@
  * A functional interface like {@link ToLongFunction} that declares a {@link Throwable}.
  *
  * @param <T> the type of the first argument to the function
- * @param <E> The kind of thrown exception or error.
+ * @param <E> the kind of thrown exception or error
  * @since 3.11
  */
 @FunctionalInterface
 public interface FailableToLongFunction<T, E extends Throwable> {
 
-    /** NOP singleton */
+    /** NOP singleton. */
     @SuppressWarnings("rawtypes")
     FailableToLongFunction NOP = t -> 0L;
 
@@ -37,8 +37,8 @@ public interface FailableToLongFunction<T, E extends Throwable> {
      * Gets the NOP singleton.
      *
      * @param <T> the type of the argument to the function
-     * @param <E> The kind of thrown exception or error.
-     * @return The NOP singleton.
+     * @param <E> the kind of thrown exception or error
+     * @return the NOP singleton
      */
     @SuppressWarnings("unchecked")
     static <T, E extends Throwable> FailableToLongFunction<T, E> nop() {
@@ -50,7 +50,7 @@ static <T, E extends Throwable> FailableToLongFunction<T, E> nop() {
      *
      * @param t the first function argument
      * @return the function result
-     * @throws E Thrown when the function fails.
+     * @throws E thrown when the function fails
      */
     long applyAsLong(T t) throws E;
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/Functions.java b/src/main/java/org/apache/commons/lang3/function/Functions.java
index e5d87dfd9f5..82acf5f4123 100644
--- a/src/main/java/org/apache/commons/lang3/function/Functions.java
+++ b/src/main/java/org/apache/commons/lang3/function/Functions.java
@@ -31,11 +31,11 @@ public final class Functions {
     /**
      * Applies the {@link Function} on the object if the function is not {@code null}. Otherwise, does nothing and returns {@code null}.
      *
-     * @param function the function to apply.
-     * @param object   the object to apply the function.
-     * @param <T>      the type of the argument the function applies.
-     * @param <R>      the type of the result the function returns.
-     * @return the value the function returns if the function is not {@code null}; {@code null} otherwise.
+     * @param function the function to apply
+     * @param object   the object to apply the function
+     * @param <T>      the type of the argument the function applies
+     * @param <R>      the type of the result the function returns
+     * @return the value the function returns if the function is not {@code null}; {@code null} otherwise
      * @since 3.15.0
      */
     public static <T, R> R apply(final Function<T, R> function, final T object) {
@@ -56,11 +56,11 @@ public static <T, R> R apply(final Function<T, R> function, final T object) {
      * evaluating expressions twice. Provides an alternative to using {@link Optional} that is shorter and has less allocation.
      * </p>
      *
-     * @param <T>    The type of the input of this method and the function.
-     * @param <R>    The type of the result of the function and this method.
-     * @param value  The value to apply the function to, may be {@code null}.
-     * @param mapper The function to apply, must not be {@code null}.
-     * @return The result of the function (which may be {@code null}) or {@code null} if the input value is {@code null}.
+     * @param <T>    the type of the input of this method and the function
+     * @param <R>    the type of the result of the function and this method
+     * @param value  the value to apply the function to, may be {@code null}
+     * @param mapper the function to apply, must not be {@code null}
+     * @return the result of the function (which may be {@code null}) or {@code null} if the input value is {@code null}
      * @see #applyNonNull(Object, Function, Function)
      * @see #applyNonNull(Object, Function, Function, Function)
      * @since 3.19.0
@@ -84,13 +84,13 @@ public static <T, R> R applyNonNull(final T value, final Function<? super T, ? e
      * evaluating expressions twice. Provides an alternative to using {@link Optional} that is shorter and has less allocation.
      * </p>
      *
-     * @param <T>     The type of the input of this method and the first function.
-     * @param <U>     The type of the result of the first function and the input to the second function.
-     * @param <R>     The type of the result of the second function and this method.
-     * @param value1  The value to apply the functions to, may be {@code null}.
-     * @param mapper1 The first function to apply, must not be {@code null}.
-     * @param mapper2 The second function to apply, must not be {@code null}.
-     * @return The result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}.
+     * @param <T>     the type of the input of this method and the first function
+     * @param <U>     the type of the result of the first function and the input to the second function
+     * @param <R>     the type of the result of the second function and this method
+     * @param value1  the value to apply the functions to, may be {@code null}
+     * @param mapper1 the first function to apply, must not be {@code null}
+     * @param mapper2 the second function to apply, must not be {@code null}
+     * @return the result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}
      * @see #applyNonNull(Object, Function)
      * @see #applyNonNull(Object, Function, Function, Function)
      * @since 3.19.0
@@ -115,15 +115,15 @@ public static <T, U, R> R applyNonNull(final T value1, final Function<? super T,
      * evaluating expressions twice. Provides an alternative to using {@link Optional} that is shorter and has less allocation.
      * </p>
      *
-     * @param <T>     The type of the input of this method and the first function.
-     * @param <U>     The type of the result of the first function and the input to the second function.
-     * @param <V>     The type of the result of the second function and the input to the third function.
-     * @param <R>     The type of the result of the third function and this method.
-     * @param value1  The value to apply the first function, may be {@code null}.
-     * @param mapper1 The first function to apply, must not be {@code null}.
-     * @param mapper2 The second function to apply, must not be {@code null}.
-     * @param mapper3 The third function to apply, must not be {@code null}.
-     * @return The result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}.
+     * @param <T>     the type of the input of this method and the first function
+     * @param <U>     the type of the result of the first function and the input to the second function
+     * @param <V>     the type of the result of the second function and the input to the third function
+     * @param <R>     the type of the result of the third function and this method
+     * @param value1  the value to apply the first function, may be {@code null}
+     * @param mapper1 the first function to apply, must not be {@code null}
+     * @param mapper2 the second function to apply, must not be {@code null}
+     * @param mapper3 the third function to apply, must not be {@code null}
+     * @return the result of the final function (which may be {@code null}) or {@code null} if the input value or any intermediate value is {@code null}
      * @see #applyNonNull(Object, Function)
      * @see #applyNonNull(Object, Function, Function)
      * @since 3.19.0
@@ -136,9 +136,9 @@ public static <T, U, V, R> R applyNonNull(final T value1, final Function<? super
     /**
      * Starts a fluent chain like {@code function(foo::bar).andThen(...).andThen(...).apply(...);}
      *
-     * @param <T>      Input type.
-     * @param <R>      Return type.
-     * @param function the argument to return.
+     * @param <T>      input type
+     * @param <R>      return type
+     * @param function the argument to return
      * @return the argument
      */
     public static <T, R> Function<T, R> function(final Function<T, R> function) {
diff --git a/src/main/java/org/apache/commons/lang3/function/IntToCharFunction.java b/src/main/java/org/apache/commons/lang3/function/IntToCharFunction.java
index dcc9c4c0c8b..ecbb8a16387 100644
--- a/src/main/java/org/apache/commons/lang3/function/IntToCharFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/IntToCharFunction.java
@@ -36,8 +36,8 @@ public interface IntToCharFunction {
     /**
      * Applies this function to the given argument.
      *
-     * @param value the function argument.
-     * @return the function result.
+     * @param value the function argument
+     * @return the function result
      */
     char applyAsChar(int value);
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/MethodInvokers.java b/src/main/java/org/apache/commons/lang3/function/MethodInvokers.java
index c0ed5dd0f8f..c80bc110a36 100644
--- a/src/main/java/org/apache/commons/lang3/function/MethodInvokers.java
+++ b/src/main/java/org/apache/commons/lang3/function/MethodInvokers.java
@@ -75,10 +75,10 @@ public final class MethodInvokers {
      * to a fluent setter). You call the BiConsumer with two arguments: (1) the object receiving the method call, and (2)
      * the method argument.
      *
-     * @param <T> the type of the first argument to the operation: The type containing the Method.
-     * @param <U> the type of the second argument to the operation: The type of the method argument.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <T> the type of the first argument to the operation: The type containing the Method
+     * @param <U> the type of the second argument to the operation: The type of the method argument
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <T, U> BiConsumer<T, U> asBiConsumer(final Method method) {
@@ -99,11 +99,11 @@ public static <T, U> BiConsumer<T, U> asBiConsumer(final Method method) {
      * assertEquals('C', function.apply("ABC", 2));
      * }</pre>
      *
-     * @param <T> the type of the first argument to the function: The type containing the method.
-     * @param <U> the type of the second argument to the function: the method argument type.
-     * @param <R> the type of the result of the function: The method return type.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <T> the type of the first argument to the function: The type containing the method
+     * @param <U> the type of the second argument to the function: the method argument type
+     * @param <R> the type of the result of the function: The method return type
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <T, U, R> BiFunction<T, U, R> asBiFunction(final Method method) {
@@ -115,10 +115,10 @@ public static <T, U, R> BiFunction<T, U, R> asBiFunction(final Method method) {
      * opposed to a fluent setter). You call the FailableBiConsumer with two arguments: (1) the object receiving the method
      * call, and (2) the method argument.
      *
-     * @param <T> the type of the first argument to the operation: The type containing the Method.
-     * @param <U> the type of the second argument to the operation: The type of the method argument.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <T> the type of the first argument to the operation: The type containing the Method
+     * @param <U> the type of the second argument to the operation: The type of the method argument
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <T, U> FailableBiConsumer<T, U, Throwable> asFailableBiConsumer(final Method method) {
@@ -130,11 +130,11 @@ public static <T, U> FailableBiConsumer<T, U, Throwable> asFailableBiConsumer(fi
      * two arguments: (1) the object receiving the method call, and (2) the method argument. The BiFunction return type must
      * match the method's return type.
      *
-     * @param <T> the type of the first argument to the function: The type containing the method.
-     * @param <U> the type of the second argument to the function: the method argument type.
-     * @param <R> the type of the result of the function: The method return type.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <T> the type of the first argument to the function: The type containing the method
+     * @param <U> the type of the second argument to the function: the method argument type
+     * @param <R> the type of the result of the function: The method return type
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <T, U, R> FailableBiFunction<T, U, R, Throwable> asFailableBiFunction(final Method method) {
@@ -145,10 +145,10 @@ public static <T, U, R> FailableBiFunction<T, U, R, Throwable> asFailableBiFunct
      * Produces a {@link FailableFunction} for a given a <em>supplier</em> Method. You call the Function with one argument:
      * the object receiving the method call. The FailableFunction return type must match the method's return type.
      *
-     * @param <T> the type of the first argument to the function: The type containing the method.
-     * @param <R> the type of the result of the function: The method return type.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <T> the type of the first argument to the function: The type containing the method
+     * @param <R> the type of the result of the function: The method return type
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <T, R> FailableFunction<T, R, Throwable> asFailableFunction(final Method method) {
@@ -162,9 +162,9 @@ public static <T, R> FailableFunction<T, R, Throwable> asFailableFunction(final
      * Only works with static methods.
      * </p>
      *
-     * @param <R> The Method return type.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <R> the Method return type
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <R> FailableSupplier<R, Throwable> asFailableSupplier(final Method method) {
@@ -184,10 +184,10 @@ public static <R> FailableSupplier<R, Throwable> asFailableSupplier(final Method
      * assertEquals(3, function.apply("ABC"));
      * }</pre>
      *
-     * @param <T> the type of the first argument to the function: The type containing the method.
-     * @param <R> the type of the result of the function: The method return type.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <T> the type of the first argument to the function: The type containing the method
+     * @param <R> the type of the result of the function: The method return type
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <T, R> Function<T, R> asFunction(final Method method) {
@@ -200,10 +200,10 @@ public static <T, R> Function<T, R> asFunction(final Method method) {
      * For the definition of "single-method", see {@link MethodHandleProxies#asInterfaceInstance(Class, MethodHandle)}.
      * </p>
      *
-     * @param <T> The interface type.
-     * @param interfaceClass a class object representing {@code T}.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <T> the interface type
+     * @param interfaceClass a class object representing {@code T}
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      * @see MethodHandleProxies#asInterfaceInstance(Class, MethodHandle)
      */
     public static <T> T asInterfaceInstance(final Class<T> interfaceClass, final Method method) {
@@ -217,9 +217,9 @@ public static <T> T asInterfaceInstance(final Class<T> interfaceClass, final Met
      * Only works with static methods.
      * </p>
      *
-     * @param <R> The Method return type.
-     * @param method the method to invoke.
-     * @return a correctly-typed wrapper for the given target.
+     * @param <R> the Method return type
+     * @param method the method to invoke
+     * @return a correctly-typed wrapper for the given target
      */
     @SuppressWarnings("unchecked")
     public static <R> Supplier<R> asSupplier(final Method method) {
@@ -229,9 +229,9 @@ public static <R> Supplier<R> asSupplier(final Method method) {
     /**
      * Throws NullPointerException if {@code method} is {@code null}.
      *
-     * @param method The method to test.
-     * @return The given method.
-     * @throws NullPointerException if {@code method} is {@code null}.
+     * @param method the method to test
+     * @return the given method
+     * @throws NullPointerException if {@code method} is {@code null}
      */
     private static Method requireMethod(final Method method) {
         return Objects.requireNonNull(method, "method");
diff --git a/src/main/java/org/apache/commons/lang3/function/Predicates.java b/src/main/java/org/apache/commons/lang3/function/Predicates.java
index 7039fb8227a..0138735b681 100644
--- a/src/main/java/org/apache/commons/lang3/function/Predicates.java
+++ b/src/main/java/org/apache/commons/lang3/function/Predicates.java
@@ -32,8 +32,8 @@ public class Predicates {
     /**
      * Gets the Predicate singleton that always returns false.
      *
-     * @param <T> the type of the input to the predicate.
-     * @return the Predicate singleton.
+     * @param <T> the type of the input to the predicate
+     * @return the Predicate singleton
      */
     @SuppressWarnings("unchecked")
     // method name cannot be "false".
@@ -44,8 +44,8 @@ public static <T> Predicate<T> falsePredicate() {
     /**
      * Gets the Predicate singleton that always returns true.
      *
-     * @param <T> the type of the input to the predicate.
-     * @return the Predicate singleton.
+     * @param <T> the type of the input to the predicate
+     * @return the Predicate singleton
      */
     @SuppressWarnings("unchecked")
     // method name cannot be "true".
diff --git a/src/main/java/org/apache/commons/lang3/function/Suppliers.java b/src/main/java/org/apache/commons/lang3/function/Suppliers.java
index 2c4fb0ffe1c..308e3dfa5a7 100644
--- a/src/main/java/org/apache/commons/lang3/function/Suppliers.java
+++ b/src/main/java/org/apache/commons/lang3/function/Suppliers.java
@@ -38,9 +38,9 @@ public class Suppliers {
     /**
      * Null-safe call to {@link Supplier#get()}.
      *
-     * @param <T> the type of results supplied by this supplier.
-     * @param supplier the supplier or null.
-     * @return Result of {@link Supplier#get()} or null.
+     * @param <T> the type of results supplied by this supplier
+     * @param supplier the supplier or null
+     * @return result of {@link Supplier#get()} or null
      */
     public static <T> T get(final Supplier<T> supplier) {
         return supplier == null ? null : supplier.get();
@@ -52,8 +52,8 @@ public static <T> T get(final Supplier<T> supplier) {
      * This supplier never throws an exception.
      * </p>
      *
-     * @param <T> Supplied type.
-     * @return The NUL singleton.
+     * @param <T> supplied type
+     * @return the NUL singleton
      * @since 3.14.0
      */
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java b/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java
index 438e36e92d1..63e08352857 100644
--- a/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java
@@ -23,8 +23,8 @@
  * A function that accepts two arguments and produces a boolean result. This is the {@code boolean}-producing primitive
  * specialization for {@link BiFunction}.
  *
- * @param <T> the type of the first argument to the function.
- * @param <U> the type of the second argument to the function.
+ * @param <T> the type of the first argument to the function
+ * @param <U> the type of the second argument to the function
  * @see BiFunction
  * @since 3.12.0
  */
@@ -34,9 +34,9 @@ public interface ToBooleanBiFunction<T, U> {
     /**
      * Applies this function to the given arguments.
      *
-     * @param t the first function argument.
-     * @param u the second function argument.
-     * @return the function result.
+     * @param t the first function argument
+     * @param u the second function argument
+     * @return the function result
      */
     boolean applyAsBoolean(T t, U u);
 }
diff --git a/src/main/java/org/apache/commons/lang3/function/TriConsumer.java b/src/main/java/org/apache/commons/lang3/function/TriConsumer.java
index 5244fd8f895..dbfdff9fc5d 100644
--- a/src/main/java/org/apache/commons/lang3/function/TriConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/TriConsumer.java
@@ -54,10 +54,10 @@ public interface TriConsumer<T, U, V> {
      * operation. If performing either operation throws an exception, it is relayed to the caller of the composed
      * operation. If performing this operation throws an exception, the {@code after} operation will not be performed.
      *
-     * @param after the operation to perform after this operation.
+     * @param after the operation to perform after this operation
      * @return a composed {@link TriConsumer} that performs in sequence this operation followed by the {@code after}
-     *         operation.
-     * @throws NullPointerException if {@code after} is null.
+     *         operation
+     * @throws NullPointerException if {@code after} is null
      */
     default TriConsumer<T, U, V> andThen(final TriConsumer<? super T, ? super U, ? super V> after) {
         Objects.requireNonNull(after);
diff --git a/src/main/java/org/apache/commons/lang3/math/Fraction.java b/src/main/java/org/apache/commons/lang3/math/Fraction.java
index b8808264018..fb85ce05c6a 100644
--- a/src/main/java/org/apache/commons/lang3/math/Fraction.java
+++ b/src/main/java/org/apache/commons/lang3/math/Fraction.java
@@ -420,13 +420,13 @@ private static int mulAndCheck(final int x, final int y) {
     }
 
     /**
-     *  Multiplies two non-negative integers, checking for overflow.
+     * Multiplies two non-negative integers, checking for overflow.
      *
-     * @param x a non-negative factor
-     * @param y a non-negative factor
-     * @return the product {@code x*y}
-     * @throws ArithmeticException if the result cannot be represented as
-     * an int
+     * param x a non-negative factor
+     * param y a non-negative factor
+     * return the product {@code x*y}
+     * throws ArithmeticException if the result cannot be represented as
+     * n int.
      */
     private static int mulPosAndCheck(final int x, final int y) {
         /* assert x>=0 && y>=0; */
@@ -516,9 +516,9 @@ public Fraction abs() {
      *
      * @param fraction  the fraction to add, must not be {@code null}
      * @return a {@link Fraction} instance with the resulting values
-     * @throws NullPointerException if the fraction is {@code null}
      * @throws ArithmeticException if the resulting numerator or denominator exceeds
      *  {@code Integer.MAX_VALUE}
+     * @throws NullPointerException if the fraction is {@code null}
      */
     public Fraction add(final Fraction fraction) {
         return addSub(fraction, true /* add */);
@@ -531,9 +531,9 @@ public Fraction add(final Fraction fraction) {
      * @param fraction the fraction to subtract, must not be {@code null}
      * @param isAdd true to add, false to subtract
      * @return a {@link Fraction} instance with the resulting values
-     * @throws IllegalArgumentException if the fraction is {@code null}
      * @throws ArithmeticException if the resulting numerator or denominator
-     *   cannot be represented in an {@code int}.
+     *   cannot be represented in an {@code int}
+     * @throws IllegalArgumentException if the fraction is {@code null}
      */
     private Fraction addSub(final Fraction fraction, final boolean isAdd) {
         Objects.requireNonNull(fraction, "fraction");
@@ -605,10 +605,10 @@ public int compareTo(final Fraction other) {
      *
      * @param fraction  the fraction to divide by, must not be {@code null}
      * @return a {@link Fraction} instance with the resulting values
-     * @throws NullPointerException if the fraction is {@code null}
      * @throws ArithmeticException if the fraction to divide by is zero
      * @throws ArithmeticException if the resulting numerator or denominator exceeds
      *  {@code Integer.MAX_VALUE}
+     * @throws NullPointerException if the fraction is {@code null}
      */
     public Fraction divideBy(final Fraction fraction) {
         Objects.requireNonNull(fraction, "fraction");
@@ -741,8 +741,8 @@ public int intValue() {
      * The returned fraction is not reduced.
      * </p>
      *
-     * @return a new fraction instance with the numerator and denominator inverted.
-     * @throws ArithmeticException if the fraction represents zero.
+     * @return a new fraction instance with the numerator and denominator inverted
+     * @throws ArithmeticException if the fraction represents zero
      */
     public Fraction invert() {
         if (numerator == 0) {
@@ -774,9 +774,9 @@ public long longValue() {
      *
      * @param fraction  the fraction to multiply by, must not be {@code null}
      * @return a {@link Fraction} instance with the resulting values
-     * @throws NullPointerException if the fraction is {@code null}
      * @throws ArithmeticException if the resulting numerator or denominator exceeds
      *  {@code Integer.MAX_VALUE}
+     * @throws NullPointerException if the fraction is {@code null}
      */
     public Fraction multiplyBy(final Fraction fraction) {
         Objects.requireNonNull(fraction, "fraction");
@@ -862,9 +862,9 @@ public Fraction reduce() {
      *
      * @param fraction  the fraction to subtract, must not be {@code null}
      * @return a {@link Fraction} instance with the resulting values
-     * @throws NullPointerException if the fraction is {@code null}
      * @throws ArithmeticException if the resulting numerator or denominator
-     *   cannot be represented in an {@code int}.
+     *   cannot be represented in an {@code int}
+     * @throws NullPointerException if the fraction is {@code null}
      */
     public Fraction subtract(final Fraction fraction) {
         return addSub(fraction, false /* subtract */);
diff --git a/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java b/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java
index 1b261e6a36b..2b108ead0fd 100644
--- a/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java
+++ b/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java
@@ -30,14 +30,14 @@
 public class IEEE754rUtils {
 
      /**
-     * Returns the maximum value in an array.
-     *
-     * @param array  an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from max(double[]) to max(double...)
-     */
+      * Returns the maximum value in an array.
+      *
+      * @param array  an array, must not be null or empty
+      * @return the maximum value in the array
+      * @throws IllegalArgumentException if {@code array} is empty
+      * @throws NullPointerException if {@code array} is {@code null}
+      * @since 3.4 Changed signature from max(double[]) to max(double...)
+      */
     public static double max(final double... array) {
         Objects.requireNonNull(array, "array");
         Validate.isTrue(array.length != 0, "Array cannot be empty.");
@@ -56,9 +56,9 @@ public static double max(final double... array) {
      *
      * <p>NaN is only returned if all numbers are NaN as per IEEE-754r.</p>
      *
-     * @param a  value 1.
-     * @param b  value 2.
-     * @return  the largest of the values.
+     * @param a  value 1
+     * @param b  value 2
+     * @return the largest of the values
      */
     public static double max(final double a, final double b) {
         if (Double.isNaN(a)) {
@@ -75,10 +75,10 @@ public static double max(final double a, final double b) {
      *
      * <p>NaN is only returned if all numbers are NaN as per IEEE-754r.</p>
      *
-     * @param a  value 1.
-     * @param b  value 2.
-     * @param c  value 3.
-     * @return  the largest of the values.
+     * @param a  value 1
+     * @param b  value 2
+     * @param c  value 3
+     * @return the largest of the values
      */
     public static double max(final double a, final double b, final double c) {
         return max(max(a, b), c);
@@ -87,10 +87,10 @@ public static double max(final double a, final double b, final double c) {
     /**
      * Returns the maximum value in an array.
      *
-     * @param array  an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
+     * @param array  an array, must not be null or empty
+     * @return the maximum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException if {@code array} is {@code null}
      * @since 3.4 Changed signature from max(float[]) to max(float...)
      */
     public static float max(final float... array) {
@@ -111,9 +111,9 @@ public static float max(final float... array) {
      *
      * <p>NaN is only returned if all numbers are NaN as per IEEE-754r.</p>
      *
-     * @param a  value 1.
-     * @param b  value 2.
-     * @return  the largest of the values.
+     * @param a  value 1
+     * @param b  value 2
+     * @return the largest of the values
      */
     public static float max(final float a, final float b) {
         if (Float.isNaN(a)) {
@@ -130,10 +130,10 @@ public static float max(final float a, final float b) {
      *
      * <p>NaN is only returned if all numbers are NaN as per IEEE-754r.</p>
      *
-     * @param a  value 1.
-     * @param b  value 2.
-     * @param c  value 3.
-     * @return  the largest of the values.
+     * @param a  value 1
+     * @param b  value 2
+     * @param c  value 3
+     * @return the largest of the values
      */
     public static float max(final float a, final float b, final float c) {
         return max(max(a, b), c);
@@ -142,11 +142,11 @@ public static float max(final float a, final float b, final float c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array  an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from min(double[]) to min(double...).
+     * @param array  an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException if {@code array} is {@code null}
+     * @since 3.4 Changed signature from min(double[]) to min(double...)
      */
     public static double min(final double... array) {
         Objects.requireNonNull(array, "array");
@@ -166,9 +166,9 @@ public static double min(final double... array) {
      *
      * <p>NaN is only returned if all numbers are NaN as per IEEE-754r.</p>
      *
-     * @param a  value 1.
-     * @param b  value 2.
-     * @return  the smallest of the values.
+     * @param a  value 1
+     * @param b  value 2
+     * @return the smallest of the values
      */
     public static double min(final double a, final double b) {
         if (Double.isNaN(a)) {
@@ -188,7 +188,7 @@ public static double min(final double a, final double b) {
      * @param a  value 1
      * @param b  value 2
      * @param c  value 3
-     * @return  the smallest of the values
+     * @return the smallest of the values
      */
     public static double min(final double a, final double b, final double c) {
         return min(min(a, b), c);
@@ -197,11 +197,11 @@ public static double min(final double a, final double b, final double c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array  an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from min(float[]) to min(float...).
+     * @param array  an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException if {@code array} is {@code null}
+     * @since 3.4 Changed signature from min(float[]) to min(float...)
      */
     public static float min(final float... array) {
         Objects.requireNonNull(array, "array");
@@ -221,9 +221,9 @@ public static float min(final float... array) {
      *
      * <p>NaN is only returned if all numbers are NaN as per IEEE-754r.</p>
      *
-     * @param a  value 1.
-     * @param b  value 2.
-     * @return  the smallest of the values.
+     * @param a  value 1
+     * @param b  value 2
+     * @return the smallest of the values
      */
     public static float min(final float a, final float b) {
         if (Float.isNaN(a)) {
@@ -240,10 +240,10 @@ public static float min(final float a, final float b) {
      *
      * <p>NaN is only returned if all numbers are NaN as per IEEE-754r.</p>
      *
-     * @param a  value 1.
-     * @param b  value 2.
-     * @param c  value 3.
-     * @return  the smallest of the values.
+     * @param a  value 1
+     * @param b  value 2
+     * @param c  value 3
+     * @return the smallest of the values
      */
     public static float min(final float a, final float b, final float c) {
         return min(min(a, b), c);
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 d4863e746be..e632b07ca14 100644
--- a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
@@ -49,7 +49,7 @@ public class NumberUtils {
     /** Reusable Integer constant for one. */
     public static final Integer INTEGER_ONE = Integer.valueOf(1);
 
-    /** Reusable Integer constant for two */
+    /** Reusable Integer constant for two. */
     public static final Integer INTEGER_TWO = Integer.valueOf(2);
 
     /** Reusable Integer constant for minus one. */
@@ -117,9 +117,9 @@ private static <T> boolean accept(final Consumer<T> consumer, final T obj) {
     /**
      * Compares two {@code byte} values numerically. This is the same functionality as provided in Java 7.
      *
-     * @param x the first {@code byte} to compare.
-     * @param y the second {@code byte} to compare.
-     * @return the value {@code 0} if {@code x == y}; a value less than {@code 0} if {@code x < y}; and a value greater than {@code 0} if {@code x > y}.
+     * @param x the first {@code byte} to compare
+     * @param y the second {@code byte} to compare
+     * @return the value {@code 0} if {@code x == 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 Byte#compare(byte, byte)}.
      */
@@ -131,9 +131,9 @@ public static int compare(final byte x, final byte y) {
     /**
      * Compares two {@code int} values numerically. This is the same functionality as provided in Java 7.
      *
-     * @param x the first {@code int} to compare.
-     * @param y the second {@code int} to compare.
-     * @return the value {@code 0} if {@code x == y}; a value less than {@code 0} if {@code x < y}; and a value greater than {@code 0} if {@code x > y}.
+     * @param x the first {@code int} to compare
+     * @param y the second {@code int} to compare
+     * @return the value {@code 0} if {@code x == 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 Integer#compare(int, int)}.
      */
@@ -145,9 +145,9 @@ public static int compare(final int x, final int y) {
     /**
      * Compares to {@code long} values numerically. This is the same functionality as provided in Java 7.
      *
-     * @param x the first {@code long} to compare.
-     * @param y the second {@code long} to compare.
-     * @return the value {@code 0} if {@code x == y}; a value less than {@code 0} if {@code x < y}; and a value greater than {@code 0} if {@code x > y}.
+     * @param x the first {@code long} to compare
+     * @param y the second {@code long} to compare
+     * @return the value {@code 0} if {@code x == 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 Long#compare(long, long)}.
      */
@@ -159,9 +159,9 @@ public static int compare(final long x, final long y) {
     /**
      * Compares to {@code short} values numerically. This is the same functionality as provided in Java 7.
      *
-     * @param x the first {@code short} to compare.
-     * @param y the second {@code short} to compare.
-     * @return the value {@code 0} if {@code x == y}; a value less than {@code 0} if {@code x < y}; and a value greater than {@code 0} if {@code x > y}.
+     * @param x the first {@code short} to compare
+     * @param y the second {@code short} to compare
+     * @return the value {@code 0} if {@code x == 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)}.
      */
@@ -178,8 +178,8 @@ public static int compare(final short x, final short y) {
      * </p>
      *
      * @param str a {@link String} to convert, may be null.Return
-     * @return converted {@link BigDecimal} (or null if the input is null).
-     * @throws NumberFormatException if the value cannot be converted.
+     * @return converted {@link BigDecimal} (or null if the input is null)
+     * @throws NumberFormatException if the value cannot be converted
      */
     public static BigDecimal createBigDecimal(final String str) {
         if (str == null) {
@@ -201,9 +201,9 @@ public static BigDecimal createBigDecimal(final String str) {
      * Returns {@code null} if the string is {@code null}.
      * </p>
      *
-     * @param str a {@link String} to convert, may be null.
-     * @return converted {@link BigInteger} (or null if the input is null).
-     * @throws NumberFormatException if the value cannot be converted.
+     * @param str a {@link String} to convert, may be null
+     * @return converted {@link BigInteger} (or null if the input is null)
+     * @throws NumberFormatException if the value cannot be converted
      * @since 3.2
      */
     public static BigInteger createBigInteger(final String str) {
@@ -244,9 +244,9 @@ public static BigInteger createBigInteger(final String str) {
      * Returns {@code null} if the string is {@code null}.
      * </p>
      *
-     * @param str a {@link String} to convert, may be null.
-     * @return converted {@link Double} (or null if the input is null).
-     * @throws NumberFormatException if the value cannot be converted.
+     * @param str a {@link String} to convert, may be null
+     * @return converted {@link Double} (or null if the input is null)
+     * @throws NumberFormatException if the value cannot be converted
      */
     public static Double createDouble(final String str) {
         if (str == null) {
@@ -262,9 +262,9 @@ public static Double createDouble(final String str) {
      * Returns {@code null} if the string is {@code null}.
      * </p>
      *
-     * @param str a {@link String} to convert, may be null.
-     * @return converted {@link Float} (or null if the input is null).
-     * @throws NumberFormatException if the value cannot be converted.
+     * @param str a {@link String} to convert, may be null
+     * @return converted {@link Float} (or null if the input is null)
+     * @throws NumberFormatException if the value cannot be converted
      */
     public static Float createFloat(final String str) {
         if (str == null) {
@@ -282,9 +282,9 @@ public static Float createFloat(final String str) {
      * Returns {@code null} if the string is {@code null}.
      * </p>
      *
-     * @param str a {@link String} to convert, may be null.
-     * @return converted {@link Integer} (or null if the input is null).
-     * @throws NumberFormatException if the value cannot be converted.
+     * @param str a {@link String} to convert, may be null
+     * @return converted {@link Integer} (or null if the input is null)
+     * @throws NumberFormatException if the value cannot be converted
      */
     public static Integer createInteger(final String str) {
         if (str == null) {
@@ -303,9 +303,9 @@ public static Integer createInteger(final String str) {
      * Returns {@code null} if the string is {@code null}.
      * </p>
      *
-     * @param str a {@link String} to convert, may be null.
-     * @return converted {@link Long} (or null if the input is null).
-     * @throws NumberFormatException if the value cannot be converted.
+     * @param str a {@link String} to convert, may be null
+     * @return converted {@link Long} (or null if the input is null)
+     * @throws NumberFormatException if the value cannot be converted
      * @since 3.1
      */
     public static Long createLong(final String str) {
@@ -344,9 +344,9 @@ public static Long createLong(final String str) {
      * This method does not trim the input string, i.e., strings with leading or trailing spaces will generate NumberFormatExceptions.
      * </p>
      *
-     * @param str String containing a number, may be null.
-     * @return Number created from the string (or null if the input is null).
-     * @throws NumberFormatException if the value cannot be converted.
+     * @param str string containing a number, may be null
+     * @return number created from the string (or null if the input is null)
+     * @throws NumberFormatException if the value cannot be converted
      */
     public static Number createNumber(final String str) {
         if (str == null) {
@@ -518,10 +518,10 @@ public static Number createNumber(final String str) {
      * Returns mantissa of the given number.
      * </p>
      *
-     * @param str     the string representation of the number.
-     * @param stopPos the position of the exponent or decimal point.
-     * @return mantissa of the given number.
-     * @throws NumberFormatException if no mantissa can be retrieved.
+     * @param str     the string representation of the number
+     * @param stopPos the position of the exponent or decimal point
+     * @return mantissa of the given number
+     * @throws NumberFormatException if no mantissa can be retrieved
      */
     private static String getMantissa(final String str, final int stopPos) {
         final char firstChar = str.charAt(0);
@@ -540,8 +540,8 @@ private static String getMantissa(final String str, final int stopPos) {
      * Returns {@code true} if s is {@code null} or empty.
      * </p>
      *
-     * @param str the String to check.
-     * @return if it is all zeros or {@code null}.
+     * @param str the String to check
+     * @return if it is all zeros or {@code null}
      */
     private static boolean isAllZeros(final String str) {
         if (str == null) {
@@ -576,8 +576,8 @@ private static boolean isAllZeros(final String str) {
      * Note, {@link #createNumber(String)} should return a number for every input resulting in {@code true}.
      * </p>
      *
-     * @param str the {@link String} to check.
-     * @return {@code true} if the string is a correctly formatted number.
+     * @param str the {@link String} to check
+     * @return {@code true} if the string is a correctly formatted number
      * @since 3.5
      */
     public static boolean isCreatable(final String str) {
@@ -721,9 +721,9 @@ public static boolean isDigits(final String str) {
      * Note, {@link #createNumber(String)} should return a number for every input resulting in {@code true}.
      * </p>
      *
-     * @param str the {@link String} to check.
-     * @return {@code true} if the string is a correctly formatted number.
-     * @since 3.3 the code supports hexadecimal {@code 0Xhhh} an octal {@code 0ddd} validation.
+     * @param str the {@link String} to check
+     * @return {@code true} if the string is a correctly formatted number
+     * @since 3.3 the code supports hexadecimal {@code 0Xhhh} an octal {@code 0ddd} validation
      * @deprecated This feature will be removed in Lang 4, use {@link NumberUtils#isCreatable(String)} instead.
      */
     @Deprecated
@@ -748,8 +748,8 @@ public static boolean isNumber(final String str) {
      * {@code null} and empty String will return {@code false}.
      * </p>
      *
-     * @param str the String to check.
-     * @return {@code true} if the string is a parsable number.
+     * @param str the String to check
+     * @return {@code true} if the string is a parsable number
      * @see Integer#parseInt(String)
      * @see Long#parseLong(String)
      * @see Double#parseDouble(String)
@@ -790,9 +790,9 @@ private static boolean isSign(final char ch) {
      * <li>{@code false} otherwise (this assumes {@code "."} is not possible)</li>
      * </ul>
      *
-     * @param mant the mantissa decimal digits before the decimal point (sign must be removed; never null).
+     * @param mant the mantissa decimal digits before the decimal point (sign must be removed; never null)
      * @param dec  the decimal digits after the decimal point (exponent and type specifier removed; can be null)
-     * @return true if the magnitude is zero.
+     * @return true if the magnitude is zero
      */
     private static boolean isZero(final String mant, final String dec) {
         return isAllZeros(mant) && isAllZeros(dec);
@@ -801,11 +801,11 @@ private static boolean isZero(final String mant, final String dec) {
     /**
      * Returns the maximum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from max(byte[]) to max(byte...).
+     * @param array an array, must not be null or empty
+     * @return the maximum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from max(byte[]) to max(byte...)
      */
     public static byte max(final byte... array) {
         // Validates input
@@ -823,10 +823,10 @@ public static byte max(final byte... array) {
     /**
      * Gets the maximum of three {@code byte} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the largest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the largest of the values
      */
     public static byte max(byte a, final byte b, final byte c) {
         if (b > a) {
@@ -841,11 +841,11 @@ public static byte max(byte a, final byte b, final byte c) {
     /**
      * Returns the maximum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @see IEEE754rUtils#max(double[]) IEEE754rUtils for a version of this method that handles NaN differently.
+     * @param array an array, must not be null or empty
+     * @return the maximum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @see IEEE754rUtils#max(double[]) IEEE754rUtils for a version of this method that handles NaN differently
      * @since 3.4 Changed signature from max(double[]) to max(double...)
      */
     public static double max(final double... array) {
@@ -871,11 +871,11 @@ public static double max(final double... array) {
      * If any value is {@code NaN}, {@code NaN} is returned. Infinity is handled.
      * </p>
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the largest of the values.
-     * @see IEEE754rUtils#max(double, double, double) for a version of this method that handles NaN differently.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the largest of the values
+     * @see IEEE754rUtils#max(double, double, double) for a version of this method that handles NaN differently
      */
     public static double max(final double a, final double b, final double c) {
         return Math.max(Math.max(a, b), c);
@@ -884,12 +884,12 @@ public static double max(final double a, final double b, final double c) {
     /**
      * Returns the maximum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @see IEEE754rUtils#max(float[]) IEEE754rUtils for a version of this method that handles NaN differently.
-     * @since 3.4 Changed signature from max(float[]) to max(float...).
+     * @param array an array, must not be null or empty
+     * @return the maximum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @see IEEE754rUtils#max(float[]) IEEE754rUtils for a version of this method that handles NaN differently
+     * @since 3.4 Changed signature from max(float[]) to max(float...)
      */
     public static float max(final float... array) {
         // Validates input
@@ -948,11 +948,11 @@ public static float max(final float... array) {
      * If any value is {@code NaN}, {@code NaN} is returned. Infinity is handled.
      * </p>
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the largest of the values.
-     * @see IEEE754rUtils#max(float, float, float) for a version of this method that handles NaN differently.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the largest of the values
+     * @see IEEE754rUtils#max(float, float, float) for a version of this method that handles NaN differently
      */
     public static float max(final float a, final float b, final float c) {
         return Math.max(Math.max(a, b), c);
@@ -961,11 +961,11 @@ public static float max(final float a, final float b, final float c) {
     /**
      * Returns the maximum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from max(int[]) to max(int...).
+     * @param array an array, must not be null or empty
+     * @return the maximum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from max(int[]) to max(int...)
      */
     public static int max(final int... array) {
         // Validates input
@@ -983,10 +983,10 @@ public static int max(final int... array) {
     /**
      * Gets the maximum of three {@code int} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the largest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the largest of the values
      */
     public static int max(int a, final int b, final int c) {
         if (b > a) {
@@ -1001,11 +1001,11 @@ public static int max(int a, final int b, final int c) {
     /**
      * Returns the maximum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from max(long[]) to max(long...).
+     * @param array an array, must not be null or empty
+     * @return the maximum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from max(long[]) to max(long...)
      */
     public static long max(final long... array) {
         // Validates input
@@ -1024,10 +1024,10 @@ public static long max(final long... array) {
     /**
      * Gets the maximum of three {@code long} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the largest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the largest of the values
      */
     public static long max(long a, final long b, final long c) {
         if (b > a) {
@@ -1042,11 +1042,11 @@ public static long max(long a, final long b, final long c) {
     /**
      * Returns the maximum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the maximum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from max(short[]) to max(short...).
+     * @param array an array, must not be null or empty
+     * @return the maximum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from max(short[]) to max(short...)
      */
     public static short max(final short... array) {
         // Validates input
@@ -1064,10 +1064,10 @@ public static short max(final short... array) {
     /**
      * Gets the maximum of three {@code short} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the largest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the largest of the values
      */
     public static short max(short a, final short b, final short c) {
         if (b > a) {
@@ -1082,11 +1082,11 @@ public static short max(short a, final short b, final short c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from min(byte[]) to min(byte...).
+     * @param array an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from min(byte[]) to min(byte...)
      */
     public static byte min(final byte... array) {
         // Validates input
@@ -1104,10 +1104,10 @@ public static byte min(final byte... array) {
     /**
      * Gets the minimum of three {@code byte} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the smallest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the smallest of the values
      */
     public static byte min(byte a, final byte b, final byte c) {
         if (b < a) {
@@ -1122,12 +1122,12 @@ public static byte min(byte a, final byte b, final byte c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @see IEEE754rUtils#min(double[]) IEEE754rUtils for a version of this method that handles NaN differently.
-     * @since 3.4 Changed signature from min(double[]) to min(double...).
+     * @param array an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @see IEEE754rUtils#min(double[]) IEEE754rUtils for a version of this method that handles NaN differently
+     * @since 3.4 Changed signature from min(double[]) to min(double...)
      */
     public static double min(final double... array) {
         // Validates input
@@ -1152,11 +1152,11 @@ public static double min(final double... array) {
      * If any value is {@code NaN}, {@code NaN} is returned. Infinity is handled.
      * </p>
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the smallest of the values.
-     * @see IEEE754rUtils#min(double, double, double) for a version of this method that handles NaN differently.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the smallest of the values
+     * @see IEEE754rUtils#min(double, double, double) for a version of this method that handles NaN differently
      */
     public static double min(final double a, final double b, final double c) {
         return Math.min(Math.min(a, b), c);
@@ -1165,12 +1165,12 @@ public static double min(final double a, final double b, final double c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @see IEEE754rUtils#min(float[]) IEEE754rUtils for a version of this method that handles NaN differently.
-     * @since 3.4 Changed signature from min(float[]) to min(float...).
+     * @param array an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @see IEEE754rUtils#min(float[]) IEEE754rUtils for a version of this method that handles NaN differently
+     * @since 3.4 Changed signature from min(float[]) to min(float...)
      */
     public static float min(final float... array) {
         // Validates input
@@ -1195,11 +1195,11 @@ public static float min(final float... array) {
      * If any value is {@code NaN}, {@code NaN} is returned. Infinity is handled.
      * </p>
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the smallest of the values.
-     * @see IEEE754rUtils#min(float, float, float) for a version of this method that handles NaN differently.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the smallest of the values
+     * @see IEEE754rUtils#min(float, float, float) for a version of this method that handles NaN differently
      */
     public static float min(final float a, final float b, final float c) {
         return Math.min(Math.min(a, b), c);
@@ -1208,11 +1208,11 @@ public static float min(final float a, final float b, final float c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from min(int[]) to min(int...).
+     * @param array an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from min(int[]) to min(int...)
      */
     public static int min(final int... array) {
         // Validates input
@@ -1230,10 +1230,10 @@ public static int min(final int... array) {
     /**
      * Gets the minimum of three {@code int} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the smallest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the smallest of the values
      */
     public static int min(int a, final int b, final int c) {
         if (b < a) {
@@ -1248,11 +1248,11 @@ public static int min(int a, final int b, final int c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from min(long[]) to min(long...).
+     * @param array an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from min(long[]) to min(long...)
      */
     public static long min(final long... array) {
         // Validates input
@@ -1271,10 +1271,10 @@ public static long min(final long... array) {
     /**
      * Gets the minimum of three {@code long} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the smallest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the smallest of the values
      */
     public static long min(long a, final long b, final long c) {
         if (b < a) {
@@ -1289,11 +1289,11 @@ public static long min(long a, final long b, final long c) {
     /**
      * Returns the minimum value in an array.
      *
-     * @param array an array, must not be null or empty.
-     * @return the minimum value in the array.
-     * @throws NullPointerException     if {@code array} is {@code null}.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @since 3.4 Changed signature from min(short[]) to min(short...).
+     * @param array an array, must not be null or empty
+     * @return the minimum value in the array
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
+     * @since 3.4 Changed signature from min(short[]) to min(short...)
      */
     public static short min(final short... array) {
         // Validates input
@@ -1311,10 +1311,10 @@ public static short min(final short... array) {
     /**
      * Gets the minimum of three {@code short} values.
      *
-     * @param a value 1.
-     * @param b value 2.
-     * @param c value 3.
-     * @return the smallest of the values.
+     * @param a value 1
+     * @param b value 2
+     * @param c value 3
+     * @return the smallest of the values
      */
     public static short min(short a, final short b, final short c) {
         if (b < a) {
@@ -1339,8 +1339,8 @@ public static short min(short a, final short b, final short c) {
      *   NumberUtils.toByte("1")  = 1
      * </pre>
      *
-     * @param str the string to convert, may be null.
-     * @return the byte represented by the string, or {@code zero} if conversion fails.
+     * @param str the string to convert, may be null
+     * @return the byte represented by the string, or {@code zero} if conversion fails
      * @since 2.5
      */
     public static byte toByte(final String str) {
@@ -1360,9 +1360,9 @@ public static byte toByte(final String str) {
      *   NumberUtils.toByte("1", 0)  = 1
      * </pre>
      *
-     * @param str          the string to convert, may be null.
-     * @param defaultValue the default value.
-     * @return the byte represented by the string, or the default if conversion fails.
+     * @param str          the string to convert, may be null
+     * @param defaultValue the default value
+     * @return the byte represented by the string, or the default if conversion fails
      * @since 2.5
      */
     public static byte toByte(final String str, final byte defaultValue) {
@@ -1385,8 +1385,8 @@ public static byte toByte(final String str, final byte defaultValue) {
      *   NumberUtils.toDouble(BigDecimal.valueOf(8.5d)) = 8.5d
      * </pre>
      *
-     * @param value the {@link BigDecimal} to convert, may be {@code null}.
-     * @return the double represented by the {@link BigDecimal} or {@code 0.0d} if the {@link BigDecimal} is {@code null}.
+     * @param value the {@link BigDecimal} to convert, may be {@code null}
+     * @return the double represented by the {@link BigDecimal} or {@code 0.0d} if the {@link BigDecimal} is {@code null}
      * @since 3.8
      */
     public static double toDouble(final BigDecimal value) {
@@ -1405,9 +1405,9 @@ public static double toDouble(final BigDecimal value) {
      *   NumberUtils.toDouble(BigDecimal.valueOf(8.5d), 1.1d) = 8.5d
      * </pre>
      *
-     * @param value        the {@link BigDecimal} to convert, may be {@code null}.
-     * @param defaultValue the default value.
-     * @return the double represented by the {@link BigDecimal} or the defaultValue if the {@link BigDecimal} is {@code null}.
+     * @param value        the {@link BigDecimal} to convert, may be {@code null}
+     * @param defaultValue the default value
+     * @return the double represented by the {@link BigDecimal} or the defaultValue if the {@link BigDecimal} is {@code null}
      * @since 3.8
      */
     public static double toDouble(final BigDecimal value, final double defaultValue) {
@@ -1427,8 +1427,8 @@ public static double toDouble(final BigDecimal value, final double defaultValue)
      *   NumberUtils.toDouble("1.5")  = 1.5d
      * </pre>
      *
-     * @param str the string to convert, may be {@code null}.
-     * @return the double represented by the string, or {@code 0.0d} if conversion fails.
+     * @param str the string to convert, may be {@code null}
+     * @return the double represented by the string, or {@code 0.0d} if conversion fails
      * @since 2.1
      */
     public static double toDouble(final String str) {
@@ -1449,8 +1449,8 @@ public static double toDouble(final String str) {
      * </pre>
      *
      * @param str          the string to convert, may be {@code null}
-     * @param defaultValue the default value.
-     * @return the double represented by the string, or defaultValue if conversion fails.
+     * @param defaultValue the default value
+     * @return the double represented by the string, or defaultValue if conversion fails
      * @since 2.1
      */
     public static double toDouble(final String str, final double defaultValue) {
@@ -1474,8 +1474,8 @@ public static double toDouble(final String str, final double defaultValue) {
      *   NumberUtils.toFloat("1.5")  = 1.5f
      * </pre>
      *
-     * @param str the string to convert, may be {@code null}.
-     * @return the float represented by the string, or {@code 0.0f} if conversion fails.
+     * @param str the string to convert, may be {@code null}
+     * @return the float represented by the string, or {@code 0.0f} if conversion fails
      * @since 2.1
      */
     public static float toFloat(final String str) {
@@ -1495,9 +1495,9 @@ public static float toFloat(final String str) {
      *   NumberUtils.toFloat("1.5", 0.0f)  = 1.5f
      * </pre>
      *
-     * @param str          the string to convert, may be {@code null}.
-     * @param defaultValue the default value.
-     * @return the float represented by the string, or defaultValue if conversion fails.
+     * @param str          the string to convert, may be {@code null}
+     * @param defaultValue the default value
+     * @return the float represented by the string, or defaultValue if conversion fails
      * @since 2.1
      */
     public static float toFloat(final String str, final float defaultValue) {
@@ -1521,8 +1521,8 @@ public static float toFloat(final String str, final float defaultValue) {
      *   NumberUtils.toInt("1")  = 1
      * </pre>
      *
-     * @param str the string to convert, may be null.
-     * @return the int represented by the string, or {@code zero} if conversion fails.
+     * @param str the string to convert, may be null
+     * @return the int represented by the string, or {@code zero} if conversion fails
      * @since 2.1
      */
     public static int toInt(final String str) {
@@ -1542,9 +1542,9 @@ public static int toInt(final String str) {
      *   NumberUtils.toInt("1", 0)  = 1
      * </pre>
      *
-     * @param str          the string to convert, may be null.
-     * @param defaultValue the default value.
-     * @return the int represented by the string, or the default if conversion fails.
+     * @param str          the string to convert, may be null
+     * @param defaultValue the default value
+     * @return the int represented by the string, or the default if conversion fails
      * @since 2.1
      */
     public static int toInt(final String str, final int defaultValue) {
@@ -1568,8 +1568,8 @@ public static int toInt(final String str, final int defaultValue) {
      *   NumberUtils.toLong("1")  = 1L
      * </pre>
      *
-     * @param str the string to convert, may be null.
-     * @return the long represented by the string, or {@code 0} if conversion fails.
+     * @param str the string to convert, may be null
+     * @return the long represented by the string, or {@code 0} if conversion fails
      * @since 2.1
      */
     public static long toLong(final String str) {
@@ -1589,9 +1589,9 @@ public static long toLong(final String str) {
      *   NumberUtils.toLong("1", 0L)  = 1L
      * </pre>
      *
-     * @param str          the string to convert, may be null.
-     * @param defaultValue the default value.
-     * @return the long represented by the string, or the default if conver sion fails.
+     * @param str          the string to convert, may be null
+     * @param defaultValue the default value
+     * @return the long represented by the string, or the default if conver sion fails
      * @since 2.1
      */
     public static long toLong(final String str, final long defaultValue) {
@@ -1610,8 +1610,8 @@ public static long toLong(final String str, final long defaultValue) {
      * Note, the scale of a {@link BigDecimal} is the number of digits to the right of the decimal point.
      * </p>
      *
-     * @param value the {@link BigDecimal} to convert, may be null.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value the {@link BigDecimal} to convert, may be null
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final BigDecimal value) {
@@ -1622,10 +1622,10 @@ public static BigDecimal toScaledBigDecimal(final BigDecimal value) {
      * Converts a {@link BigDecimal} to a {@link BigDecimal} whose scale is the specified value with a {@link RoundingMode} applied. If the input {@code value}
      * is {@code null}, we simply return {@code BigDecimal.ZERO}.
      *
-     * @param value        the {@link BigDecimal} to convert, may be null.
-     * @param scale        the number of digits to the right of the decimal point.
-     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value        the {@link BigDecimal} to convert, may be null
+     * @param scale        the number of digits to the right of the decimal point
+     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final BigDecimal value, final int scale, final RoundingMode roundingMode) {
@@ -1643,8 +1643,8 @@ public static BigDecimal toScaledBigDecimal(final BigDecimal value, final int sc
      * Note, the scale of a {@link BigDecimal} is the number of digits to the right of the decimal point.
      * </p>
      *
-     * @param value the {@link Double} to convert, may be null.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value the {@link Double} to convert, may be null
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final Double value) {
@@ -1655,10 +1655,10 @@ public static BigDecimal toScaledBigDecimal(final Double value) {
      * Converts a {@link Double} to a {@link BigDecimal} whose scale is the specified value with a {@link RoundingMode} applied. If the input {@code value} is
      * {@code null}, we simply return {@code BigDecimal.ZERO}.
      *
-     * @param value        the {@link Double} to convert, may be null.
-     * @param scale        the number of digits to the right of the decimal point.
-     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value        the {@link Double} to convert, may be null
+     * @param scale        the number of digits to the right of the decimal point
+     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final Double value, final int scale, final RoundingMode roundingMode) {
@@ -1676,8 +1676,8 @@ public static BigDecimal toScaledBigDecimal(final Double value, final int scale,
      * Note, the scale of a {@link BigDecimal} is the number of digits to the right of the decimal point.
      * </p>
      *
-     * @param value the {@link Float} to convert, may be null.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value the {@link Float} to convert, may be null
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final Float value) {
@@ -1688,10 +1688,10 @@ public static BigDecimal toScaledBigDecimal(final Float value) {
      * Converts a {@link Float} to a {@link BigDecimal} whose scale is the specified value with a {@link RoundingMode} applied. If the input {@code value} is
      * {@code null}, we simply return {@code BigDecimal.ZERO}.
      *
-     * @param value        the {@link Float} to convert, may be null.
-     * @param scale        the number of digits to the right of the decimal point.
-     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value        the {@link Float} to convert, may be null
+     * @param scale        the number of digits to the right of the decimal point
+     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final Float value, final int scale, final RoundingMode roundingMode) {
@@ -1709,8 +1709,8 @@ public static BigDecimal toScaledBigDecimal(final Float value, final int scale,
      * Note, the scale of a {@link BigDecimal} is the number of digits to the right of the decimal point.
      * </p>
      *
-     * @param value the {@link String} to convert, may be null.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value the {@link String} to convert, may be null
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final String value) {
@@ -1721,10 +1721,10 @@ public static BigDecimal toScaledBigDecimal(final String value) {
      * Converts a {@link String} to a {@link BigDecimal} whose scale is the specified value with a {@link RoundingMode} applied. If the input {@code value} is
      * {@code null}, we simply return {@code BigDecimal.ZERO}.
      *
-     * @param value        the {@link String} to convert, may be null.
-     * @param scale        the number of digits to the right of the decimal point.
-     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision.
-     * @return the scaled, with appropriate rounding, {@link BigDecimal}.
+     * @param value        the {@link String} to convert, may be null
+     * @param scale        the number of digits to the right of the decimal point
+     * @param roundingMode a rounding behavior for numerical operations capable of discarding precision
+     * @return the scaled, with appropriate rounding, {@link BigDecimal}
      * @since 3.8
      */
     public static BigDecimal toScaledBigDecimal(final String value, final int scale, final RoundingMode roundingMode) {
@@ -1747,8 +1747,8 @@ public static BigDecimal toScaledBigDecimal(final String value, final int scale,
      *   NumberUtils.toShort("1")  = 1
      * </pre>
      *
-     * @param str the string to convert, may be null.
-     * @return the short represented by the string, or {@code zero} if conversion fails.
+     * @param str the string to convert, may be null
+     * @return the short represented by the string, or {@code zero} if conversion fails
      * @since 2.5
      */
     public static short toShort(final String str) {
@@ -1768,9 +1768,9 @@ public static short toShort(final String str) {
      *   NumberUtils.toShort("1", 0)  = 1
      * </pre>
      *
-     * @param str          the string to convert, may be null.
-     * @param defaultValue the default value.
-     * @return the short represented by the string, or the default if conversion fails.
+     * @param str          the string to convert, may be null
+     * @param defaultValue the default value
+     * @return the short represented by the string, or the default if conversion fails
      * @since 2.5
      */
     public static short toShort(final String str, final short defaultValue) {
@@ -1784,9 +1784,9 @@ public static short toShort(final String str, final short defaultValue) {
     /**
      * Checks if the specified array is neither null nor empty.
      *
-     * @param array the array to check.
-     * @throws IllegalArgumentException if {@code array} is empty.
-     * @throws NullPointerException     if {@code array} is {@code null}.
+     * @param array the array to check
+     * @throws IllegalArgumentException if {@code array} is empty
+     * @throws NullPointerException     if {@code array} is {@code null}
      */
     private static void validateArray(final Object array) {
         Objects.requireNonNull(array, "array");
diff --git a/src/main/java/org/apache/commons/lang3/mutable/Mutable.java b/src/main/java/org/apache/commons/lang3/mutable/Mutable.java
index 71254a5a10a..6fe20883f77 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/Mutable.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/Mutable.java
@@ -30,7 +30,7 @@
  * Integer/Long wrapper objects.
  * </p>
  *
- * @param <T> the type to wrap.
+ * @param <T> the type to wrap
  * @since 2.1
  */
 public interface Mutable<T> extends Supplier<T> {
@@ -38,7 +38,7 @@ public interface Mutable<T> extends Supplier<T> {
     /**
      * Gets the value of this mutable.
      *
-     * @return the stored value.
+     * @return the stored value
      * @since 3.18.0
      */
     @Override
@@ -49,7 +49,7 @@ default T get() {
     /**
      * Gets the value of this mutable.
      *
-     * @return the stored value.
+     * @return the stored value
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -58,9 +58,9 @@ default T get() {
     /**
      * Sets the value of this mutable.
      *
-     * @param value the value to store.
-     * @throws NullPointerException if the object is null and null is invalid.
-     * @throws ClassCastException   if the type is invalid.
+     * @param value the value to store
+     * @throws ClassCastException   if the type is invalid
+     * @throws NullPointerException if the object is null and null is invalid
      */
     void setValue(T value);
 }
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java b/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java
index ec093afefb4..7560a109aed 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java
@@ -56,7 +56,7 @@ public MutableBoolean() {
     /**
      * Constructs a new MutableBoolean with the specified value.
      *
-     * @param value  the initial value to store
+     * @param value the initial value to store
      */
     public MutableBoolean(final boolean value) {
         this.value = value;
@@ -75,7 +75,7 @@ public MutableBoolean(final Boolean value) {
     /**
      * Returns the value of this MutableBoolean as a boolean.
      *
-     * @return the boolean value represented by this object.
+     * @return the boolean value represented by this object
      */
     public boolean booleanValue() {
         return value;
@@ -99,7 +99,7 @@ public int compareTo(final MutableBoolean other) {
      * {@code boolean} value as this object.
      *
      * @param obj  the object to compare with, null returns false
-     * @return {@code true} if the objects are the same; {@code false} otherwise.
+     * @return {@code true} if the objects are the same; {@code false} otherwise
      */
     @Override
     public boolean equals(final Object obj) {
@@ -112,7 +112,7 @@ public boolean equals(final Object obj) {
     /**
      * Gets the value as a Boolean instance.
      *
-     * @return the value as a Boolean, never null.
+     * @return the value as a Boolean, never null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -172,7 +172,7 @@ public void setTrue() {
     /**
      * Sets the value.
      *
-     * @param value  the value to set
+     * @param value the value to set
      */
     public void setValue(final boolean value) {
         this.value = value;
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java b/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
index 9e5da5fff0f..9f40b649b5f 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
@@ -52,7 +52,7 @@ public MutableByte() {
     /**
      * Constructs a new MutableByte with the specified value.
      *
-     * @param value  the initial value to store
+     * @param value the initial value to store
      */
     public MutableByte(final byte value) {
         this.value = value;
@@ -61,8 +61,8 @@ public MutableByte(final byte value) {
     /**
      * Constructs a new MutableByte with the specified value.
      *
-     * @param value  the initial value to store, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the initial value to store, not null
+     * @throws NullPointerException if the object is null
      */
     public MutableByte(final Number value) {
         this.value = value.byteValue();
@@ -71,8 +71,8 @@ public MutableByte(final Number value) {
     /**
      * Constructs a new MutableByte parsing the given string.
      *
-     * @param value  the string to parse, not null.
-     * @throws NumberFormatException if the string cannot be parsed into a byte, see {@link Byte#parseByte(String)}.
+     * @param value  the string to parse, not null
+     * @throws NumberFormatException if the string cannot be parsed into a byte, see {@link Byte#parseByte(String)}
      * @since 2.5
      */
     public MutableByte(final String value) {
@@ -82,7 +82,7 @@ public MutableByte(final String value) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
+     * @param operand  the value to add, not null
      * @since 2.2
      */
     public void add(final byte operand) {
@@ -92,8 +92,8 @@ public void add(final byte operand) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to add, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void add(final Number operand) {
@@ -104,8 +104,8 @@ public void add(final Number operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
      * @since 3.5
      */
     public byte addAndGet(final byte operand) {
@@ -117,9 +117,9 @@ public byte addAndGet(final byte operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public byte addAndGet(final Number operand) {
@@ -131,7 +131,7 @@ public byte addAndGet(final Number operand) {
     /**
      * Returns the value of this MutableByte as a byte.
      *
-     * @return the numeric value represented by this object after conversion to type byte.
+     * @return the numeric value represented by this object after conversion to type byte
      */
     @Override
     public byte byteValue() {
@@ -141,8 +141,8 @@ public byte byteValue() {
     /**
      * Compares this mutable to another in ascending order.
      *
-     * @param other  the other mutable to compare to, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other mutable to compare to, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final MutableByte other) {
@@ -162,7 +162,7 @@ public void decrement() {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately after the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is decremented.
+     * @return the value associated with the instance after it is decremented
      * @since 3.5
      */
     public byte decrementAndGet() {
@@ -173,7 +173,7 @@ public byte decrementAndGet() {
     /**
      * Returns the value of this MutableByte as a double.
      *
-     * @return the numeric value represented by this object after conversion to type double.
+     * @return the numeric value represented by this object after conversion to type double
      */
     @Override
     public double doubleValue() {
@@ -185,8 +185,8 @@ public double doubleValue() {
      * not {@code null} and is a {@link MutableByte} object that contains the same {@code byte} value
      * as this object.
      *
-     * @param obj  the object to compare with, null returns false.
-     * @return {@code true} if the objects are the same; {@code false} otherwise.
+     * @param obj  the object to compare with, null returns false
+     * @return {@code true} if the objects are the same; {@code false} otherwise
      */
     @Override
     public boolean equals(final Object obj) {
@@ -199,7 +199,7 @@ public boolean equals(final Object obj) {
     /**
      * Returns the value of this MutableByte as a float.
      *
-     * @return the numeric value represented by this object after conversion to type float.
+     * @return the numeric value represented by this object after conversion to type float
      */
     @Override
     public float floatValue() {
@@ -210,8 +210,8 @@ public float floatValue() {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
      * @since 3.5
      */
     public byte getAndAdd(final byte operand) {
@@ -224,9 +224,9 @@ public byte getAndAdd(final byte operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public byte getAndAdd(final Number operand) {
@@ -239,7 +239,7 @@ public byte getAndAdd(final Number operand) {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was decremented.
+     * @return the value associated with the instance before it was decremented
      * @since 3.5
      */
     public byte getAndDecrement() {
@@ -252,7 +252,7 @@ public byte getAndDecrement() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was incremented.
+     * @return the value associated with the instance before it was incremented
      * @since 3.5
      */
     public byte getAndIncrement() {
@@ -264,7 +264,7 @@ public byte getAndIncrement() {
     /**
      * Gets the value as a Byte instance.
      *
-     * @return the value as a Byte, never null.
+     * @return the value as a Byte, never null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -276,7 +276,7 @@ public Byte getValue() {
     /**
      * Returns a suitable hash code for this mutable.
      *
-     * @return a suitable hash code.
+     * @return a suitable hash code
      */
     @Override
     public int hashCode() {
@@ -296,7 +296,7 @@ public void increment() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately after the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is incremented.
+     * @return the value associated with the instance after it is incremented
      * @since 3.5
      */
     public byte incrementAndGet() {
@@ -307,7 +307,7 @@ public byte incrementAndGet() {
     /**
      * Returns the value of this MutableByte as an int.
      *
-     * @return the numeric value represented by this object after conversion to type int.
+     * @return the numeric value represented by this object after conversion to type int
      */
     @Override
     public int intValue() {
@@ -317,7 +317,7 @@ public int intValue() {
     /**
      * Returns the value of this MutableByte as a long.
      *
-     * @return the numeric value represented by this object after conversion to type long.
+     * @return the numeric value represented by this object after conversion to type long
      */
     @Override
     public long longValue() {
@@ -327,7 +327,7 @@ public long longValue() {
     /**
      * Sets the value.
      *
-     * @param value  the value to set.
+     * @param value the value to set
      */
     public void setValue(final byte value) {
         this.value = value;
@@ -336,8 +336,8 @@ public void setValue(final byte value) {
     /**
      * Sets the value from any Number instance.
      *
-     * @param value  the value to set, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the value to set, not null
+     * @throws NullPointerException if the object is null
      */
     @Override
     public void setValue(final Number value) {
@@ -347,7 +347,7 @@ public void setValue(final Number value) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
+     * @param operand  the value to subtract, not null
      * @since 2.2
      */
     public void subtract(final byte operand) {
@@ -357,8 +357,8 @@ public void subtract(final byte operand) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to subtract, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void subtract(final Number operand) {
@@ -368,7 +368,7 @@ public void subtract(final Number operand) {
     /**
      * Gets this mutable as an instance of Byte.
      *
-     * @return a Byte instance containing the value from this mutable.
+     * @return a Byte instance containing the value from this mutable
      */
     public Byte toByte() {
         return Byte.valueOf(byteValue());
@@ -377,7 +377,7 @@ public Byte toByte() {
     /**
      * Returns the String value of this mutable.
      *
-     * @return the mutable value as a string.
+     * @return the mutable value as a string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java b/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
index 9a54a0431fa..cf94d014913 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
@@ -54,7 +54,7 @@ public MutableDouble() {
     /**
      * Constructs a new MutableDouble with the specified value.
      *
-     * @param value  the initial value to store.
+     * @param value the initial value to store
      */
     public MutableDouble(final double value) {
         this.value = value;
@@ -63,8 +63,8 @@ public MutableDouble(final double value) {
     /**
      * Constructs a new MutableDouble with the specified value.
      *
-     * @param value  the initial value to store, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the initial value to store, not null
+     * @throws NullPointerException if the object is null
      */
     public MutableDouble(final Number value) {
         this.value = value.doubleValue();
@@ -73,8 +73,8 @@ public MutableDouble(final Number value) {
     /**
      * Constructs a new MutableDouble parsing the given string.
      *
-     * @param value  the string to parse, not null.
-     * @throws NumberFormatException if the string cannot be parsed into a double, see {@link Double#parseDouble(String)}.
+     * @param value  the string to parse, not null
+     * @throws NumberFormatException if the string cannot be parsed into a double, see {@link Double#parseDouble(String)}
      * @since 2.5
      */
     public MutableDouble(final String value) {
@@ -84,7 +84,7 @@ public MutableDouble(final String value) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add.
+     * @param operand  the value to add
      * @since 2.2
      */
     public void add(final double operand) {
@@ -94,8 +94,8 @@ public void add(final double operand) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to add, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void add(final Number operand) {
@@ -106,8 +106,8 @@ public void add(final Number operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
      * @since 3.5
      */
     public double addAndGet(final double operand) {
@@ -119,9 +119,9 @@ public double addAndGet(final double operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public double addAndGet(final Number operand) {
@@ -132,8 +132,8 @@ public double addAndGet(final Number operand) {
     /**
      * Compares this mutable to another in ascending order.
      *
-     * @param other  the other mutable to compare to, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other mutable to compare to, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final MutableDouble other) {
@@ -153,7 +153,7 @@ public void decrement() {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately after the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is decremented.
+     * @return the value associated with the instance after it is decremented
      * @since 3.5
      */
     public double decrementAndGet() {
@@ -164,7 +164,7 @@ public double decrementAndGet() {
     /**
      * Returns the value of this MutableDouble as a double.
      *
-     * @return the numeric value represented by this object after conversion to type double.
+     * @return the numeric value represented by this object after conversion to type double
      */
     @Override
     public double doubleValue() {
@@ -193,8 +193,8 @@ public double doubleValue() {
      * even though {@code +0.0 == -0.0} has the value {@code true}. This allows hashtables to operate properly.</li>
      * </ul>
      *
-     * @param obj the object to compare with, null returns false.
-     * @return {@code true} if the objects are the same; {@code false} otherwise.
+     * @param obj the object to compare with, null returns false
+     * @return {@code true} if the objects are the same; {@code false} otherwise
      */
     @Override
     public boolean equals(final Object obj) {
@@ -205,7 +205,7 @@ public boolean equals(final Object obj) {
     /**
      * Returns the value of this MutableDouble as a float.
      *
-     * @return the numeric value represented by this object after conversion to type float.
+     * @return the numeric value represented by this object after conversion to type float
      */
     @Override
     public float floatValue() {
@@ -216,8 +216,8 @@ public float floatValue() {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
      * @since 3.5
      */
     public double getAndAdd(final double operand) {
@@ -230,9 +230,9 @@ public double getAndAdd(final double operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public double getAndAdd(final Number operand) {
@@ -245,7 +245,7 @@ public double getAndAdd(final Number operand) {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was decremented.
+     * @return the value associated with the instance before it was decremented
      * @since 3.5
      */
     public double getAndDecrement() {
@@ -258,7 +258,7 @@ public double getAndDecrement() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was incremented.
+     * @return the value associated with the instance before it was incremented
      * @since 3.5
      */
     public double getAndIncrement() {
@@ -270,7 +270,7 @@ public double getAndIncrement() {
     /**
      * Gets the value as a Double instance.
      *
-     * @return the value as a Double, never null.
+     * @return the value as a Double, never null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -282,7 +282,7 @@ public Double getValue() {
     /**
      * Returns a suitable hash code for this mutable.
      *
-     * @return a suitable hash code.
+     * @return a suitable hash code
      */
     @Override
     public int hashCode() {
@@ -303,7 +303,7 @@ public void increment() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately after the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is incremented.
+     * @return the value associated with the instance after it is incremented
      * @since 3.5
      */
     public double incrementAndGet() {
@@ -315,7 +315,7 @@ public double incrementAndGet() {
     /**
      * Returns the value of this MutableDouble as an int.
      *
-     * @return the numeric value represented by this object after conversion to type int.
+     * @return the numeric value represented by this object after conversion to type int
      */
     @Override
     public int intValue() {
@@ -325,7 +325,7 @@ public int intValue() {
     /**
      * Checks whether the double value is infinite.
      *
-     * @return true if infinite.
+     * @return true if infinite
      */
     public boolean isInfinite() {
         return Double.isInfinite(value);
@@ -334,7 +334,7 @@ public boolean isInfinite() {
     /**
      * Checks whether the double value is the special NaN value.
      *
-     * @return true if NaN.
+     * @return true if NaN
      */
     public boolean isNaN() {
         return Double.isNaN(value);
@@ -343,7 +343,7 @@ public boolean isNaN() {
     /**
      * Returns the value of this MutableDouble as a long.
      *
-     * @return the numeric value represented by this object after conversion to type long.
+     * @return the numeric value represented by this object after conversion to type long
      */
     @Override
     public long longValue() {
@@ -353,7 +353,7 @@ public long longValue() {
     /**
      * Sets the value.
      *
-     * @param value  the value to set.
+     * @param value the value to set
      */
     public void setValue(final double value) {
         this.value = value;
@@ -362,8 +362,8 @@ public void setValue(final double value) {
     /**
      * Sets the value from any Number instance.
      *
-     * @param value  the value to set, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the value to set, not null
+     * @throws NullPointerException if the object is null
      */
     @Override
     public void setValue(final Number value) {
@@ -373,7 +373,7 @@ public void setValue(final Number value) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
+     * @param operand  the value to subtract, not null
      * @since 2.2
      */
     public void subtract(final double operand) {
@@ -383,8 +383,8 @@ public void subtract(final double operand) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to subtract, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void subtract(final Number operand) {
@@ -394,7 +394,7 @@ public void subtract(final Number operand) {
     /**
      * Gets this mutable as an instance of Double.
      *
-     * @return a Double instance containing the value from this mutable, never null.
+     * @return a Double instance containing the value from this mutable, never null
      */
     public Double toDouble() {
         return Double.valueOf(doubleValue());
@@ -403,7 +403,7 @@ public Double toDouble() {
     /**
      * Returns the String value of this mutable.
      *
-     * @return the mutable value as a string.
+     * @return the mutable value as a string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java b/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
index 1038fca8ca5..785177b7c69 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
@@ -54,7 +54,7 @@ public MutableFloat() {
     /**
      * Constructs a new MutableFloat with the specified value.
      *
-     * @param value  the initial value to store.
+     * @param value the initial value to store
      */
     public MutableFloat(final float value) {
         this.value = value;
@@ -63,8 +63,8 @@ public MutableFloat(final float value) {
     /**
      * Constructs a new MutableFloat with the specified value.
      *
-     * @param value  the initial value to store, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the initial value to store, not null
+     * @throws NullPointerException if the object is null
      */
     public MutableFloat(final Number value) {
         this.value = value.floatValue();
@@ -73,8 +73,8 @@ public MutableFloat(final Number value) {
     /**
      * Constructs a new MutableFloat parsing the given string.
      *
-     * @param value  the string to parse, not null.
-     * @throws NumberFormatException if the string cannot be parsed into a float, see {@link Float#parseFloat(String)}.
+     * @param value  the string to parse, not null
+     * @throws NumberFormatException if the string cannot be parsed into a float, see {@link Float#parseFloat(String)}
      * @since 2.5
      */
     public MutableFloat(final String value) {
@@ -84,7 +84,7 @@ public MutableFloat(final String value) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
+     * @param operand  the value to add, not null
      * @since 2.2
      */
     public void add(final float operand) {
@@ -94,8 +94,8 @@ public void add(final float operand) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to add, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void add(final Number operand) {
@@ -106,8 +106,8 @@ public void add(final Number operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
      * @since 3.5
      */
     public float addAndGet(final float operand) {
@@ -119,9 +119,9 @@ public float addAndGet(final float operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public float addAndGet(final Number operand) {
@@ -132,8 +132,8 @@ public float addAndGet(final Number operand) {
     /**
      * Compares this mutable to another in ascending order.
      *
-     * @param other  the other mutable to compare to, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other mutable to compare to, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final MutableFloat other) {
@@ -153,7 +153,7 @@ public void decrement() {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately after the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is decremented.
+     * @return the value associated with the instance after it is decremented
      * @since 3.5
      */
     public float decrementAndGet() {
@@ -164,7 +164,7 @@ public float decrementAndGet() {
     /**
      * Returns the value of this MutableFloat as a double.
      *
-     * @return the numeric value represented by this object after conversion to type double.
+     * @return the numeric value represented by this object after conversion to type double
      */
     @Override
     public double doubleValue() {
@@ -196,8 +196,8 @@ public double doubleValue() {
      * This definition allows hashtables to operate properly.
      * </p>
      *
-     * @param obj the object to compare with, null returns false.
-     * @return {@code true} if the objects are the same; {@code false} otherwise.
+     * @param obj the object to compare with, null returns false
+     * @return {@code true} if the objects are the same; {@code false} otherwise
      * @see Float#floatToIntBits(float)
      */
     @Override
@@ -209,7 +209,7 @@ public boolean equals(final Object obj) {
     /**
      * Returns the value of this MutableFloat as a float.
      *
-     * @return the numeric value represented by this object after conversion to type float.
+     * @return the numeric value represented by this object after conversion to type float
      */
     @Override
     public float floatValue() {
@@ -220,8 +220,8 @@ public float floatValue() {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
      * @since 3.5
      */
     public float getAndAdd(final float operand) {
@@ -234,9 +234,9 @@ public float getAndAdd(final float operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public float getAndAdd(final Number operand) {
@@ -249,7 +249,7 @@ public float getAndAdd(final Number operand) {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was decremented.
+     * @return the value associated with the instance before it was decremented
      * @since 3.5
      */
     public float getAndDecrement() {
@@ -262,7 +262,7 @@ public float getAndDecrement() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was incremented.
+     * @return the value associated with the instance before it was incremented
      * @since 3.5
      */
     public float getAndIncrement() {
@@ -274,7 +274,7 @@ public float getAndIncrement() {
     /**
      * Gets the value as a Float instance.
      *
-     * @return the value as a Float, never null.
+     * @return the value as a Float, never null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -286,7 +286,7 @@ public Float getValue() {
     /**
      * Returns a suitable hash code for this mutable.
      *
-     * @return a suitable hash code.
+     * @return a suitable hash code
      */
     @Override
     public int hashCode() {
@@ -306,7 +306,7 @@ public void increment() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately after the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is incremented.
+     * @return the value associated with the instance after it is incremented
      * @since 3.5
      */
     public float incrementAndGet() {
@@ -318,7 +318,7 @@ public float incrementAndGet() {
     /**
      * Returns the value of this MutableFloat as an int.
      *
-     * @return the numeric value represented by this object after conversion to type int.
+     * @return the numeric value represented by this object after conversion to type int
      */
     @Override
     public int intValue() {
@@ -337,7 +337,7 @@ public boolean isInfinite() {
     /**
      * Checks whether the float value is the special NaN value.
      *
-     * @return true if NaN.
+     * @return true if NaN
      */
     public boolean isNaN() {
         return Float.isNaN(value);
@@ -346,7 +346,7 @@ public boolean isNaN() {
     /**
      * Returns the value of this MutableFloat as a long.
      *
-     * @return the numeric value represented by this object after conversion to type long.
+     * @return the numeric value represented by this object after conversion to type long
      */
     @Override
     public long longValue() {
@@ -356,7 +356,7 @@ public long longValue() {
     /**
      * Sets the value.
      *
-     * @param value  the value to set.
+     * @param value the value to set
      */
     public void setValue(final float value) {
         this.value = value;
@@ -365,8 +365,8 @@ public void setValue(final float value) {
     /**
      * Sets the value from any Number instance.
      *
-     * @param value  the value to set, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the value to set, not null
+     * @throws NullPointerException if the object is null
      */
     @Override
     public void setValue(final Number value) {
@@ -376,7 +376,7 @@ public void setValue(final Number value) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract.
+     * @param operand  the value to subtract
      * @since 2.2
      */
     public void subtract(final float operand) {
@@ -386,8 +386,8 @@ public void subtract(final float operand) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to subtract, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void subtract(final Number operand) {
@@ -397,7 +397,7 @@ public void subtract(final Number operand) {
     /**
      * Gets this mutable as an instance of Float.
      *
-     * @return a Float instance containing the value from this mutable, never null.
+     * @return a Float instance containing the value from this mutable, never null
      */
     public Float toFloat() {
         return Float.valueOf(floatValue());
@@ -406,7 +406,7 @@ public Float toFloat() {
     /**
      * Returns the String value of this mutable.
      *
-     * @return the mutable value as a string.
+     * @return the mutable value as a string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java b/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
index 15d23ef6f94..8aa904686b0 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
@@ -52,7 +52,7 @@ public MutableInt() {
     /**
      * Constructs a new MutableInt with the specified value.
      *
-     * @param value  the initial value to store.
+     * @param value the initial value to store
      */
     public MutableInt(final int value) {
         this.value = value;
@@ -61,8 +61,8 @@ public MutableInt(final int value) {
     /**
      * Constructs a new MutableInt with the specified value.
      *
-     * @param value  the initial value to store, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the initial value to store, not null
+     * @throws NullPointerException if the object is null
      */
     public MutableInt(final Number value) {
         this.value = value.intValue();
@@ -71,8 +71,8 @@ public MutableInt(final Number value) {
     /**
      * Constructs a new MutableInt parsing the given string.
      *
-     * @param value  the string to parse, not null.
-     * @throws NumberFormatException if the string cannot be parsed into an int, see {@link Integer#parseInt(String)}.
+     * @param value  the string to parse, not null
+     * @throws NumberFormatException if the string cannot be parsed into an int, see {@link Integer#parseInt(String)}
      * @since 2.5
      */
     public MutableInt(final String value) {
@@ -82,7 +82,7 @@ public MutableInt(final String value) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
+     * @param operand  the value to add, not null
      * @since 2.2
      */
     public void add(final int operand) {
@@ -92,8 +92,8 @@ public void add(final int operand) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to add, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void add(final Number operand) {
@@ -104,8 +104,8 @@ public void add(final Number operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
      * @since 3.5
      */
     public int addAndGet(final int operand) {
@@ -117,9 +117,9 @@ public int addAndGet(final int operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public int addAndGet(final Number operand) {
@@ -130,8 +130,8 @@ public int addAndGet(final Number operand) {
     /**
      * Compares this mutable to another in ascending order.
      *
-     * @param other  the other mutable to compare to, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other mutable to compare to, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final MutableInt other) {
@@ -151,7 +151,7 @@ public void decrement() {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately after the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is decremented.
+     * @return the value associated with the instance after it is decremented
      * @since 3.5
      */
     public int decrementAndGet() {
@@ -162,7 +162,7 @@ public int decrementAndGet() {
     /**
      * Returns the value of this MutableInt as a double.
      *
-     * @return the numeric value represented by this object after conversion to type double.
+     * @return the numeric value represented by this object after conversion to type double
      */
     @Override
     public double doubleValue() {
@@ -174,8 +174,8 @@ public double doubleValue() {
      * not {@code null} and is a {@link MutableInt} object that contains the same {@code int} value
      * as this object.
      *
-     * @param obj  the object to compare with, null returns false.
-     * @return {@code true} if the objects are the same; {@code false} otherwise.
+     * @param obj  the object to compare with, null returns false
+     * @return {@code true} if the objects are the same; {@code false} otherwise
      */
     @Override
     public boolean equals(final Object obj) {
@@ -188,7 +188,7 @@ public boolean equals(final Object obj) {
     /**
      * Returns the value of this MutableInt as a float.
      *
-     * @return the numeric value represented by this object after conversion to type float.
+     * @return the numeric value represented by this object after conversion to type float
      */
     @Override
     public float floatValue() {
@@ -199,8 +199,8 @@ public float floatValue() {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
      * @since 3.5
      */
     public int getAndAdd(final int operand) {
@@ -213,9 +213,9 @@ public int getAndAdd(final int operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public int getAndAdd(final Number operand) {
@@ -228,7 +228,7 @@ public int getAndAdd(final Number operand) {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was decremented.
+     * @return the value associated with the instance before it was decremented
      * @since 3.5
      */
     public int getAndDecrement() {
@@ -241,7 +241,7 @@ public int getAndDecrement() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was incremented.
+     * @return the value associated with the instance before it was incremented
      * @since 3.5
      */
     public int getAndIncrement() {
@@ -253,7 +253,7 @@ public int getAndIncrement() {
     /**
      * Gets the value as a Integer instance.
      *
-     * @return the value as a Integer, never null.
+     * @return the value as a Integer, never null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -265,7 +265,7 @@ public Integer getValue() {
     /**
      * Returns a suitable hash code for this mutable.
      *
-     * @return a suitable hash code.
+     * @return a suitable hash code
      */
     @Override
     public int hashCode() {
@@ -285,7 +285,7 @@ public void increment() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately after the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is incremented.
+     * @return the value associated with the instance after it is incremented
      * @since 3.5
      */
     public int incrementAndGet() {
@@ -297,7 +297,7 @@ public int incrementAndGet() {
     /**
      * Returns the value of this MutableInt as an int.
      *
-     * @return the numeric value represented by this object after conversion to type int.
+     * @return the numeric value represented by this object after conversion to type int
      */
     @Override
     public int intValue() {
@@ -307,7 +307,7 @@ public int intValue() {
     /**
      * Returns the value of this MutableInt as a long.
      *
-     * @return the numeric value represented by this object after conversion to type long.
+     * @return the numeric value represented by this object after conversion to type long
      */
     @Override
     public long longValue() {
@@ -317,7 +317,7 @@ public long longValue() {
     /**
      * Sets the value.
      *
-     * @param value  the value to set.
+     * @param value the value to set
      */
     public void setValue(final int value) {
         this.value = value;
@@ -326,8 +326,8 @@ public void setValue(final int value) {
     /**
      * Sets the value from any Number instance.
      *
-     * @param value  the value to set, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the value to set, not null
+     * @throws NullPointerException if the object is null
      */
     @Override
     public void setValue(final Number value) {
@@ -337,7 +337,7 @@ public void setValue(final Number value) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
+     * @param operand  the value to subtract, not null
      * @since 2.2
      */
     public void subtract(final int operand) {
@@ -347,8 +347,8 @@ public void subtract(final int operand) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to subtract, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void subtract(final Number operand) {
@@ -358,7 +358,7 @@ public void subtract(final Number operand) {
     /**
      * Gets this mutable as an instance of Integer.
      *
-     * @return an Integer instance containing the value from this mutable, never null.
+     * @return an Integer instance containing the value from this mutable, never null
      */
     public Integer toInteger() {
         return Integer.valueOf(intValue());
@@ -367,7 +367,7 @@ public Integer toInteger() {
     /**
      * Returns the String value of this mutable.
      *
-     * @return the mutable value as a string.
+     * @return the mutable value as a string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
index 86b497a94dd..3b1b414d914 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
@@ -52,7 +52,7 @@ public MutableLong() {
     /**
      * Constructs a new MutableLong with the specified value.
      *
-     * @param value  the initial value to store.
+     * @param value the initial value to store
      */
     public MutableLong(final long value) {
         this.value = value;
@@ -61,8 +61,8 @@ public MutableLong(final long value) {
     /**
      * Constructs a new MutableLong with the specified value.
      *
-     * @param value  the initial value to store, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the initial value to store, not null
+     * @throws NullPointerException if the object is null
      */
     public MutableLong(final Number value) {
         this.value = value.longValue();
@@ -71,8 +71,8 @@ public MutableLong(final Number value) {
     /**
      * Constructs a new MutableLong parsing the given string.
      *
-     * @param value  the string to parse, not null.
-     * @throws NumberFormatException if the string cannot be parsed into a long, see {@link Long#parseLong(String)}.
+     * @param value  the string to parse, not null
+     * @throws NumberFormatException if the string cannot be parsed into a long, see {@link Long#parseLong(String)}
      * @since 2.5
      */
     public MutableLong(final String value) {
@@ -82,7 +82,7 @@ public MutableLong(final String value) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
+     * @param operand  the value to add, not null
      * @since 2.2
      */
     public void add(final long operand) {
@@ -92,8 +92,8 @@ public void add(final long operand) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to add, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void add(final Number operand) {
@@ -104,8 +104,8 @@ public void add(final Number operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
      * @since 3.5
      */
     public long addAndGet(final long operand) {
@@ -117,9 +117,9 @@ public long addAndGet(final long operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public long addAndGet(final Number operand) {
@@ -130,8 +130,8 @@ public long addAndGet(final Number operand) {
     /**
      * Compares this mutable to another in ascending order.
      *
-     * @param other  the other mutable to compare to, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other mutable to compare to, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final MutableLong other) {
@@ -151,7 +151,7 @@ public void decrement() {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately after the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is decremented.
+     * @return the value associated with the instance after it is decremented
      * @since 3.5
      */
     public long decrementAndGet() {
@@ -162,7 +162,7 @@ public long decrementAndGet() {
     /**
      * Returns the value of this MutableLong as a double.
      *
-     * @return the numeric value represented by this object after conversion to type double.
+     * @return the numeric value represented by this object after conversion to type double
      */
     @Override
     public double doubleValue() {
@@ -174,8 +174,8 @@ public double doubleValue() {
      * is not {@code null} and is a {@link MutableLong} object that contains the same {@code long}
      * value as this object.
      *
-     * @param obj  the object to compare with, null returns false.
-     * @return {@code true} if the objects are the same; {@code false} otherwise.
+     * @param obj  the object to compare with, null returns false
+     * @return {@code true} if the objects are the same; {@code false} otherwise
      */
     @Override
     public boolean equals(final Object obj) {
@@ -188,7 +188,7 @@ public boolean equals(final Object obj) {
     /**
      * Returns the value of this MutableLong as a float.
      *
-     * @return the numeric value represented by this object after conversion to type float.
+     * @return the numeric value represented by this object after conversion to type float
      */
     @Override
     public float floatValue() {
@@ -199,8 +199,8 @@ public float floatValue() {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
      * @since 3.5
      */
     public long getAndAdd(final long operand) {
@@ -213,9 +213,9 @@ public long getAndAdd(final long operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public long getAndAdd(final Number operand) {
@@ -228,7 +228,7 @@ public long getAndAdd(final Number operand) {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was decremented.
+     * @return the value associated with the instance before it was decremented
      * @since 3.5
      */
     public long getAndDecrement() {
@@ -241,7 +241,7 @@ public long getAndDecrement() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was incremented.
+     * @return the value associated with the instance before it was incremented
      * @since 3.5
      */
     public long getAndIncrement() {
@@ -253,7 +253,7 @@ public long getAndIncrement() {
     /**
      * Gets the value as a Long instance.
      *
-     * @return the value as a Long, never null.
+     * @return the value as a Long, never null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -265,7 +265,7 @@ public Long getValue() {
     /**
      * Returns a suitable hash code for this mutable.
      *
-     * @return a suitable hash code.
+     * @return a suitable hash code
      */
     @Override
     public int hashCode() {
@@ -285,7 +285,7 @@ public void increment() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately after the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is incremented.
+     * @return the value associated with the instance after it is incremented
      * @since 3.5
      */
     public long incrementAndGet() {
@@ -297,7 +297,7 @@ public long incrementAndGet() {
     /**
      * Returns the value of this MutableLong as an int.
      *
-     * @return the numeric value represented by this object after conversion to type int.
+     * @return the numeric value represented by this object after conversion to type int
      */
     @Override
     public int intValue() {
@@ -307,7 +307,7 @@ public int intValue() {
     /**
      * Returns the value of this MutableLong as a long.
      *
-     * @return the numeric value represented by this object after conversion to type long.
+     * @return the numeric value represented by this object after conversion to type long
      */
     @Override
     public long longValue() {
@@ -317,7 +317,7 @@ public long longValue() {
     /**
      * Sets the value.
      *
-     * @param value  the value to set.
+     * @param value the value to set
      */
     public void setValue(final long value) {
         this.value = value;
@@ -326,8 +326,8 @@ public void setValue(final long value) {
     /**
      * Sets the value from any Number instance.
      *
-     * @param value  the value to set, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the value to set, not null
+     * @throws NullPointerException if the object is null
      */
     @Override
     public void setValue(final Number value) {
@@ -337,7 +337,7 @@ public void setValue(final Number value) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
+     * @param operand  the value to subtract, not null
      * @since 2.2
      */
     public void subtract(final long operand) {
@@ -347,8 +347,8 @@ public void subtract(final long operand) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to subtract, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void subtract(final Number operand) {
@@ -358,7 +358,7 @@ public void subtract(final Number operand) {
     /**
      * Gets this mutable as an instance of Long.
      *
-     * @return a Long instance containing the value from this mutable, never null.
+     * @return a Long instance containing the value from this mutable, never null
      */
     public Long toLong() {
         return Long.valueOf(longValue());
@@ -367,7 +367,7 @@ public Long toLong() {
     /**
      * Returns the String value of this mutable.
      *
-     * @return the mutable value as a string.
+     * @return the mutable value as a string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java b/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java
index 19f2be9982a..94f260543df 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java
@@ -27,7 +27,7 @@
  * This class was created before the introduction of the {@link java.util.concurrent.atomic} package and the {@link AtomicReference} class.
  * </p>
  *
- * @param <T> the type to set and get.
+ * @param <T> the type to set and get
  * @see AtomicReference
  * @since 2.1
  */
@@ -52,7 +52,7 @@ public MutableObject() {
     /**
      * Constructs a new MutableObject with the specified value.
      *
-     * @param value  the initial value to store.
+     * @param value the initial value to store
      */
     public MutableObject(final T value) {
         this.value = value;
@@ -63,10 +63,10 @@ public MutableObject(final T value) {
      * is not {@code null} and is a {@link MutableObject} object that contains the same {@link T}
      * value as this object.
      *
-     * @param obj  the object to compare with, {@code null} returns {@code false}.
-     * @return  {@code true} if the objects are the same;
+     * @param obj  the object to compare with, {@code null} returns {@code false}
+     * @return {@code true} if the objects are the same;
      *          {@code true} if the objects have equivalent {@code value} fields;
-     *          {@code false} otherwise.
+     *          {@code false} otherwise
      */
     @Override
     public boolean equals(final Object obj) {
@@ -86,7 +86,7 @@ public boolean equals(final Object obj) {
     /**
      * Gets the value.
      *
-     * @return the value, may be null.
+     * @return the value, may be null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -98,7 +98,7 @@ public T getValue() {
     /**
      * Returns the value's hash code or {@code 0} if the value is {@code null}.
      *
-     * @return the value's hash code or {@code 0} if the value is {@code null}.
+     * @return the value's hash code or {@code 0} if the value is {@code null}
      */
     @Override
     public int hashCode() {
@@ -108,7 +108,7 @@ public int hashCode() {
     /**
      * Sets the value.
      *
-     * @param value  the value to set.
+     * @param value the value to set
      */
     @Override
     public void setValue(final T value) {
@@ -118,7 +118,7 @@ public void setValue(final T value) {
     /**
      * Returns the String value of this mutable.
      *
-     * @return the mutable value as a string.
+     * @return the mutable value as a string
      */
     @Override
     public String toString() {
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 2b2594cd6ad..c638b0a2a3b 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
@@ -52,8 +52,8 @@ public MutableShort() {
     /**
      * Constructs a new MutableShort with the specified value.
      *
-     * @param value  the initial value to store, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the initial value to store, not null
+     * @throws NullPointerException if the object is null
      */
     public MutableShort(final Number value) {
         this.value = value.shortValue();
@@ -62,7 +62,7 @@ public MutableShort(final Number value) {
     /**
      * Constructs a new MutableShort with the specified value.
      *
-     * @param value  the initial value to store.
+     * @param value the initial value to store
      */
     public MutableShort(final short value) {
         this.value = value;
@@ -71,8 +71,8 @@ public MutableShort(final short value) {
     /**
      * Constructs a new MutableShort parsing the given string.
      *
-     * @param value  the string to parse, not null.
-     * @throws NumberFormatException if the string cannot be parsed into a short, see {@link Short#parseShort(String)}.
+     * @param value  the string to parse, not null
+     * @throws NumberFormatException if the string cannot be parsed into a short, see {@link Short#parseShort(String)}
      * @since 2.5
      */
     public MutableShort(final String value) {
@@ -82,8 +82,8 @@ public MutableShort(final String value) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to add, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void add(final Number operand) {
@@ -93,7 +93,7 @@ public void add(final Number operand) {
     /**
      * Adds a value to the value of this instance.
      *
-     * @param operand  the value to add, not null.
+     * @param operand  the value to add, not null
      * @since 2.2
      */
     public void add(final short operand) {
@@ -104,9 +104,9 @@ public void add(final short operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public short addAndGet(final Number operand) {
@@ -118,8 +118,8 @@ public short addAndGet(final Number operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately after the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance after adding the operand.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance after adding the operand
      * @since 3.5
      */
     public short addAndGet(final short operand) {
@@ -130,8 +130,8 @@ public short addAndGet(final short operand) {
     /**
      * Compares this mutable to another in ascending order.
      *
-     * @param other  the other mutable to compare to, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other mutable to compare to, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final MutableShort other) {
@@ -151,7 +151,7 @@ public void decrement() {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately after the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is decremented.
+     * @return the value associated with the instance after it is decremented
      * @since 3.5
      */
     public short decrementAndGet() {
@@ -162,7 +162,7 @@ public short decrementAndGet() {
     /**
      * Returns the value of this MutableShort as a double.
      *
-     * @return the numeric value represented by this object after conversion to type double.
+     * @return the numeric value represented by this object after conversion to type double
      */
     @Override
     public double doubleValue() {
@@ -174,8 +174,8 @@ public double doubleValue() {
      * is not {@code null} and is a {@link MutableShort} object that contains the same {@code short}
      * value as this object.
      *
-     * @param obj  the object to compare with, null returns false.
-     * @return {@code true} if the objects are the same; {@code false} otherwise.
+     * @param obj  the object to compare with, null returns false
+     * @return {@code true} if the objects are the same; {@code false} otherwise
      */
     @Override
     public boolean equals(final Object obj) {
@@ -188,7 +188,7 @@ public boolean equals(final Object obj) {
     /**
      * Returns the value of this MutableShort as a float.
      *
-     * @return the numeric value represented by this object after conversion to type float.
+     * @return the numeric value represented by this object after conversion to type float
      */
     @Override
     public float floatValue() {
@@ -199,9 +199,9 @@ public float floatValue() {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @throws NullPointerException if {@code operand} is null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
+     * @throws NullPointerException if {@code operand} is null
      * @since 3.5
      */
     public short getAndAdd(final Number operand) {
@@ -214,8 +214,8 @@ public short getAndAdd(final Number operand) {
      * Increments this instance's value by {@code operand}; this method returns the value associated with the instance
      * immediately prior to the addition operation. This method is not thread safe.
      *
-     * @param operand the quantity to add, not null.
-     * @return the value associated with this instance immediately before the operand was added.
+     * @param operand the quantity to add, not null
+     * @return the value associated with this instance immediately before the operand was added
      * @since 3.5
      */
     public short getAndAdd(final short operand) {
@@ -228,7 +228,7 @@ public short getAndAdd(final short operand) {
      * Decrements this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the decrement operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was decremented.
+     * @return the value associated with the instance before it was decremented
      * @since 3.5
      */
     public short getAndDecrement() {
@@ -241,7 +241,7 @@ public short getAndDecrement() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately prior to the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance before it was incremented.
+     * @return the value associated with the instance before it was incremented
      * @since 3.5
      */
     public short getAndIncrement() {
@@ -253,7 +253,7 @@ public short getAndIncrement() {
     /**
      * Gets the value as a Short instance.
      *
-     * @return the value as a Short, never null.
+     * @return the value as a Short, never null
      * @deprecated Use {@link #get()}.
      */
     @Deprecated
@@ -265,7 +265,7 @@ public Short getValue() {
     /**
      * Returns a suitable hash code for this mutable.
      *
-     * @return a suitable hash code.
+     * @return a suitable hash code
      */
     @Override
     public int hashCode() {
@@ -285,7 +285,7 @@ public void increment() {
      * Increments this instance's value by 1; this method returns the value associated with the instance
      * immediately after the increment operation. This method is not thread safe.
      *
-     * @return the value associated with the instance after it is incremented.
+     * @return the value associated with the instance after it is incremented
      * @since 3.5
      */
     public short incrementAndGet() {
@@ -296,7 +296,7 @@ public short incrementAndGet() {
     /**
      * Returns the value of this MutableShort as an int.
      *
-     * @return the numeric value represented by this object after conversion to type int.
+     * @return the numeric value represented by this object after conversion to type int
      */
     @Override
     public int intValue() {
@@ -306,7 +306,7 @@ public int intValue() {
     /**
      * Returns the value of this MutableShort as a long.
      *
-     * @return the numeric value represented by this object after conversion to type long.
+     * @return the numeric value represented by this object after conversion to type long
      */
     @Override
     public long longValue() {
@@ -316,8 +316,8 @@ public long longValue() {
     /**
      * Sets the value from any Number instance.
      *
-     * @param value  the value to set, not null.
-     * @throws NullPointerException if the object is null.
+     * @param value  the value to set, not null
+     * @throws NullPointerException if the object is null
      */
     @Override
     public void setValue(final Number value) {
@@ -327,7 +327,7 @@ public void setValue(final Number value) {
     /**
      * Sets the value.
      *
-     * @param value  the value to set
+     * @param value the value to set
      */
     public void setValue(final short value) {
         this.value = value;
@@ -337,7 +337,7 @@ public void setValue(final short value) {
     /**
      * Returns the value of this MutableShort as a short.
      *
-     * @return the numeric value represented by this object after conversion to type short.
+     * @return the numeric value represented by this object after conversion to type short
      */
     @Override
     public short shortValue() {
@@ -347,8 +347,8 @@ public short shortValue() {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
-     * @throws NullPointerException if the object is null.
+     * @param operand  the value to subtract, not null
+     * @throws NullPointerException if the object is null
      * @since 2.2
      */
     public void subtract(final Number operand) {
@@ -358,7 +358,7 @@ public void subtract(final Number operand) {
     /**
      * Subtracts a value from the value of this instance.
      *
-     * @param operand  the value to subtract, not null.
+     * @param operand  the value to subtract, not null
      * @since 2.2
      */
     public void subtract(final short operand) {
@@ -368,7 +368,7 @@ public void subtract(final short operand) {
     /**
      * Gets this mutable as an instance of Short.
      *
-     * @return a Short instance containing the value from this mutable, never null.
+     * @return a Short instance containing the value from this mutable, never null
      */
     public Short toShort() {
         return Short.valueOf(shortValue());
@@ -377,7 +377,7 @@ public Short toShort() {
     /**
      * Returns the String value of this mutable.
      *
-     * @return the mutable value as a string.
+     * @return the mutable value as a string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/reflect/AccessibleObjects.java b/src/main/java/org/apache/commons/lang3/reflect/AccessibleObjects.java
index ea1f6369672..533f34089a3 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/AccessibleObjects.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/AccessibleObjects.java
@@ -27,8 +27,8 @@ class AccessibleObjects {
     /**
      * Delegates to {@link AccessibleObject#isAccessible()} if {@code accessibleObject} isn't null.
      *
-     * @param accessibleObject The accessible object.
-     * @return The value of the object's {@code accessible} flag
+     * @param accessibleObject the accessible object
+     * @return the value of the object's {@code accessible} flag
      */
     static boolean isAccessible(final AccessibleObject accessibleObject) {
         return accessibleObject == null || accessibleObject.isAccessible();
@@ -38,8 +38,8 @@ static boolean isAccessible(final AccessibleObject accessibleObject) {
      * Delegates to {@link AccessibleObject#setAccessible(boolean)} only if {@link AccessibleObject#isAccessible()} returns false. This avoid a
      * permission check if there is a security manager.
      *
-     * @param accessibleObject The accessible object.
-     * @return Whether {@link AccessibleObject#setAccessible(boolean)} was called.
+     * @param accessibleObject the accessible object
+     * @return whether {@link AccessibleObject#setAccessible(boolean)} was called
      */
     static boolean setAccessible(final AccessibleObject accessibleObject) {
         if (!isAccessible(accessibleObject)) {
diff --git a/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java b/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
index 2fb8660ef49..ef7d24d5247 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
@@ -51,14 +51,14 @@ public class ConstructorUtils {
      * This finds the constructor and ensures that it is accessible. The constructor signature must match the parameter types exactly.
      * </p>
      *
-     * @param <T>            the constructor type.
-     * @param cls            the class to find a constructor for, not {@code null}.
-     * @param parameterTypes the array of parameter types, {@code null} treated as empty.
-     * @return the constructor, {@code null} if no matching accessible constructor found.
+     * @param <T>            the constructor type
+     * @param cls            the class to find a constructor for, not {@code null}
+     * @param parameterTypes the array of parameter types, {@code null} treated as empty
+     * @return the constructor, {@code null} if no matching accessible constructor found
      * @throws NullPointerException if {@code cls} is {@code null}
-     * @throws SecurityException    Thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class loader
+     * @throws SecurityException    thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class loader
      *                              for the class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the package of the
-     *                              class.
+     *                              class
      * @see Class#getConstructor
      * @see #getAccessibleConstructor(java.lang.reflect.Constructor)
      */
@@ -78,13 +78,13 @@ public static <T> Constructor<T> getAccessibleConstructor(final Class<T> cls, fi
      * This simply ensures that the constructor is accessible.
      * </p>
      *
-     * @param <T>  the constructor type.
-     * @param ctor the prototype constructor object, not {@code null}.
-     * @return the constructor, {@code null} if no matching accessible constructor found.
-     * @see SecurityManager
+     * @param <T>  the constructor type
+     * @param ctor the prototype constructor object, not {@code null}
+     * @return the constructor, {@code null} if no matching accessible constructor found
      * @throws NullPointerException if {@code ctor} is {@code null}
-     * @throws SecurityException    Thrown if a security manager is present and a caller's class loader is not the same as or an ancestor of the class loader
-     *                              for a class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the package of the class.
+     * @throws SecurityException    thrown if a security manager is present and a caller's class loader is not the same as or an ancestor of the class loader
+     *                              for a class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the package of the class
+     * @see SecurityManager
      */
     public static <T> Constructor<T> getAccessibleConstructor(final Constructor<T> ctor) {
         Objects.requireNonNull(ctor, "ctor");
@@ -103,13 +103,13 @@ public static <T> Constructor<T> getAccessibleConstructor(final Constructor<T> c
      * signatures are assignment-compatible with the parameter types. The first assignment-compatible matching constructor is returned.
      * </p>
      *
-     * @param <T>            the constructor type.
-     * @param cls            the class to find a constructor for, not {@code null}.
-     * @param parameterTypes find method with compatible parameters.
-     * @return the constructor, null if no matching accessible constructor found.
-     * @throws NullPointerException Thrown if {@code cls} is {@code null}
-     * @throws SecurityException    Thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class loader for the
-     *                              class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the package of the class.
+     * @param <T>            the constructor type
+     * @param cls            the class to find a constructor for, not {@code null}
+     * @param parameterTypes find method with compatible parameters
+     * @return the constructor, null if no matching accessible constructor found
+     * @throws NullPointerException thrown if {@code cls} is {@code null}
+     * @throws SecurityException    thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class loader for the
+     *                              class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the package of the class
      * @see SecurityManager#checkPackageAccess(String)
      */
     public static <T> Constructor<T> getMatchingAccessibleConstructor(final Class<T> cls, final Class<?>... parameterTypes) {
@@ -153,27 +153,27 @@ public static <T> Constructor<T> getMatchingAccessibleConstructor(final Class<T>
      * This locates and calls a constructor. The constructor signature must match the argument types by assignment compatibility.
      * </p>
      *
-     * @param <T>  the type to be constructed.
-     * @param cls  the class to be constructed, not {@code null}.
-     * @param args the array of arguments, {@code null} treated as empty.
-     * @return new instance of {@code cls}, not {@code null}.
-     * @throws NullPointerException        Thrown if {@code cls} is {@code null}.
-     * @throws NoSuchMethodException       Thrown if a matching constructor cannot be found.
-     * @throws IllegalAccessException      Thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param <T>  the type to be constructed
+     * @param cls  the class to be constructed, not {@code null}
+     * @param args the array of arguments, {@code null} treated as empty
+     * @return new instance of {@code cls}, not {@code null}
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the number of actual and formal parameters differ; or</li>
      *                                     <li>an unwrapping conversion for primitive arguments fails; or</li>
      *                                     <li>after possible unwrapping, a parameter value cannot be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion; if this constructor pertains to an enum type.</li>
      *                                     </ul>
-     * @throws InstantiationException      Thrown if the class that declares the underlying constructor represents an abstract class.
-     * @throws InvocationTargetException   Thrown if the underlying constructor throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
-     * @throws SecurityException           Thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
+     * @throws InstantiationException      thrown if the class that declares the underlying constructor represents an abstract class
+     * @throws InvocationTargetException   thrown if the underlying constructor throws an exception
+     * @throws NoSuchMethodException       thrown if a matching constructor cannot be found
+     * @throws NullPointerException        thrown if {@code cls} is {@code null}
+     * @throws SecurityException           thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
      *                                     loader for the class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the
-     *                                     package of the class.
+     *                                     package of the class
      * @see #invokeConstructor(Class, Object[], Class[])
      */
     public static <T> T invokeConstructor(final Class<T> cls, final Object... args)
@@ -189,28 +189,28 @@ public static <T> T invokeConstructor(final Class<T> cls, final Object... args)
      * This locates and calls a constructor. The constructor signature must match the parameter types by assignment compatibility.
      * </p>
      *
-     * @param <T>            the type to be constructed.
-     * @param cls            the class to be constructed, not {@code null}.
-     * @param args           the array of arguments, {@code null} treated as empty.
-     * @param parameterTypes the array of parameter types, {@code null} treated as empty.
+     * @param <T>            the type to be constructed
+     * @param cls            the class to be constructed, not {@code null}
+     * @param args           the array of arguments, {@code null} treated as empty
+     * @param parameterTypes the array of parameter types, {@code null} treated as empty
      * @return new instance of {@code cls}, not {@code null}
-     * @throws NullPointerException        Thrown if {@code cls} is {@code null}.
-     * @throws NoSuchMethodException       Thrown if a matching constructor cannot be found.
-     * @throws IllegalAccessException      Thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the number of actual and formal parameters differ; or</li>
      *                                     <li>an unwrapping conversion for primitive arguments fails; or</li>
      *                                     <li>after possible unwrapping, a parameter value cannot be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion; if this constructor pertains to an enum type.</li>
      *                                     </ul>
-     * @throws InstantiationException      Thrown if the class that declares the underlying constructor represents an abstract class.
-     * @throws InvocationTargetException   Thrown if the underlying constructor throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
-     * @throws SecurityException           Thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
+     * @throws InstantiationException      thrown if the class that declares the underlying constructor represents an abstract class
+     * @throws InvocationTargetException   thrown if the underlying constructor throws an exception
+     * @throws NoSuchMethodException       thrown if a matching constructor cannot be found
+     * @throws NullPointerException        thrown if {@code cls} is {@code null}
+     * @throws SecurityException           thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
      *                                     loader for the class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the
-     *                                     package of the class.
+     *                                     package of the class
      * @see Constructor#newInstance(Object...)
      * @see Constructor#newInstance
      */
@@ -231,27 +231,27 @@ public static <T> T invokeConstructor(final Class<T> cls, final Object[] args, f
      * This locates and calls a constructor. The constructor signature must match the argument types exactly.
      * </p>
      *
-     * @param <T>  the type to be constructed.
-     * @param cls  the class to be constructed, not {@code null}.
-     * @param args the array of arguments, {@code null} treated as empty.
-     * @return new instance of {@code cls}, not {@code null}.
-     * @throws NullPointerException        Thrown if {@code cls} is {@code null}.
-     * @throws NoSuchMethodException       Thrown if a matching constructor cannot be found.
-     * @throws IllegalAccessException      Thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param <T>  the type to be constructed
+     * @param cls  the class to be constructed, not {@code null}
+     * @param args the array of arguments, {@code null} treated as empty
+     * @return new instance of {@code cls}, not {@code null}
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the number of actual and formal parameters differ; or</li>
      *                                     <li>an unwrapping conversion for primitive arguments fails; or</li>
      *                                     <li>after possible unwrapping, a parameter value cannot be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion; if this constructor pertains to an enum type.</li>
      *                                     </ul>
-     * @throws InstantiationException      Thrown if the class that declares the underlying constructor represents an abstract class.
-     * @throws InvocationTargetException   Thrown if the underlying constructor throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
-     * @throws SecurityException           Thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
+     * @throws InstantiationException      thrown if the class that declares the underlying constructor represents an abstract class
+     * @throws InvocationTargetException   thrown if the underlying constructor throws an exception
+     * @throws NoSuchMethodException       thrown if a matching constructor cannot be found
+     * @throws NullPointerException        thrown if {@code cls} is {@code null}
+     * @throws SecurityException           thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
      *                                     loader for the class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the
-     *                                     package of the class.
+     *                                     package of the class
      * @see Constructor#newInstance(Object...)
      * @see #invokeExactConstructor(Class, Object[], Class[])
      */
@@ -268,28 +268,28 @@ public static <T> T invokeExactConstructor(final Class<T> cls, final Object... a
      * This locates and calls a constructor. The constructor signature must match the parameter types exactly.
      * </p>
      *
-     * @param <T>            the type to construct.
-     * @param cls            the class to construct, not {@code null}.
-     * @param args           the array of arguments, {@code null} treated as empty.
-     * @param parameterTypes the array of parameter types, {@code null} treated as empty.
-     * @return new instance of {@code cls}, not {@code null}.
-     * @throws NullPointerException        Thrown if {@code cls} is {@code null}.
-     * @throws NoSuchMethodException       Thrown if a matching constructor cannot be found.
-     * @throws IllegalAccessException      Thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param <T>            the type to construct
+     * @param cls            the class to construct, not {@code null}
+     * @param args           the array of arguments, {@code null} treated as empty
+     * @param parameterTypes the array of parameter types, {@code null} treated as empty
+     * @return new instance of {@code cls}, not {@code null}
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if the found {@code Constructor} is enforcing Java language access control and the underlying constructor is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the number of actual and formal parameters differ; or</li>
      *                                     <li>an unwrapping conversion for primitive arguments fails; or</li>
      *                                     <li>after possible unwrapping, a parameter value cannot be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion; if this constructor pertains to an enum type.</li>
      *                                     </ul>
-     * @throws InstantiationException      Thrown if the class that declares the underlying constructor represents an abstract class.
-     * @throws InvocationTargetException   Thrown if the underlying constructor throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
-     * @throws SecurityException           Thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
+     * @throws InstantiationException      thrown if the class that declares the underlying constructor represents an abstract class
+     * @throws InvocationTargetException   thrown if the underlying constructor throws an exception
+     * @throws NoSuchMethodException       thrown if a matching constructor cannot be found
+     * @throws NullPointerException        thrown if {@code cls} is {@code null}
+     * @throws SecurityException           thrown if a security manager is present and the caller's class loader is not the same as or an ancestor of the class
      *                                     loader for the class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the
-     *                                     package of the class.
+     *                                     package of the class
      * @see Constructor#newInstance(Object...)
      */
     public static <T> T invokeExactConstructor(final Class<T> cls, final Object[] args, final Class<?>[] parameterTypes)
@@ -304,10 +304,10 @@ public static <T> T invokeExactConstructor(final Class<T> cls, final Object[] ar
     /**
      * Tests whether the specified class is generally accessible, i.e. is declared in an entirely {@code public} manner.
      *
-     * @param type to check.
-     * @return {@code true} if {@code type} and any enclosing classes are {@code public}.
-     * @throws SecurityException Thrown if a security manager is present and a caller's class loader is not the same as or an ancestor of the class loader for a
-     *                           class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the package of the class.
+     * @param type to check
+     * @return {@code true} if {@code type} and any enclosing classes are {@code public}
+     * @throws SecurityException thrown if a security manager is present and a caller's class loader is not the same as or an ancestor of the class loader for a
+     *                           class and invocation of {@link SecurityManager#checkPackageAccess(String)} denies access to the package of the class
      */
     private static boolean isAccessible(final Class<?> type) {
         Class<?> cls = type;
diff --git a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
index c2f0757100b..e162dfa4391 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
@@ -50,9 +50,9 @@ public class FieldUtils {
      *
      * @param cls
      *            the {@link Class} to query
-     * @return an array of Fields (possibly empty).
+     * @return an array of Fields (possibly empty)
      * @throws NullPointerException
-     *             if the class is {@code null}.
+     *             if the class is {@code null}
      * @since 3.2
      */
     public static Field[] getAllFields(final Class<?> cls) {
@@ -64,9 +64,9 @@ public static Field[] getAllFields(final Class<?> cls) {
      *
      * @param cls
      *            the {@link Class} to query
-     * @return a list of Fields (possibly empty).
+     * @return a list of Fields (possibly empty)
      * @throws NullPointerException
-     *             if the class is {@code null}.
+     *             if the class is {@code null}
      * @since 3.2
      */
     public static List<Field> getAllFieldsList(final Class<?> cls) {
@@ -86,13 +86,13 @@ public static List<Field> getAllFieldsList(final Class<?> cls) {
      * @param cls
      *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
-     * @return the Field object.
-     * @throws NullPointerException
-     *             if the class is {@code null}.
+     *            the field name to obtain
+     * @return the Field object
      * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank, or empty.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field name is {@code null}, blank, or empty
+     * @throws NullPointerException
+     *             if the class is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Field getDeclaredField(final Class<?> cls, final String fieldName) {
@@ -104,19 +104,19 @@ public static Field getDeclaredField(final Class<?> cls, final String fieldName)
      * considered.
      *
      * @param cls
-     *            the {@link Class} to reflect, must not be {@code null}.
+     *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
      * @return the Field object
-     * @throws NullPointerException
-     *             if the class is {@code null}.
      * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank, or empty.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field name is {@code null}, blank, or empty
+     * @throws NullPointerException
+     *             if the class is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Field getDeclaredField(final Class<?> cls, final String fieldName, final boolean forceAccess) {
@@ -142,15 +142,15 @@ public static Field getDeclaredField(final Class<?> cls, final String fieldName,
      * Gets an accessible {@link Field} by name respecting scope. Superclasses/interfaces will be considered.
      *
      * @param cls
-     *            the {@link Class} to reflect, must not be {@code null}.
+     *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
-     * @return the Field object.
-     * @throws NullPointerException
-     *             if the class is {@code null}.
+     *            the field name to obtain
+     * @return the Field object
      * @throws IllegalArgumentException
      *             if the field name is {@code null}, blank, or empty
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws NullPointerException
+     *             if the class is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Field getField(final Class<?> cls, final String fieldName) {
@@ -162,18 +162,18 @@ public static Field getField(final Class<?> cls, final String fieldName) {
      * considered.
      *
      * @param cls
-     *            the {@link Class} to reflect, must not be {@code null}.
+     *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
-     * @return the Field object.
-     * @throws NullPointerException if the class is {@code null}.
+     * @return the Field object
      * @throws IllegalArgumentException if the field name is blank or empty or is matched at multiple places
-     * in the inheritance hierarchy.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * in the inheritance hierarchy
+     * @throws NullPointerException if the class is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Field getField(final Class<?> cls, final String fieldName, final boolean forceAccess) {
@@ -231,12 +231,12 @@ public static Field getField(final Class<?> cls, final String fieldName, final b
      * Gets all fields of the given class and its parents (if any) that are annotated with the given annotation.
      *
      * @param cls
-     *            the {@link Class} to query.
+     *            the {@link Class} to query
      * @param annotationCls
-     *            the {@link Annotation} that must be present on a field to be matched.
-     * @return a list of Fields (possibly empty).
+     *            the {@link Annotation} that must be present on a field to be matched
+     * @return a list of Fields (possibly empty)
      * @throws NullPointerException
-     *            if the class or annotation are {@code null}.
+     *            if the class or annotation are {@code null}
      * @since 3.4
      */
     public static List<Field> getFieldsListWithAnnotation(final Class<?> cls, final Class<? extends Annotation> annotationCls) {
@@ -248,12 +248,12 @@ public static List<Field> getFieldsListWithAnnotation(final Class<?> cls, final
      * Gets all fields of the given class and its parents (if any) that are annotated with the given annotation.
      *
      * @param cls
-     *            the {@link Class} to query.
+     *            the {@link Class} to query
      * @param annotationCls
      *            the {@link Annotation} that must be present on a field to be matched
-     * @return an array of Fields (possibly empty).
+     * @return an array of Fields (possibly empty)
      * @throws NullPointerException
-     *            if the class or annotation are {@code null}.
+     *            if the class or annotation are {@code null}
      * @since 3.4
      */
     public static Field[] getFieldsWithAnnotation(final Class<?> cls, final Class<? extends Annotation> annotationCls) {
@@ -264,17 +264,17 @@ public static Field[] getFieldsWithAnnotation(final Class<?> cls, final Class<?
      * Reads the named {@code public} {@link Field}. Only the class of the specified object will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
-     * @return the value of the field.
-     * @throws NullPointerException
-     *             if {@code target} is {@code null}.
-     * @throws IllegalArgumentException
-     *             if {@code fieldName} is {@code null}, blank or empty, or could not be found.
+     *            the field name to obtain
+     * @return the value of the field
      * @throws IllegalAccessException
      *             if the named field is not {@code public}
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if {@code fieldName} is {@code null}, blank or empty, or could not be found
+     * @throws NullPointerException
+     *             if {@code target} is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readDeclaredField(final Object target, final String fieldName) throws IllegalAccessException {
@@ -285,21 +285,21 @@ public static Object readDeclaredField(final Object target, final String fieldNa
      * Gets a {@link Field} value by name. Only the class of the specified object will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match public fields.
-     * @return the Field object.
-     * @throws NullPointerException
-     *             if {@code target} is {@code null}.
-     * @throws IllegalArgumentException
-     *             if {@code fieldName} is {@code null}, blank or empty, or could not be found.
+     * @return the Field object
      * @throws IllegalAccessException
-     *             if the field is not made accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not made accessible
+     * @throws IllegalArgumentException
+     *             if {@code fieldName} is {@code null}, blank or empty, or could not be found
+     * @throws NullPointerException
+     *             if {@code target} is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readDeclaredField(final Object target, final String fieldName, final boolean forceAccess) throws IllegalAccessException {
@@ -316,17 +316,17 @@ public static Object readDeclaredField(final Object target, final String fieldNa
      * class will be considered.
      *
      * @param cls
-     *            the {@link Class} to reflect, must not be {@code null}.
+     *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
-     * @return the value of the field.
-     * @throws NullPointerException
-     *             if the class is {@code null}, or the field could not be found.
-     * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank, empty, or is not {@code static}.
+     *            the field name to obtain
+     * @return the value of the field
      * @throws IllegalAccessException
      *             if the field is not accessible
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if the field name is {@code null}, blank, empty, or is not {@code static}
+     * @throws NullPointerException
+     *             if the class is {@code null}, or the field could not be found
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readDeclaredStaticField(final Class<?> cls, final String fieldName) throws IllegalAccessException {
@@ -337,21 +337,21 @@ public static Object readDeclaredStaticField(final Class<?> cls, final String fi
      * Gets the value of a {@code static} {@link Field} by name. Only the specified class will be considered.
      *
      * @param cls
-     *            the {@link Class} to reflect, must not be {@code null}.
+     *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
      * @return the Field object
-     * @throws NullPointerException
-     *             if the class is {@code null}, or the field could not be found.
-     * @throws IllegalArgumentException
-     *             if the field name is blank or empty, is not {@code static}.
      * @throws IllegalAccessException
      *             if the field is not made accessible
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if the field name is blank or empty, is not {@code static}
+     * @throws NullPointerException
+     *             if the class is {@code null}, or the field could not be found
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readDeclaredStaticField(final Class<?> cls, final String fieldName, final boolean forceAccess) throws IllegalAccessException {
@@ -365,15 +365,15 @@ public static Object readDeclaredStaticField(final Class<?> cls, final String fi
      * Reads an accessible {@link Field}.
      *
      * @param field
-     *            the field to use.
+     *            the field to use
      * @param target
-     *            the object to call on, may be {@code null} for {@code static} fields.
+     *            the object to call on, may be {@code null} for {@code static} fields
      * @return the field value
-     * @throws NullPointerException
-     *             if the field is {@code null}.
      * @throws IllegalAccessException
-     *             if the field is not accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not accessible
+     * @throws NullPointerException
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readField(final Field field, final Object target) throws IllegalAccessException {
@@ -384,20 +384,20 @@ public static Object readField(final Field field, final Object target) throws Il
      * Reads a {@link Field}.
      *
      * @param field
-     *            the field to use.
+     *            the field to use
      * @param target
-     *            the object to call on, may be {@code null} for {@code static} fields.
+     *            the object to call on, may be {@code null} for {@code static} fields
      * @param forceAccess
      *            whether to break scope restrictions using the
-     *            {@link AccessibleObject#setAccessible(boolean)} method.
+     *            {@link AccessibleObject#setAccessible(boolean)} method
      * @return the field value
-     * @throws NullPointerException
-     *             if the field is {@code null}.
      * @throws IllegalAccessException
-     *             if the field is not made accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not made accessible
+     * @throws NullPointerException
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
-     * @throws SecurityException if an underlying accessible object's method denies the request.
      * @see SecurityManager#checkPermission
      */
     public static Object readField(final Field field, final Object target, final boolean forceAccess) throws IllegalAccessException {
@@ -409,17 +409,17 @@ public static Object readField(final Field field, final Object target, final boo
      * Reads the named {@code public} {@link Field}. Superclasses will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
-     * @return the value of the field.
-     * @throws NullPointerException
-     *             if the target is {@code null}.
-     * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank, empty, or could not be found.
+     *            the field name to obtain
+     * @return the value of the field
      * @throws IllegalAccessException
-     *             if the named field is not {@code public}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the named field is not {@code public}
+     * @throws IllegalArgumentException
+     *             if the field name is {@code null}, blank, empty, or could not be found
+     * @throws NullPointerException
+     *             if the target is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readField(final Object target, final String fieldName) throws IllegalAccessException {
@@ -430,21 +430,21 @@ public static Object readField(final Object target, final String fieldName) thro
      * Reads the named {@link Field}. Superclasses will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
      * @return the field value
-     * @throws NullPointerException
-     *             if {@code target} is {@code null}.
-     * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank, empty, or could not be found.
      * @throws IllegalAccessException
-     *             if the named field is not made accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the named field is not made accessible
+     * @throws IllegalArgumentException
+     *             if the field name is {@code null}, blank, empty, or could not be found
+     * @throws NullPointerException
+     *             if {@code target} is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readField(final Object target, final String fieldName, final boolean forceAccess) throws IllegalAccessException {
@@ -460,17 +460,17 @@ public static Object readField(final Object target, final String fieldName, fina
      * Reads the named {@code public static} {@link Field}. Superclasses will be considered.
      *
      * @param cls
-     *            the {@link Class} to reflect, must not be {@code null}.
+     *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
-     * @return the value of the field.
-     * @throws NullPointerException
-     *             if the class is {@code null}, or the field could not be found.
-     * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank or empty, or is not {@code static}.
+     *            the field name to obtain
+     * @return the value of the field
      * @throws IllegalAccessException
-     *             if the field is not accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not accessible
+     * @throws IllegalArgumentException
+     *             if the field name is {@code null}, blank or empty, or is not {@code static}
+     * @throws NullPointerException
+     *             if the class is {@code null}, or the field could not be found
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readStaticField(final Class<?> cls, final String fieldName) throws IllegalAccessException {
@@ -481,21 +481,21 @@ public static Object readStaticField(final Class<?> cls, final String fieldName)
      * Reads the named {@code static} {@link Field}. Superclasses will be considered.
      *
      * @param cls
-     *            the {@link Class} to reflect, must not be {@code null}.
+     *            the {@link Class} to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
-     * @return the Field object.
-     * @throws NullPointerException
-     *             if the class is {@code null}, or the field could not be found.
-     * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank or empty, or is not {@code static}.
+     * @return the Field object
      * @throws IllegalAccessException
-     *             if the field is not made accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not made accessible
+     * @throws IllegalArgumentException
+     *             if the field name is {@code null}, blank or empty, or is not {@code static}
+     * @throws NullPointerException
+     *             if the class is {@code null}, or the field could not be found
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readStaticField(final Class<?> cls, final String fieldName, final boolean forceAccess) throws IllegalAccessException {
@@ -509,15 +509,15 @@ public static Object readStaticField(final Class<?> cls, final String fieldName,
      * Reads an accessible {@code static} {@link Field}.
      *
      * @param field
-     *            to read.
-     * @return the field value.
-     * @throws NullPointerException
-     *             if the field is {@code null}.
-     * @throws IllegalArgumentException
-     *             if the field is not {@code static}.
+     *            to read
+     * @return the field value
      * @throws IllegalAccessException
      *             if the field is not accessible
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if the field is not {@code static}
+     * @throws NullPointerException
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readStaticField(final Field field) throws IllegalAccessException {
@@ -528,18 +528,18 @@ public static Object readStaticField(final Field field) throws IllegalAccessExce
      * Reads a static {@link Field}.
      *
      * @param field
-     *            to read.
+     *            to read
      * @param forceAccess
      *            whether to break scope restrictions using the
-     *            {@link AccessibleObject#setAccessible(boolean)} method.
-     * @return the field value.
-     * @throws NullPointerException
-     *             if the field is {@code null}.
-     * @throws IllegalArgumentException
-     *             if the field is not {@code static}.
+     *            {@link AccessibleObject#setAccessible(boolean)} method
+     * @return the field value
      * @throws IllegalAccessException
-     *             if the field is not made accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not made accessible
+     * @throws IllegalArgumentException
+     *             if the field is not {@code static}
+     * @throws NullPointerException
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object readStaticField(final Field field, final boolean forceAccess) throws IllegalAccessException {
@@ -552,10 +552,10 @@ public static Object readStaticField(final Field field, final boolean forceAcces
      * Removes the final modifier from a {@link Field}.
      *
      * @param field
-     *            to remove the final modifier.
+     *            to remove the final modifier
      * @throws NullPointerException
-     *             if the field is {@code null}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      * @since 3.2
      */
@@ -567,14 +567,14 @@ public static void removeFinalModifier(final Field field) {
      * Removes the final modifier from a {@link Field}.
      *
      * @param field
-     *            to remove the final modifier.
+     *            to remove the final modifier
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
      * @throws NullPointerException
-     *             if the field is {@code null}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      * @since 3.3
      * @deprecated As of Java 12, we can no longer drop the {@code final} modifier, thus
@@ -621,19 +621,19 @@ static Field setAccessible(final Field field, final boolean forceAccess) {
      * Writes a {@code public} {@link Field}. Only the specified class will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param value
-     *            the new value.
-     * @throws NullPointerException
-     *             if {@code target} is {@code null}.
-     * @throws IllegalArgumentException
-     *             if {@code fieldName} is {@code null}, blank or empty, or could not be found,
-     *             or {@code value} is not assignable.
+     *            the new value
      * @throws IllegalAccessException
      *             if the field is not made accessible
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if {@code fieldName} is {@code null}, blank or empty, or could not be found,
+     *             or {@code value} is not assignable
+     * @throws NullPointerException
+     *             if {@code target} is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeDeclaredField(final Object target, final String fieldName, final Object value) throws IllegalAccessException {
@@ -644,21 +644,21 @@ public static void writeDeclaredField(final Object target, final String fieldNam
      * Writes a {@code public} {@link Field}. Only the specified class will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param value
-     *            the new value.
+     *            the new value
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
+     * @throws IllegalAccessException
+     *             if the field is not made accessible
      * @throws IllegalArgumentException
      *             if {@code fieldName} is {@code null}, blank or empty, or could not be found,
      *             or {@code value} is not assignable
-     * @throws IllegalAccessException
-     *             if the field is not made accessible
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeDeclaredField(final Object target, final String fieldName, final Object value, final boolean forceAccess)
@@ -675,18 +675,18 @@ public static void writeDeclaredField(final Object target, final String fieldNam
      * Writes a named {@code public static} {@link Field}. Only the specified class will be considered.
      *
      * @param cls
-     *            {@link Class} on which the field is to be found.
+     *            {@link Class} on which the field is to be found
      * @param fieldName
-     *            to write.
+     *            to write
      * @param value
-     *            the new value.
-     * @throws NullPointerException
-     *             if {@code cls} is {@code null} or the field cannot be located.
-     * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank, empty, not {@code static}, or {@code value} is not assignable.
+     *            the new value
      * @throws IllegalAccessException
      *             if the field is not {@code public} or is {@code final}
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if the field name is {@code null}, blank, empty, not {@code static}, or {@code value} is not assignable
+     * @throws NullPointerException
+     *             if {@code cls} is {@code null} or the field cannot be located
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeDeclaredStaticField(final Class<?> cls, final String fieldName, final Object value) throws IllegalAccessException {
@@ -697,21 +697,21 @@ public static void writeDeclaredStaticField(final Class<?> cls, final String fie
      * Writes a named {@code static} {@link Field}. Only the specified class will be considered.
      *
      * @param cls
-     *            {@link Class} on which the field is to be found.
+     *            {@link Class} on which the field is to be found
      * @param fieldName
      *            to write
      * @param value
-     *            the new value.
+     *            the new value
      * @param forceAccess
      *            whether to break scope restrictions using the {@code AccessibleObject#setAccessible(boolean)} method.
      *            {@code false} will only match {@code public} fields.
-     * @throws NullPointerException
-     *             if {@code cls} is {@code null} or the field cannot be located.
-     * @throws IllegalArgumentException
-     *             if the field name is {@code null}, blank, empty, not {@code static}, or {@code value} is not assignable.
      * @throws IllegalAccessException
      *             if the field is not made accessible or is {@code final}
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if the field name is {@code null}, blank, empty, not {@code static}, or {@code value} is not assignable
+     * @throws NullPointerException
+     *             if {@code cls} is {@code null} or the field cannot be located
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeDeclaredStaticField(final Class<?> cls, final String fieldName, final Object value, final boolean forceAccess)
@@ -726,18 +726,18 @@ public static void writeDeclaredStaticField(final Class<?> cls, final String fie
      * Writes an accessible {@link Field}.
      *
      * @param field
-     *            to write.
+     *            to write
      * @param target
-     *            the object to call on, may be {@code null} for {@code static} fields.
+     *            the object to call on, may be {@code null} for {@code static} fields
      * @param value
-     *            the new value.
-     * @throws NullPointerException
-     *             if the field is {@code null}.
-     * @throws IllegalArgumentException
-     *             if {@code value} is not assignable.
+     *            the new value
      * @throws IllegalAccessException
-     *             if the field is not accessible or is {@code final}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not accessible or is {@code final}
+     * @throws IllegalArgumentException
+     *             if {@code value} is not assignable
+     * @throws NullPointerException
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeField(final Field field, final Object target, final Object value) throws IllegalAccessException {
@@ -748,22 +748,22 @@ public static void writeField(final Field field, final Object target, final Obje
      * Writes a {@link Field}.
      *
      * @param field
-     *            to write.
+     *            to write
      * @param target
      *            the object to call on, may be {@code null} for {@code static} fields
      * @param value
-     *            the new value.
+     *            the new value
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
-     * @throws NullPointerException
-     *             if the field is {@code null}.
-     * @throws IllegalArgumentException
-     *             if {@code value} is not assignable.
      * @throws IllegalAccessException
      *             if the field is not made accessible or is {@code final}
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if {@code value} is not assignable
+     * @throws NullPointerException
+     *             if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeField(final Field field, final Object target, final Object value, final boolean forceAccess)
@@ -776,19 +776,19 @@ public static void writeField(final Field field, final Object target, final Obje
      * Writes a {@code public} {@link Field}. Superclasses will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param value
-     *            the new value.
-     * @throws NullPointerException
-     *             if {@code target} is {@code null}.
+     *            the new value
+     * @throws IllegalAccessException
+     *             if the field is not accessible
      * @throws IllegalArgumentException
      *             if {@code fieldName} is {@code null}, blank, empty, or could not be found,
-     *             or {@code value} is not assignable.
-     * @throws IllegalAccessException
-     *             if the field is not accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             or {@code value} is not assignable
+     * @throws NullPointerException
+     *             if {@code target} is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeField(final Object target, final String fieldName, final Object value) throws IllegalAccessException {
@@ -799,23 +799,23 @@ public static void writeField(final Object target, final String fieldName, final
      * Writes a {@link Field}. Superclasses will be considered.
      *
      * @param target
-     *            the object to reflect, must not be {@code null}.
+     *            the object to reflect, must not be {@code null}
      * @param fieldName
-     *            the field name to obtain.
+     *            the field name to obtain
      * @param value
-     *            the new value.
+     *            the new value
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
-     * @throws NullPointerException
-     *             if {@code target} is {@code null}.
+     * @throws IllegalAccessException
+     *             if the field is not made accessible
      * @throws IllegalArgumentException
      *             if {@code fieldName} is {@code null}, blank, empty, or could not be found,
-     *             or {@code value} is not assignable.
-     * @throws IllegalAccessException
-     *             if the field is not made accessible.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             or {@code value} is not assignable
+     * @throws NullPointerException
+     *             if {@code target} is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeField(final Object target, final String fieldName, final Object value, final boolean forceAccess)
@@ -832,19 +832,19 @@ public static void writeField(final Object target, final String fieldName, final
      * Writes a named {@code public static} {@link Field}. Superclasses will be considered.
      *
      * @param cls
-     *            {@link Class} on which the field is to be found.
+     *            {@link Class} on which the field is to be found
      * @param fieldName
-     *            to write.
+     *            to write
      * @param value
-     *            the new value.
-     * @throws NullPointerException
-     *             if {@code target} is {@code null}.
-     * @throws IllegalArgumentException
-     *             if {@code fieldName} is {@code null}, blank or empty, the field cannot be located or is
-     *             not {@code static}, or {@code value} is not assignable.
+     *            the new value
      * @throws IllegalAccessException
      *             if the field is not {@code public} or is {@code final}
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *             if {@code fieldName} is {@code null}, blank or empty, the field cannot be located or is
+     *             not {@code static}, or {@code value} is not assignable
+     * @throws NullPointerException
+     *             if {@code target} is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeStaticField(final Class<?> cls, final String fieldName, final Object value) throws IllegalAccessException {
@@ -855,22 +855,22 @@ public static void writeStaticField(final Class<?> cls, final String fieldName,
      * Writes a named {@code static} {@link Field}. Superclasses will be considered.
      *
      * @param cls
-     *            {@link Class} on which the field is to be found.
+     *            {@link Class} on which the field is to be found
      * @param fieldName
-     *            to write.
+     *            to write
      * @param value
-     *            the new value.
+     *            the new value
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
-     * @throws NullPointerException
-     *             if {@code cls} is {@code null} or the field cannot be located.
-     * @throws IllegalArgumentException
-     *             if {@code fieldName} is {@code null}, blank or empty, the field not {@code static}, or {@code value} is not assignable.
      * @throws IllegalAccessException
-     *             if the field is not made accessible or is {@code final}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not made accessible or is {@code final}
+     * @throws IllegalArgumentException
+     *             if {@code fieldName} is {@code null}, blank or empty, the field not {@code static}, or {@code value} is not assignable
+     * @throws NullPointerException
+     *             if {@code cls} is {@code null} or the field cannot be located
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeStaticField(final Class<?> cls, final String fieldName, final Object value, final boolean forceAccess)
@@ -885,16 +885,16 @@ public static void writeStaticField(final Class<?> cls, final String fieldName,
      * Writes a {@code public static} {@link Field}.
      *
      * @param field
-     *            to write.
+     *            to write
      * @param value
-     *            the new value.
-     * @throws NullPointerException
-     *              if the field is {@code null}.
-     * @throws IllegalArgumentException
-     *              if the field is not {@code static}, or {@code value} is not assignable.
+     *            the new value
      * @throws IllegalAccessException
-     *             if the field is not {@code public} or is {@code final}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     *             if the field is not {@code public} or is {@code final}
+     * @throws IllegalArgumentException
+     *              if the field is not {@code static}, or {@code value} is not assignable
+     * @throws NullPointerException
+     *              if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeStaticField(final Field field, final Object value) throws IllegalAccessException {
@@ -905,20 +905,20 @@ public static void writeStaticField(final Field field, final Object value) throw
      * Writes a static {@link Field}.
      *
      * @param field
-     *            to write.
+     *            to write
      * @param value
-     *            the new value.
+     *            the new value
      * @param forceAccess
      *            whether to break scope restrictions using the
      *            {@link AccessibleObject#setAccessible(boolean)} method. {@code false} will only
      *            match {@code public} fields.
-     * @throws NullPointerException
-     *              if the field is {@code null}.
-     * @throws IllegalArgumentException
-     *              if the field is not {@code static}, or {@code value} is not assignable.
      * @throws IllegalAccessException
      *             if the field is not made accessible or is {@code final}
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @throws IllegalArgumentException
+     *              if the field is not {@code static}, or {@code value} is not assignable
+     * @throws NullPointerException
+     *              if the field is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static void writeStaticField(final Field field, final Object value, final boolean forceAccess) throws IllegalAccessException {
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
index c9843b2b962..14f54255887 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
@@ -88,10 +88,10 @@ public boolean isVarArgs() {
      * Compares the relative fitness of two Constructors in terms of how well they match a set of runtime parameter types, such that a list ordered by the
      * results of the comparison would return the best match first (least).
      *
-     * @param left   the "left" Constructor.
-     * @param right  the "right" Constructor.
+     * @param left   the "left" Constructor
+     * @param right  the "right" Constructor
      * @param actual the runtime parameter types to match against. {@code left}/{@code right}.
-     * @return int consistent with {@code compare} semantics.
+     * @return int consistent with {@code compare} semantics
      */
     static int compareConstructorFit(final Constructor<?> left, final Constructor<?> right, final Class<?>[] actual) {
       return compareParameterTypes(Executable.of(left), Executable.of(right), actual);
@@ -101,10 +101,10 @@ static int compareConstructorFit(final Constructor<?> left, final Constructor<?>
      * Compares the relative fitness of two Methods in terms of how well they match a set of runtime parameter types, such that a list ordered by the results of
      * the comparison would return the best match first (least).
      *
-     * @param left   the "left" Method.
-     * @param right  the "right" Method.
+     * @param left   the "left" Method
+     * @param right  the "right" Method
      * @param actual the runtime parameter types to match against. {@code left}/{@code right}.
-     * @return int consistent with {@code compare} semantics.
+     * @return int consistent with {@code compare} semantics
      */
     static int compareMethodFit(final Method left, final Method right, final Class<?>[] actual) {
       return compareParameterTypes(Executable.of(left), Executable.of(right), actual);
@@ -114,10 +114,10 @@ static int compareMethodFit(final Method left, final Method right, final Class<?
      * Compares the relative fitness of two Executables in terms of how well they match a set of runtime parameter types, such that a list ordered by the
      * results of the comparison would return the best match first (least).
      *
-     * @param left   the "left" Executable.
-     * @param right  the "right" Executable.
+     * @param left   the "left" Executable
+     * @param right  the "right" Executable
      * @param actual the runtime parameter types to match against. {@code left}/{@code right}.
-     * @return int consistent with {@code compare} semantics.
+     * @return int consistent with {@code compare} semantics
      */
     private static int compareParameterTypes(final Executable left, final Executable right, final Class<?>[] actual) {
         final float leftCost = getTotalTransformationCost(actual, left);
@@ -128,9 +128,9 @@ private static int compareParameterTypes(final Executable left, final Executable
     /**
      * Gets the number of steps needed to turn the source class into the destination class. This represents the number of steps in the object hierarchy graph.
      *
-     * @param srcClass  The source class.
-     * @param destClass The destination class.
-     * @return The cost of transforming an object.
+     * @param srcClass  the source class
+     * @param destClass the destination class
+     * @return the cost of transforming an object
      */
     private static float getObjectTransformationCost(Class<?> srcClass, final Class<?> destClass) {
         if (destClass.isPrimitive()) {
@@ -162,9 +162,9 @@ private static float getObjectTransformationCost(Class<?> srcClass, final Class<
     /**
      * Gets the number of steps required to promote a primitive to another type.
      *
-     * @param srcClass  the (primitive) source class.
-     * @param destClass the (primitive) destination class.
-     * @return The cost of promoting the primitive.
+     * @param srcClass  the (primitive) source class
+     * @param destClass the (primitive) destination class
+     * @return the cost of promoting the primitive
      */
     private static float getPrimitivePromotionCost(final Class<?> srcClass, final Class<?> destClass) {
         if (srcClass == null) {
@@ -192,9 +192,9 @@ private static float getPrimitivePromotionCost(final Class<?> srcClass, final Cl
     /**
      * Gets the sum of the object transformation cost for each class in the source argument list.
      *
-     * @param srcArgs    The source arguments.
-     * @param executable The executable to calculate transformation costs for.
-     * @return The total transformation cost.
+     * @param srcArgs    the source arguments
+     * @param executable the executable to calculate transformation costs for
+     * @return the total transformation cost
      */
     private static float getTotalTransformationCost(final Class<?>[] srcArgs, final Executable executable) {
         final Class<?>[] destArgs = executable.getParameterTypes();
@@ -236,8 +236,8 @@ private static float getTotalTransformationCost(final Class<?>[] srcArgs, final
     /**
      * Tests whether a {@link Member} is accessible.
      *
-     * @param member Member to test, may be null.
-     * @return {@code true} if {@code m} is accessible.
+     * @param member member to test, may be null
+     * @return {@code true} if {@code m} is accessible
      */
     static boolean isAccessible(final Member member) {
         return isPublic(member) && !member.isSynthetic();
@@ -277,7 +277,7 @@ static boolean isMatchingMethod(final Method method, final Class<?>[] parameterT
     /**
      * Tests whether a given set of modifiers implies package access.
      *
-     * @param modifiers to test.
+     * @param modifiers to test
      * @return {@code true} unless {@code package}/{@code protected}/{@code private} modifier detected
      */
     static boolean isPackage(final int modifiers) {
@@ -287,8 +287,8 @@ static boolean isPackage(final int modifiers) {
     /**
      * Tests whether a {@link Member} is public.
      *
-     * @param member Member to test, may be null.
-     * @return {@code true} if {@code m} is public.
+     * @param member member to test, may be null
+     * @return {@code true} if {@code m} is public
      */
     static boolean isPublic(final Member member) {
         return member != null && Modifier.isPublic(member.getModifiers());
@@ -297,8 +297,8 @@ static boolean isPublic(final Member member) {
     /**
      * Tests whether a {@link Member} is static.
      *
-     * @param member Member to test, may be null.
-     * @return {@code true} if {@code m} is static.
+     * @param member member to test, may be null
+     * @return {@code true} if {@code m} is static
      */
     static boolean isStatic(final Member member) {
         return member != null && Modifier.isStatic(member.getModifiers());
@@ -316,8 +316,8 @@ static boolean isStatic(final Member member) {
      * accepted.
      * </p>
      *
-     * @param obj the AccessibleObject to set as accessible, may be null.
-     * @return a boolean indicating whether the accessibility of the object was set to true.
+     * @param obj the AccessibleObject to set as accessible, may be null
+     * @return a boolean indicating whether the accessibility of the object was set to true
      */
     static <T extends AccessibleObject> T setAccessibleWorkaround(final T obj) {
         if (AccessibleObjects.isAccessible(obj)) {
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index df6899f5a3a..3546911db5c 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -73,9 +73,9 @@ public class MethodUtils {
      * Computes the aggregate number of inheritance hops between assignable argument class types.  Returns -1
      * if the arguments aren't assignable.  Fills a specific purpose for getMatchingMethod and is not generalized.
      *
-     * @param fromClassArray the Class array to calculate the distance from.
-     * @param toClassArray the Class array to calculate the distance to.
-     * @return the aggregate number of inheritance hops between assignable argument class types.
+     * @param fromClassArray the Class array to calculate the distance from
+     * @param toClassArray the Class array to calculate the distance to
+     * @return the aggregate number of inheritance hops between assignable argument class types
      */
     private static int distance(final Class<?>[] fromClassArray, final Class<?>[] toClassArray) {
         int answer = 0;
@@ -102,9 +102,9 @@ private static int distance(final Class<?>[] fromClassArray, final Class<?>[] to
      * Gets an accessible method (that is, one that can be invoked via reflection) that implements the specified Method. If no such method can be found, return
      * {@code null}.
      *
-     * @param cls The implementing class, may be null.
-     * @param method The method that we wish to call, may be null.
-     * @return The accessible method or null.
+     * @param cls the implementing class, may be null
+     * @param method the method that we wish to call, may be null
+     * @return the accessible method or null
      * @since 3.19.0
      */
     public static Method getAccessibleMethod(final Class<?> cls, final Method method) {
@@ -127,10 +127,10 @@ public static Method getAccessibleMethod(final Class<?> cls, final Method method
      * Gets an accessible method (that is, one that can be invoked via reflection) with given name and parameters. If no such method can be found, return
      * {@code null}. This is just a convenience wrapper for {@link #getAccessibleMethod(Method)}.
      *
-     * @param cls            get method from this class.
-     * @param methodName     get method with this name.
-     * @param parameterTypes with these parameters types.
-     * @return The accessible method.
+     * @param cls            get method from this class
+     * @param methodName     get method with this name
+     * @param parameterTypes with these parameters types
+     * @return the accessible method
      */
     public static Method getAccessibleMethod(final Class<?> cls, final String methodName, final Class<?>... parameterTypes) {
         return getAccessibleMethod(getMethodObject(cls, methodName, parameterTypes));
@@ -140,8 +140,8 @@ public static Method getAccessibleMethod(final Class<?> cls, final String method
      * Gets an accessible method (that is, one that can be invoked via reflection) that implements the specified Method. If no such method can be found, return
      * {@code null}.
      *
-     * @param method The method that we wish to call, may be null.
-     * @return The accessible method
+     * @param method the method that we wish to call, may be null
+     * @return the accessible method
      */
     public static Method getAccessibleMethod(final Method method) {
         return method != null ? getAccessibleMethod(method.getDeclaringClass(), method) : null;
@@ -159,10 +159,10 @@ public static Method getAccessibleMethod(final Method method) {
      * call this rather than the higher level methods.
      * </p>
      *
-     * @param cls Parent class for the interfaces to be checked.
-     * @param methodName Method name of the method we wish to call.
-     * @param parameterTypes The parameter type signatures.
-     * @return the accessible method or {@code null} if not found.
+     * @param cls parent class for the interfaces to be checked
+     * @param methodName method name of the method we wish to call
+     * @param parameterTypes the parameter type signatures
+     * @return the accessible method or {@code null} if not found
      */
     private static Method getAccessibleMethodFromInterfaceNest(Class<?> cls, final String methodName, final Class<?>... parameterTypes) {
         // Search up the superclass chain
@@ -197,10 +197,10 @@ private static Method getAccessibleMethodFromInterfaceNest(Class<?> cls, final S
      * reflection) by scanning through the superclasses. If no such method
      * can be found, return {@code null}.
      *
-     * @param cls Class to be checked.
-     * @param methodName Method name of the method we wish to call.
-     * @param parameterTypes The parameter type signatures.
-     * @return the accessible method or {@code null} if not found.
+     * @param cls class to be checked
+     * @param methodName method name of the method we wish to call
+     * @param parameterTypes the parameter type signatures
+     * @return the accessible method or {@code null} if not found
      */
     private static Method getAccessibleMethodFromSuperclass(final Class<?> cls, final String methodName, final Class<?>... parameterTypes) {
         Class<?> parentClass = cls.getSuperclass();
@@ -217,8 +217,8 @@ private static Method getAccessibleMethodFromSuperclass(final Class<?> cls, fina
      * Gets a combination of {@link ClassUtils#getAllSuperclasses(Class)} and {@link ClassUtils#getAllInterfaces(Class)}, one from superclasses, one from
      * interfaces, and so on in a breadth first way.
      *
-     * @param cls the class to look up, may be {@code null}.
-     * @return the combined {@link List} of superclasses and interfaces in order going up from this one {@code null} if null input.
+     * @param cls the class to look up, may be {@code null}
+     * @return the combined {@link List} of superclasses and interfaces in order going up from this one {@code null} if null input
      */
     private static List<Class<?>> getAllSuperclassesAndInterfaces(final Class<?> cls) {
         if (cls == null) {
@@ -250,15 +250,15 @@ private static List<Class<?>> getAllSuperclassesAndInterfaces(final Class<?> cls
      * silently ignored.
      * </p>
      *
-     * @param <A>           the annotation type.
-     * @param method        the {@link Method} to query, may be null.
-     * @param annotationCls the {@link Annotation} to check if is present on the method.
+     * @param <A>           the annotation type
+     * @param method        the {@link Method} to query, may be null
+     * @param annotationCls the {@link Annotation} to check if is present on the method
      * @param searchSupers  determines if a lookup in the entire inheritance hierarchy of the given class is performed if the annotation was not directly
-     *                      present.
-     * @param ignoreAccess  determines if underlying method has to be accessible.
-     * @return the first matching annotation, or {@code null} if not found.
-     * @throws NullPointerException if either the method or annotation class is {@code null}.
-     * @throws SecurityException    if an underlying accessible object's method denies the request.
+     *                      present
+     * @param ignoreAccess  determines if underlying method has to be accessible
+     * @return the first matching annotation, or {@code null} if not found
+     * @throws NullPointerException if either the method or annotation class is {@code null}
+     * @throws SecurityException    if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      * @since 3.6
      */
@@ -309,11 +309,11 @@ private static Method getInvokeMethod(final boolean forceAccess, final String me
      * This method can match primitive parameter by passing in wrapper classes. For example, a {@link Boolean} will match a primitive {@code boolean} parameter.
      * </p>
      *
-     * @param cls            find method in this class.
-     * @param methodName     find method with this name.
-     * @param requestTypes find method with most compatible parameters.
-     * @return The accessible method or null.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @param cls            find method in this class
+     * @param methodName     find method with this name
+     * @param requestTypes find method with most compatible parameters
+     * @return the accessible method or null
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Method getMatchingAccessibleMethod(final Class<?> cls, final String methodName, final Class<?>... requestTypes) {
@@ -354,12 +354,12 @@ public static Method getMatchingAccessibleMethod(final Class<?> cls, final Strin
     /**
      * Gets a method whether or not it's accessible. If no such method can be found, return {@code null}.
      *
-     * @param cls            The class that will be subjected to the method search.
-     * @param methodName     The method that we wish to call.
-     * @param parameterTypes Argument class types.
-     * @throws IllegalStateException if there is no unique result.
-     * @throws NullPointerException  if the class is {@code null}.
-     * @return The method.
+     * @param cls            the class that will be subjected to the method search
+     * @param methodName     the method that we wish to call
+     * @param parameterTypes argument class types
+     * @return the method
+     * @throws IllegalStateException if there is no unique result
+     * @throws NullPointerException  if the class is {@code null}
      * @since 3.5
      */
     public static Method getMatchingMethod(final Class<?> cls, final String methodName, final Class<?>... parameterTypes) {
@@ -404,10 +404,10 @@ public static Method getMatchingMethod(final Class<?> cls, final String methodNa
     /**
      * Gets a Method, or {@code null} if a checked {@link Class#getMethod(String, Class...) } exception is thrown.
      *
-     * @param cls            Receiver for {@link Class#getMethod(String, Class...)}.
-     * @param name           the name of the method.
-     * @param parameterTypes the list of parameters.
-     * @return a Method or {@code null}.
+     * @param cls            receiver for {@link Class#getMethod(String, Class...)}
+     * @param name           the name of the method
+     * @param parameterTypes the list of parameters
+     * @return a Method or {@code null}
      * @see SecurityManager#checkPermission
      * @see Class#getMethod(String, Class...)
      * @since 3.15.0
@@ -423,10 +423,10 @@ public static Method getMethodObject(final Class<?> cls, final String name, fina
     /**
      * Gets all class level public methods of the given class that are annotated with the given annotation.
      *
-     * @param cls           the {@link Class} to query.
-     * @param annotationCls the {@link Annotation} that must be present on a method to be matched.
-     * @return a list of Methods (possibly empty).
-     * @throws NullPointerException if the class or annotation are {@code null}.
+     * @param cls           the {@link Class} to query
+     * @param annotationCls the {@link Annotation} that must be present on a method to be matched
+     * @return a list of Methods (possibly empty)
+     * @throws NullPointerException if the class or annotation are {@code null}
      * @since 3.4
      */
     public static List<Method> getMethodsListWithAnnotation(final Class<?> cls, final Class<? extends Annotation> annotationCls) {
@@ -436,12 +436,12 @@ public static List<Method> getMethodsListWithAnnotation(final Class<?> cls, fina
     /**
      * Gets all methods of the given class that are annotated with the given annotation.
      *
-     * @param cls           the {@link Class} to query.
-     * @param annotationCls the {@link Annotation} that must be present on a method to be matched.
-     * @param searchSupers  determines if a lookup in the entire inheritance hierarchy of the given class should be performed.
-     * @param ignoreAccess  determines if non-public methods should be considered.
-     * @return a list of Methods (possibly empty).
-     * @throws NullPointerException if either the class or annotation class is {@code null}.
+     * @param cls           the {@link Class} to query
+     * @param annotationCls the {@link Annotation} that must be present on a method to be matched
+     * @param searchSupers  determines if a lookup in the entire inheritance hierarchy of the given class should be performed
+     * @param ignoreAccess  determines if non-public methods should be considered
+     * @return a list of Methods (possibly empty)
+     * @throws NullPointerException if either the class or annotation class is {@code null}
      * @since 3.6
      */
     public static List<Method> getMethodsListWithAnnotation(final Class<?> cls, final Class<? extends Annotation> annotationCls, final boolean searchSupers,
@@ -461,9 +461,9 @@ public static List<Method> getMethodsListWithAnnotation(final Class<?> cls, fina
     /**
      * Gets all class level public methods of the given class that are annotated with the given annotation.
      *
-     * @param cls           the {@link Class} to query.
-     * @param annotationCls the {@link java.lang.annotation.Annotation} that must be present on a method to be matched.
-     * @return an array of Methods (possibly empty).
+     * @param cls           the {@link Class} to query
+     * @param annotationCls the {@link java.lang.annotation.Annotation} that must be present on a method to be matched
+     * @return an array of Methods (possibly empty)
      * @throws NullPointerException if the class or annotation are {@code null}
      * @since 3.4
      */
@@ -474,12 +474,12 @@ public static Method[] getMethodsWithAnnotation(final Class<?> cls, final Class<
     /**
      * Gets all methods of the given class that are annotated with the given annotation.
      *
-     * @param cls           the {@link Class} to query.
-     * @param annotationCls the {@link java.lang.annotation.Annotation} that must be present on a method to be matched.
-     * @param searchSupers  determines if a lookup in the entire inheritance hierarchy of the given class should be performed.
-     * @param ignoreAccess  determines if non-public methods should be considered.
-     * @return an array of Methods (possibly empty).
-     * @throws NullPointerException if the class or annotation are {@code null}.
+     * @param cls           the {@link Class} to query
+     * @param annotationCls the {@link java.lang.annotation.Annotation} that must be present on a method to be matched
+     * @param searchSupers  determines if a lookup in the entire inheritance hierarchy of the given class should be performed
+     * @param ignoreAccess  determines if non-public methods should be considered
+     * @return an array of Methods (possibly empty)
+     * @throws NullPointerException if the class or annotation are {@code null}
      * @since 3.6
      */
     public static Method[] getMethodsWithAnnotation(final Class<?> cls, final Class<? extends Annotation> annotationCls, final boolean searchSupers,
@@ -490,11 +490,11 @@ public static Method[] getMethodsWithAnnotation(final Class<?> cls, final Class<
     /**
      * Gets the hierarchy of overridden methods down to {@code result} respecting generics.
      *
-     * @param method lowest to consider.
-     * @param interfacesBehavior whether to search interfaces, {@code null} {@code implies} false.
-     * @return a {@code Set<Method>} in ascending order from subclass to superclass.
-     * @throws NullPointerException if the specified method is {@code null}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @param method lowest to consider
+     * @param interfacesBehavior whether to search interfaces, {@code null} {@code implies} false
+     * @return a {@code Set<Method>} in ascending order from subclass to superclass
+     * @throws NullPointerException if the specified method is {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      * @since 3.2
      */
@@ -539,21 +539,21 @@ public static Set<Method> getOverrideHierarchy(final Method method, final Interf
      * This uses reflection to invoke the method obtained from a call to {@link #getAccessibleMethod(Class, String, Class[])}.
      * </p>
      *
-     * @param object     invoke method on this object.
-     * @param methodName get method with this name.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param object     invoke method on this object
+     * @param methodName get method with this name
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
      *                                     <li>the number of actual and formal parameters differ;</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws NullPointerException        Thrown if the specified {@code object} is null.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
+     * @throws NullPointerException        thrown if the specified {@code object} is null
      * @since 3.4
      */
     public static Object invokeExactMethod(final Object object, final String methodName)
@@ -568,14 +568,14 @@ public static Object invokeExactMethod(final Object object, final String methodN
      * This uses reflection to invoke the method obtained from a call to {@link #getAccessibleMethod(Class, String, Class[])}.
      * </p>
      *
-     * @param object     invoke method on this object.
-     * @param methodName get method with this name.
-     * @param args       use these arguments - treat null as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param object     invoke method on this object
+     * @param methodName get method with this name
+     * @param args       use these arguments - treat null as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -584,9 +584,9 @@ public static Object invokeExactMethod(final Object object, final String methodN
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws NullPointerException        Thrown if the specified {@code object} is null.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
+     * @throws NullPointerException        thrown if the specified {@code object} is null
      */
     public static Object invokeExactMethod(final Object object, final String methodName, final Object... args)
             throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
@@ -601,15 +601,15 @@ public static Object invokeExactMethod(final Object object, final String methodN
      * This uses reflection to invoke the method obtained from a call to {@link #getAccessibleMethod(Class, String, Class[])}.
      * </p>
      *
-     * @param object         Invokes a method on this object.
-     * @param methodName     Gets a method with this name.
-     * @param args           Method arguments - treat null as empty array.
-     * @param parameterTypes Match these parameters - treat {@code null} as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param object         invokes a method on this object
+     * @param methodName     gets a method with this name
+     * @param args           method arguments - treat null as empty array
+     * @param parameterTypes match these parameters - treat {@code null} as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -618,9 +618,9 @@ public static Object invokeExactMethod(final Object object, final String methodN
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws NullPointerException        Thrown if the specified {@code object} is null.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
+     * @throws NullPointerException        thrown if the specified {@code object} is null
      */
     public static Object invokeExactMethod(final Object object, final String methodName, final Object[] args, final Class<?>[] parameterTypes)
             throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
@@ -638,14 +638,14 @@ public static Object invokeExactMethod(final Object object, final String methodN
      * This uses reflection to invoke the method obtained from a call to {@link #getAccessibleMethod(Class, String, Class[])}.
      * </p>
      *
-     * @param cls        invoke static method on this class.
-     * @param methodName get method with this name.
-     * @param args       use these arguments - treat {@code null} as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param cls        invoke static method on this class
+     * @param methodName get method with this name
+     * @param args       use these arguments - treat {@code null} as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -654,8 +654,8 @@ public static Object invokeExactMethod(final Object object, final String methodN
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
      */
     public static Object invokeExactStaticMethod(final Class<?> cls, final String methodName, final Object... args)
             throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
@@ -670,15 +670,15 @@ public static Object invokeExactStaticMethod(final Class<?> cls, final String me
      * This uses reflection to invoke the method obtained from a call to {@link #getAccessibleMethod(Class, String, Class[])}.
      * </p>
      *
-     * @param cls            invoke static method on this class.
-     * @param methodName     get method with this name.
-     * @param args           use these arguments - treat {@code null} as empty array.
-     * @param parameterTypes match these parameters - treat {@code null} as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param cls            invoke static method on this class
+     * @param methodName     get method with this name
+     * @param args           use these arguments - treat {@code null} as empty array
+     * @param parameterTypes match these parameters - treat {@code null} as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -687,8 +687,8 @@ public static Object invokeExactStaticMethod(final Class<?> cls, final String me
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
      */
     public static Object invokeExactStaticMethod(final Class<?> cls, final String methodName, final Object[] args, final Class<?>[] parameterTypes)
             throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
@@ -706,14 +706,14 @@ public static Object invokeExactStaticMethod(final Class<?> cls, final String me
      * {@link #invokeMethod(Object object, boolean forceAccess, String methodName, Object[] args, Class[] parameterTypes)}.
      * </p>
      *
-     * @param object invoke method on this object.
-     * @param forceAccess force access to invoke method even if it's not accessible.
-     * @param methodName get method with this name.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param object invoke method on this object
+     * @param forceAccess force access to invoke method even if it's not accessible
+     * @param methodName get method with this name
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -722,9 +722,9 @@ public static Object invokeExactStaticMethod(final Class<?> cls, final String me
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws NullPointerException        Thrown if the specified {@code object} is null.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
+     * @throws NullPointerException        thrown if the specified {@code object} is null
      * @see SecurityManager#checkPermission
      * @since 3.5
      */
@@ -746,15 +746,15 @@ public static Object invokeMethod(final Object object, final boolean forceAccess
      * {@link #invokeMethod(Object object, boolean forceAccess, String methodName, Object[] args, Class[] parameterTypes)}.
      * </p>
      *
-     * @param object invoke method on this object.
-     * @param forceAccess force access to invoke method even if it's not accessible.
-     * @param methodName get method with this name.
-     * @param args use these arguments - treat null as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param object invoke method on this object
+     * @param forceAccess force access to invoke method even if it's not accessible
+     * @param methodName get method with this name
+     * @param args use these arguments - treat null as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -763,9 +763,9 @@ public static Object invokeMethod(final Object object, final boolean forceAccess
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws NullPointerException        Thrown if the specified {@code object} is null.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
+     * @throws NullPointerException        thrown if the specified {@code object} is null
      * @see SecurityManager#checkPermission
      * @since 3.5
      */
@@ -784,16 +784,16 @@ public static Object invokeMethod(final Object object, final boolean forceAccess
      * would match a {@code boolean} primitive.
      * </p>
      *
-     * @param object invoke method on this object.
-     * @param forceAccess force access to invoke method even if it's not accessible.
-     * @param methodName get method with this name.
-     * @param args use these arguments - treat null as empty array.
-     * @param parameterTypes match these parameters - treat null as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param object invoke method on this object
+     * @param forceAccess force access to invoke method even if it's not accessible
+     * @param methodName get method with this name
+     * @param args use these arguments - treat null as empty array
+     * @param parameterTypes match these parameters - treat null as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -802,9 +802,9 @@ public static Object invokeMethod(final Object object, final boolean forceAccess
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws NullPointerException        Thrown if the specified {@code object} is null.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
+     * @throws NullPointerException        thrown if the specified {@code object} is null
      * @see SecurityManager#checkPermission
      * @since 3.5
      */
@@ -828,13 +828,13 @@ public static Object invokeMethod(final Object object, final boolean forceAccess
      * {@link #invokeMethod(Object object, String methodName, Object[] args, Class[] parameterTypes)}.
      * </p>
      *
-     * @param object invoke method on this object.
-     * @param methodName get method with this name.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException if there is no such accessible method.
-     * @throws InvocationTargetException wraps an exception thrown by the method invoked.
-     * @throws IllegalAccessException if the requested method is not accessible via reflection.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @param object invoke method on this object
+     * @param methodName get method with this name
+     * @return the value returned by the invoked method
+     * @throws IllegalAccessException if the requested method is not accessible via reflection
+     * @throws InvocationTargetException wraps an exception thrown by the method invoked
+     * @throws NoSuchMethodException if there is no such accessible method
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      * @since 3.4
      */
@@ -859,15 +859,15 @@ public static Object invokeMethod(final Object object, final String methodName)
      * {@link #invokeMethod(Object object, String methodName, Object[] args, Class[] parameterTypes)}.
      * </p>
      *
-     * @param object invoke method on this object.
-     * @param methodName get method with this name.
-     * @param args use these arguments - treat null as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException if there is no such accessible method.
-     * @throws InvocationTargetException wraps an exception thrown by the method invoked.
-     * @throws IllegalAccessException if the requested method is not accessible via reflection.
-     * @throws NullPointerException if the object or method name are {@code null}.
-     * @throws SecurityException if an underlying accessible object's method denies the request.
+     * @param object invoke method on this object
+     * @param methodName get method with this name
+     * @param args use these arguments - treat null as empty array
+     * @return the value returned by the invoked method
+     * @throws IllegalAccessException if the requested method is not accessible via reflection
+     * @throws InvocationTargetException wraps an exception thrown by the method invoked
+     * @throws NoSuchMethodException if there is no such accessible method
+     * @throws NullPointerException if the object or method name are {@code null}
+     * @throws SecurityException if an underlying accessible object's method denies the request
      * @see SecurityManager#checkPermission
      */
     public static Object invokeMethod(final Object object, final String methodName, final Object... args)
@@ -888,15 +888,15 @@ public static Object invokeMethod(final Object object, final String methodName,
      * would match a {@code boolean} primitive.
      * </p>
      *
-     * @param object invoke method on this object.
-     * @param methodName get method with this name.
-     * @param args use these arguments - treat null as empty array.
-     * @param parameterTypes match these parameters - treat null as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param object invoke method on this object
+     * @param methodName get method with this name
+     * @param args use these arguments - treat null as empty array
+     * @param parameterTypes match these parameters - treat null as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -905,9 +905,9 @@ public static Object invokeMethod(final Object object, final String methodName,
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws NullPointerException        Thrown if the specified {@code object} is null.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
+     * @throws NullPointerException        thrown if the specified {@code object} is null
      * @see SecurityManager#checkPermission
      */
     public static Object invokeMethod(final Object object, final String methodName, final Object[] args, final Class<?>[] parameterTypes)
@@ -931,14 +931,14 @@ public static Object invokeMethod(final Object object, final String methodName,
      * {@link #invokeStaticMethod(Class, String, Object[], Class[])}.
      * </p>
      *
-     * @param cls invoke static method on this class.
-     * @param methodName get method with this name.
-     * @param args use these arguments - treat {@code null} as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param cls invoke static method on this class
+     * @param methodName get method with this name
+     * @param args use these arguments - treat {@code null} as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -947,8 +947,8 @@ public static Object invokeMethod(final Object object, final String methodName,
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
      * @see SecurityManager#checkPermission
      */
     public static Object invokeStaticMethod(final Class<?> cls, final String methodName, final Object... args)
@@ -969,15 +969,15 @@ public static Object invokeStaticMethod(final Class<?> cls, final String methodN
      * would match a {@code boolean} primitive.
      * </p>
      *
-     * @param cls invoke static method on this class.
-     * @param methodName get method with this name.
-     * @param args use these arguments - treat {@code null} as empty array.
-     * @param parameterTypes match these parameters - treat {@code null} as empty array.
-     * @return The value returned by the invoked method.
-     * @throws NoSuchMethodException       Thrown if there is no such accessible method.
-     * @throws IllegalAccessException      Thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if:
+     * @param cls invoke static method on this class
+     * @param methodName get method with this name
+     * @param args use these arguments - treat {@code null} as empty array
+     * @param parameterTypes match these parameters - treat {@code null} as empty array
+     * @return the value returned by the invoked method
+     * @throws ExceptionInInitializerError thrown if the initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this found {@code Method} is enforcing Java language access control and the underlying method is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if:
      *                                     <ul>
      *                                     <li>the found {@code Method} is an instance method and the specified {@code object} argument is not an instance of
      *                                     the class or interface declaring the underlying method (or of a subclass or interface implementor);</li>
@@ -986,8 +986,8 @@ public static Object invokeStaticMethod(final Class<?> cls, final String methodN
      *                                     <li>after possible unwrapping, a parameter value can't be converted to the corresponding formal parameter type by a
      *                                     method invocation conversion.</li>
      *                                     </ul>
-     * @throws InvocationTargetException   Thrown if the underlying method throws an exception.
-     * @throws ExceptionInInitializerError Thrown if the initialization provoked by this method fails.
+     * @throws InvocationTargetException   thrown if the underlying method throws an exception
+     * @throws NoSuchMethodException       thrown if there is no such accessible method
      * @see SecurityManager#checkPermission
      */
     public static Object invokeStaticMethod(final Class<?> cls, final String methodName, final Object[] args, final Class<?>[] parameterTypes)
@@ -1019,18 +1019,18 @@ static Object[] toVarArgs(final Executable executable, final Object[] args)
      * We follow the <a href="https://docs.oracle.com/javase/specs/jls/se21/html/jls-5.html#jls-5.1.2">JLS 5.1.2. Widening Primitive Conversion</a> rules.
      * </p>
      *
-     * @param args                 the array of arguments passed to the varags method.
-     * @param methodParameterTypes the declared array of method parameter types.
-     * @return an array of the variadic arguments passed to the method.
-     * @throws NoSuchMethodException       Thrown if the constructor could not be found.
-     * @throws IllegalAccessException      Thrown if this {@code Constructor} object is enforcing Java language access control and the underlying constructor is
-     *                                     inaccessible.
-     * @throws IllegalArgumentException    Thrown if the number of actual and formal parameters differ; if an unwrapping conversion for primitive arguments
+     * @param args                 the array of arguments passed to the varags method
+     * @param methodParameterTypes the declared array of method parameter types
+     * @return an array of the variadic arguments passed to the method
+     * @throws ExceptionInInitializerError thrown if an initialization provoked by this method fails
+     * @throws IllegalAccessException      thrown if this {@code Constructor} object is enforcing Java language access control and the underlying constructor is
+     *                                     inaccessible
+     * @throws IllegalArgumentException    thrown if the number of actual and formal parameters differ; if an unwrapping conversion for primitive arguments
      *                                     fails; or if, after possible unwrapping, a parameter value cannot be converted to the corresponding formal parameter
-     *                                     type by a method invocation conversion; if this constructor pertains to an enum type.
-     * @throws InstantiationException      Thrown if a class that declares the underlying constructor represents an abstract class.
-     * @throws InvocationTargetException   Thrown if an underlying constructor throws an exception.
-     * @throws ExceptionInInitializerError Thrown if an initialization provoked by this method fails.
+     *                                     type by a method invocation conversion; if this constructor pertains to an enum type
+     * @throws InstantiationException      thrown if a class that declares the underlying constructor represents an abstract class
+     * @throws InvocationTargetException   thrown if an underlying constructor throws an exception
+     * @throws NoSuchMethodException       thrown if the constructor could not be found
      * @see <a href="https://docs.oracle.com/javase/specs/jls/se21/html/jls-5.html#jls-5.1.2">JLS 5.1.2. Widening Primitive Conversion</a>
      */
     private static Object[] toVarArgs(final Object[] args, final Class<?>[] methodParameterTypes)
diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
index ee045ab1c85..f7c2940fbd6 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
@@ -57,7 +57,7 @@ private static final class GenericArrayTypeImpl implements GenericArrayType {
         /**
          * Constructs a new instance.
          *
-         * @param componentType of this array type.
+         * @param componentType of this array type
          */
         private GenericArrayTypeImpl(final Type componentType) {
             this.componentType = componentType;
@@ -109,9 +109,9 @@ private static final class ParameterizedTypeImpl implements ParameterizedType {
         /**
          * Constructs a new instance.
          *
-         * @param rawClass      type.
-         * @param useOwner      owner type to use, if any.
-         * @param typeArguments formal type arguments.
+         * @param rawClass      type
+         * @param useOwner      owner type to use, if any
+         * @param typeArguments formal type arguments
          */
         private ParameterizedTypeImpl(final Class<?> rawClass, final Type useOwner, final Type[] typeArguments) {
             this.raw = rawClass;
@@ -201,8 +201,8 @@ public WildcardType build() {
         /**
          * Specify lower bounds of the wildcard type to build.
          *
-         * @param bounds to set.
-         * @return {@code this} instance.
+         * @param bounds to set
+         * @return {@code this} instance
          */
         public WildcardTypeBuilder withLowerBounds(final Type... bounds) {
             this.lowerBounds = bounds;
@@ -212,8 +212,8 @@ public WildcardTypeBuilder withLowerBounds(final Type... bounds) {
         /**
          * Specify upper bounds of the wildcard type to build.
          *
-         * @param bounds to set.
-         * @return {@code this} instance.
+         * @param bounds to set
+         * @return {@code this} instance
          */
         public WildcardTypeBuilder withUpperBounds(final Type... bounds) {
             this.upperBounds = bounds;
@@ -231,8 +231,8 @@ private static final class WildcardTypeImpl implements WildcardType {
         /**
          * Constructs a new instance.
          *
-         * @param upperBounds of this type.
-         * @param lowerBounds of this type.
+         * @param upperBounds of this type
+         * @param lowerBounds of this type
          */
         private WildcardTypeImpl(final Type[] upperBounds, final Type[] lowerBounds) {
             this.upperBounds = ObjectUtils.getIfNull(upperBounds, ArrayUtils.EMPTY_TYPE_ARRAY);
@@ -341,8 +341,8 @@ private static void appendRecursiveTypes(final StringBuilder builder, final int[
     /**
      * Formats a {@link Class} as a {@link String}.
      *
-     * @param cls {@link Class} to format.
-     * @return The class as a String.
+     * @param cls {@link Class} to format
+     * @return the class as a String
      */
     private static <T> String classToString(final Class<T> cls) {
         if (cls.isArray()) {
@@ -366,8 +366,8 @@ private static <T> String classToString(final Class<T> cls) {
     /**
      * Tests, recursively, whether any of the type parameters associated with {@code type} are bound to variables.
      *
-     * @param type The type to check for type variables.
-     * @return Whether any of the type parameters associated with {@code type} are bound to variables.
+     * @param type the type to check for type variables
+     * @return whether any of the type parameters associated with {@code type} are bound to variables
      * @since 3.2
      */
     public static boolean containsTypeVariables(final Type type) {
@@ -414,11 +414,11 @@ private static boolean containsVariableTypeSameParametrizedTypeBound(final TypeV
      * Collection<?>>}.
      * </p>
      *
-     * @param cls                    the class whose type parameters are to be determined, not {@code null}.
-     * @param superParameterizedType the super type from which {@code cls}'s type arguments are to be determined, not {@code null}.
+     * @param cls                    the class whose type parameters are to be determined, not {@code null}
+     * @param superParameterizedType the super type from which {@code cls}'s type arguments are to be determined, not {@code null}
      * @return a {@link Map} of the type assignments that could be determined for the type variables in each type in the inheritance hierarchy from {@code type}
-     *         to {@code toClass} inclusive.
-     * @throws NullPointerException if either {@code cls} or {@code superParameterizedType} is {@code null}.
+     *         to {@code toClass} inclusive
+     * @throws NullPointerException if either {@code cls} or {@code superParameterizedType} is {@code null}
      */
     public static Map<TypeVariable<?>, Type> determineTypeArguments(final Class<?> cls, final ParameterizedType superParameterizedType) {
         Objects.requireNonNull(cls, "cls");
@@ -450,9 +450,9 @@ public static Map<TypeVariable<?>, Type> determineTypeArguments(final Class<?> c
     /**
      * Tests whether {@code t} equals {@code a}.
      *
-     * @param genericArrayType LHS.
-     * @param type             RHS.
-     * @return boolean.
+     * @param genericArrayType LHS
+     * @param type             RHS
+     * @return boolean
      */
     private static boolean equals(final GenericArrayType genericArrayType, final Type type) {
         return type instanceof GenericArrayType && equals(genericArrayType.getGenericComponentType(), ((GenericArrayType) type).getGenericComponentType());
@@ -461,9 +461,9 @@ private static boolean equals(final GenericArrayType genericArrayType, final Typ
     /**
      * Tests whether {@code t} equals {@code p}.
      *
-     * @param parameterizedType LHS.
-     * @param type              RHS.
-     * @return boolean.
+     * @param parameterizedType LHS
+     * @param type              RHS
+     * @return boolean
      */
     private static boolean equals(final ParameterizedType parameterizedType, final Type type) {
         if (type instanceof ParameterizedType) {
@@ -478,9 +478,9 @@ private static boolean equals(final ParameterizedType parameterizedType, final T
     /**
      * Tests whether the given types are equal.
      *
-     * @param type1 The first type.
-     * @param type2 The second type.
-     * @return Whether the given types are equal.
+     * @param type1 the first type
+     * @param type2 the second type
+     * @return whether the given types are equal
      * @since 3.2
      */
     public static boolean equals(final Type type1, final Type type2) {
@@ -502,9 +502,9 @@ public static boolean equals(final Type type1, final Type type2) {
     /**
      * Tests whether the given type arrays are equal.
      *
-     * @param type1 LHS.
-     * @param type2 RHS.
-     * @return Whether the given type arrays are equal.
+     * @param type1 LHS
+     * @param type2 RHS
+     * @return whether the given type arrays are equal
      */
     private static boolean equals(final Type[] type1, final Type[] type2) {
         if (type1.length == type2.length) {
@@ -521,9 +521,9 @@ private static boolean equals(final Type[] type1, final Type[] type2) {
     /**
      * Tests whether {@code wildcardType} equals {@code type}.
      *
-     * @param wildcardType LHS.
-     * @param type         RHS.
-     * @return Whether {@code wildcardType} equals {@code type}.
+     * @param wildcardType LHS
+     * @param type         RHS
+     * @return whether {@code wildcardType} equals {@code type}
      */
     private static boolean equals(final WildcardType wildcardType, final Type type) {
         if (type instanceof WildcardType) {
@@ -537,9 +537,9 @@ private static boolean equals(final WildcardType wildcardType, final Type type)
     /**
      * Helper method to establish the formal parameters for a parameterized type.
      *
-     * @param mappings  map containing the assignments.
-     * @param variables expected map keys.
-     * @return array of map values corresponding to specified keys.
+     * @param mappings  map containing the assignments
+     * @param variables expected map keys
+     * @return array of map values corresponding to specified keys
      */
     private static Type[] extractTypeArgumentsFrom(final Map<TypeVariable<?>, Type> mappings, final TypeVariable<?>[] variables) {
         final Type[] result = new Type[variables.length];
@@ -567,7 +567,7 @@ && containsVariableTypeSameParametrizedTypeBound((TypeVariable<?>) filteredArgum
      * Creates a generic array type instance.
      *
      * @param componentType the type of the elements of the array. For example the component type of {@code boolean[]} is {@code boolean}.
-     * @return {@link GenericArrayType}.
+     * @return {@link GenericArrayType}
      * @since 3.2
      */
     public static GenericArrayType genericArrayType(final Type componentType) {
@@ -577,8 +577,8 @@ public static GenericArrayType genericArrayType(final Type componentType) {
     /**
      * Formats a {@link GenericArrayType} as a {@link String}.
      *
-     * @param genericArrayType {@link GenericArrayType} to format.
-     * @return String.
+     * @param genericArrayType {@link GenericArrayType} to format
+     * @return string
      */
     private static String genericArrayTypeToString(final GenericArrayType genericArrayType) {
         return String.format("%s[]", toString(genericArrayType.getGenericComponentType()));
@@ -587,8 +587,8 @@ private static String genericArrayTypeToString(final GenericArrayType genericArr
     /**
      * Gets the array component type of {@code type}.
      *
-     * @param type the type to be checked.
-     * @return component type or null if type is not an array type.
+     * @param type the type to be checked
+     * @return component type or null if type is not an array type
      */
     public static Type getArrayComponentType(final Type type) {
         if (type instanceof Class<?>) {
@@ -604,9 +604,9 @@ public static Type getArrayComponentType(final Type type) {
     /**
      * Gets the closest parent type to the super class specified by {@code superClass}.
      *
-     * @param cls        the class in question.
-     * @param superClass the super class.
-     * @return the closes parent type.
+     * @param cls        the class in question
+     * @param superClass the super class
+     * @return the closes parent type
      */
     private static Type getClosestParentType(final Class<?> cls, final Class<?> superClass) {
         // only look at the interfaces if the super class is also an interface
@@ -645,9 +645,9 @@ private static Type getClosestParentType(final Class<?> cls, final Class<?> supe
      * Gets an array containing the sole type of {@link Object} if {@link TypeVariable#getBounds()} returns an empty array. Otherwise, it returns the result of
      * {@link TypeVariable#getBounds()} passed into {@link #normalizeUpperBounds}.
      *
-     * @param typeVariable the subject type variable, not {@code null}.
-     * @return a non-empty array containing the bounds of the type variable, which could be {@link Object}.
-     * @throws NullPointerException if {@code typeVariable} is {@code null}.
+     * @param typeVariable the subject type variable, not {@code null}
+     * @return a non-empty array containing the bounds of the type variable, which could be {@link Object}
+     * @throws NullPointerException if {@code typeVariable} is {@code null}
      */
     public static Type[] getImplicitBounds(final TypeVariable<?> typeVariable) {
         return normalizeUpperToObject(Objects.requireNonNull(typeVariable, "typeVariable").getBounds());
@@ -657,9 +657,9 @@ public static Type[] getImplicitBounds(final TypeVariable<?> typeVariable) {
      * Gets an array containing a single value of {@code null} if {@link WildcardType#getLowerBounds()} returns an empty array. Otherwise, it returns the result
      * of {@link WildcardType#getLowerBounds()}.
      *
-     * @param wildcardType the subject wildcard type, not {@code null}.
-     * @return a non-empty array containing the lower bounds of the wildcard type, which could be null.
-     * @throws NullPointerException if {@code wildcardType} is {@code null}.
+     * @param wildcardType the subject wildcard type, not {@code null}
+     * @return a non-empty array containing the lower bounds of the wildcard type, which could be null
+     * @throws NullPointerException if {@code wildcardType} is {@code null}
      */
     public static Type[] getImplicitLowerBounds(final WildcardType wildcardType) {
         Objects.requireNonNull(wildcardType, "wildcardType");
@@ -671,9 +671,9 @@ public static Type[] getImplicitLowerBounds(final WildcardType wildcardType) {
      * Gets an array containing the sole value of {@link Object} if {@link WildcardType#getUpperBounds()} returns an empty array. Otherwise, it returns the
      * result of {@link WildcardType#getUpperBounds()} passed into {@link #normalizeUpperBounds}.
      *
-     * @param wildcardType the subject wildcard type, not {@code null}.
-     * @return a non-empty array containing the upper bounds of the wildcard type.
-     * @throws NullPointerException if {@code wildcardType} is {@code null}.
+     * @param wildcardType the subject wildcard type, not {@code null}
+     * @return a non-empty array containing the upper bounds of the wildcard type
+     * @throws NullPointerException if {@code wildcardType} is {@code null}
      */
     public static Type[] getImplicitUpperBounds(final WildcardType wildcardType) {
         return normalizeUpperToObject(Objects.requireNonNull(wildcardType, "wildcardType").getUpperBounds());
@@ -682,9 +682,9 @@ public static Type[] getImplicitUpperBounds(final WildcardType wildcardType) {
     /**
      * Transforms the passed in type to a {@link Class} object. Type-checking method of convenience.
      *
-     * @param parameterizedType the type to be converted.
-     * @return the corresponding {@link Class} object.
-     * @throws IllegalStateException if the conversion fails.
+     * @param parameterizedType the type to be converted
+     * @return the corresponding {@link Class} object
+     * @throws IllegalStateException if the conversion fails
      */
     private static Class<?> getRawType(final ParameterizedType parameterizedType) {
         final Type rawType = parameterizedType.getRawType();
@@ -704,9 +704,9 @@ private static Class<?> getRawType(final ParameterizedType parameterizedType) {
      * the runtime type of {@code type}: if you know you have a {@link Class} instance, it is already raw; if you know you have a {@link ParameterizedType}, its
      * raw type is only a method call away.
      *
-     * @param type          to resolve.
-     * @param assigningType type to be resolved against.
-     * @return the resolved {@link Class} object or {@code null} if the type could not be resolved.
+     * @param type          to resolve
+     * @param assigningType type to be resolved against
+     * @return the resolved {@link Class} object or {@code null} if the type could not be resolved
      */
     public static Class<?> getRawType(final Type type, final Type assigningType) {
         if (type instanceof Class<?>) {
@@ -760,10 +760,10 @@ public static Class<?> getRawType(final Type type, final Type assigningType) {
     /**
      * Gets a map of the type arguments of a class in the context of {@code toClass}.
      *
-     * @param cls               the class in question.
-     * @param toClass           the context class.
-     * @param subtypeVarAssigns a map with type variables.
-     * @return the {@link Map} with type arguments.
+     * @param cls               the class in question
+     * @param toClass           the context class
+     * @param subtypeVarAssigns a map with type variables
+     * @return the {@link Map} with type arguments
      */
     private static Map<TypeVariable<?>, Type> getTypeArguments(Class<?> cls, final Class<?> toClass, final Map<TypeVariable<?>, Type> subtypeVarAssigns) {
         // make sure they're assignable
@@ -795,8 +795,8 @@ private static Map<TypeVariable<?>, Type> getTypeArguments(Class<?> cls, final C
      * Gets all the type arguments for this parameterized type including owner hierarchy arguments such as {@code Outer<K, V>.Inner<T>.DeepInner<E>} . The
      * arguments are returned in a {@link Map} specifying the argument type for each {@link TypeVariable}.
      *
-     * @param type specifies the subject parameterized type from which to harvest the parameters.
-     * @return a {@link Map} of the type arguments to their respective type variables.
+     * @param type specifies the subject parameterized type from which to harvest the parameters
+     * @return a {@link Map} of the type arguments to their respective type variables
      */
     public static Map<TypeVariable<?>, Type> getTypeArguments(final ParameterizedType type) {
         return getTypeArguments(type, getRawType(type), null);
@@ -805,10 +805,10 @@ public static Map<TypeVariable<?>, Type> getTypeArguments(final ParameterizedTyp
     /**
      * Gets a map of the type arguments of a parameterized type in the context of {@code toClass}.
      *
-     * @param parameterizedType the parameterized type.
-     * @param toClass           the class.
-     * @param subtypeVarAssigns a map with type variables.
-     * @return the {@link Map} with type arguments.
+     * @param parameterizedType the parameterized type
+     * @param toClass           the class
+     * @param subtypeVarAssigns a map with type variables
+     * @return the {@link Map} with type arguments
      */
     private static Map<TypeVariable<?>, Type> getTypeArguments(final ParameterizedType parameterizedType, final Class<?> toClass,
             final Map<TypeVariable<?>, Type> subtypeVarAssigns) {
@@ -879,7 +879,7 @@ private static Map<TypeVariable<?>, Type> getTypeArguments(final ParameterizedTy
      * @param type    the type from which to determine the type parameters of {@code toClass}
      * @param toClass the class whose type parameters are to be determined based on the subtype {@code type}
      * @return a {@link Map} of the type assignments for the type variables in each type in the inheritance hierarchy from {@code type} to {@code toClass}
-     *         inclusive.
+     *         inclusive
      */
     public static Map<TypeVariable<?>, Type> getTypeArguments(final Type type, final Class<?> toClass) {
         return getTypeArguments(type, toClass, null);
@@ -888,10 +888,10 @@ public static Map<TypeVariable<?>, Type> getTypeArguments(final Type type, final
     /**
      * Gets a map of the type arguments of {@code type} in the context of {@code toClass}.
      *
-     * @param type              the type in question.
-     * @param toClass           the class.
-     * @param subtypeVarAssigns a map with type variables.
-     * @return the {@link Map} with type arguments.
+     * @param type              the type in question
+     * @param toClass           the class
+     * @param subtypeVarAssigns a map with type variables
+     * @return the {@link Map} with type arguments
      */
     private static Map<TypeVariable<?>, Type> getTypeArguments(final Type type, final Class<?> toClass, final Map<TypeVariable<?>, Type> subtypeVarAssigns) {
         if (type instanceof Class<?>) {
@@ -930,8 +930,8 @@ private static Map<TypeVariable<?>, Type> getTypeArguments(final Type type, fina
     /**
      * Tests whether the specified type denotes an array type.
      *
-     * @param type the type to be checked.
-     * @return {@code true} if {@code type} is an array class or a {@link GenericArrayType}.
+     * @param type the type to be checked
+     * @return {@code true} if {@code type} is an array class or a {@link GenericArrayType}
      */
     public static boolean isArrayType(final Type type) {
         return type instanceof GenericArrayType || type instanceof Class<?> && ((Class<?>) type).isArray();
@@ -940,9 +940,9 @@ public static boolean isArrayType(final Type type) {
     /**
      * Tests if the subject type may be implicitly cast to the target class following the Java generics rules.
      *
-     * @param type    the subject type to be assigned to the target type.
-     * @param toClass the target class.
-     * @return {@code true} if {@code type} is assignable to {@code toClass}.
+     * @param type    the subject type to be assigned to the target type
+     * @param toClass the target class
+     * @return {@code true} if {@code type} is assignable to {@code toClass}
      */
     private static boolean isAssignable(final Type type, final Class<?> toClass) {
         if (type == null) {
@@ -994,10 +994,10 @@ private static boolean isAssignable(final Type type, final Class<?> toClass) {
     /**
      * Tests if the subject type may be implicitly cast to the target generic array type following the Java generics rules.
      *
-     * @param type               the subject type to be assigned to the target type.
-     * @param toGenericArrayType the target generic array type.
-     * @param typeVarAssigns     a map with type variables.
-     * @return {@code true} if {@code type} is assignable to {@code toGenericArrayType}.
+     * @param type               the subject type to be assigned to the target type
+     * @param toGenericArrayType the target generic array type
+     * @param typeVarAssigns     a map with type variables
+     * @return {@code true} if {@code type} is assignable to {@code toGenericArrayType}
      */
     private static boolean isAssignable(final Type type, final GenericArrayType toGenericArrayType, final Map<TypeVariable<?>, Type> typeVarAssigns) {
         if (type == null) {
@@ -1053,10 +1053,10 @@ private static boolean isAssignable(final Type type, final GenericArrayType toGe
     /**
      * Tests if the subject type may be implicitly cast to the target parameterized type following the Java generics rules.
      *
-     * @param type                the subject type to be assigned to the target type.
-     * @param toParameterizedType the target parameterized type.
-     * @param typeVarAssigns      a map with type variables.
-     * @return {@code true} if {@code type} is assignable to {@code toType}.
+     * @param type                the subject type to be assigned to the target type
+     * @param toParameterizedType the target parameterized type
+     * @param typeVarAssigns      a map with type variables
+     * @return {@code true} if {@code type} is assignable to {@code toType}
      */
     private static boolean isAssignable(final Type type, final ParameterizedType toParameterizedType, final Map<TypeVariable<?>, Type> typeVarAssigns) {
         if (type == null) {
@@ -1125,9 +1125,9 @@ private static boolean isAssignable(final Type type, final ParameterizedType toP
      * Tests if the subject type may be implicitly cast to the target type following the Java generics rules. If both types are {@link Class} objects, the
      * method returns the result of {@link ClassUtils#isAssignable(Class, Class)}.
      *
-     * @param type   the subject type to be assigned to the target type.
-     * @param toType the target type.
-     * @return {@code true} if {@code type} is assignable to {@code toType}.
+     * @param type   the subject type to be assigned to the target type
+     * @param toType the target type
+     * @return {@code true} if {@code type} is assignable to {@code toType}
      */
     public static boolean isAssignable(final Type type, final Type toType) {
         return isAssignable(type, toType, null);
@@ -1136,10 +1136,10 @@ public static boolean isAssignable(final Type type, final Type toType) {
     /**
      * Tests if the subject type may be implicitly cast to the target type following the Java generics rules.
      *
-     * @param type           the subject type to be assigned to the target type.
-     * @param toType         the target type.
-     * @param typeVarAssigns optional map of type variable assignments.
-     * @return {@code true} if {@code type} is assignable to {@code toType}.
+     * @param type           the subject type to be assigned to the target type
+     * @param toType         the target type
+     * @param typeVarAssigns optional map of type variable assignments
+     * @return {@code true} if {@code type} is assignable to {@code toType}
      */
     private static boolean isAssignable(final Type type, final Type toType, final Map<TypeVariable<?>, Type> typeVarAssigns) {
         if (toType == null || toType instanceof Class<?>) {
@@ -1163,10 +1163,10 @@ private static boolean isAssignable(final Type type, final Type toType, final Ma
     /**
      * Tests if the subject type may be implicitly cast to the target type variable following the Java generics rules.
      *
-     * @param type           the subject type to be assigned to the target type.
-     * @param toTypeVariable the target type variable.
-     * @param typeVarAssigns a map with type variables.
-     * @return {@code true} if {@code type} is assignable to {@code toTypeVariable}.
+     * @param type           the subject type to be assigned to the target type
+     * @param toTypeVariable the target type variable
+     * @param typeVarAssigns a map with type variables
+     * @return {@code true} if {@code type} is assignable to {@code toTypeVariable}
      */
     private static boolean isAssignable(final Type type, final TypeVariable<?> toTypeVariable, final Map<TypeVariable<?>, Type> typeVarAssigns) {
         if (type == null) {
@@ -1201,10 +1201,10 @@ private static boolean isAssignable(final Type type, final TypeVariable<?> toTyp
     /**
      * Tests if the subject type may be implicitly cast to the target wildcard type following the Java generics rules.
      *
-     * @param type           the subject type to be assigned to the target type.
-     * @param toWildcardType the target wildcard type.
-     * @param typeVarAssigns a map with type variables.
-     * @return {@code true} if {@code type} is assignable to {@code toWildcardType}.
+     * @param type           the subject type to be assigned to the target type
+     * @param toWildcardType the target wildcard type
+     * @param typeVarAssigns a map with type variables
+     * @return {@code true} if {@code type} is assignable to {@code toWildcardType}
      */
     private static boolean isAssignable(final Type type, final WildcardType toWildcardType, final Map<TypeVariable<?>, Type> typeVarAssigns) {
         if (type == null) {
@@ -1274,8 +1274,8 @@ private static boolean isAssignable(final Type type, final WildcardType toWildca
      * Tests whether the class contains a cyclical reference in the qualified name of a class. If any of the type parameters of A class is extending X class
      * which is in scope of A class, then it forms cycle.
      *
-     * @param cls the class to test.
-     * @return whether the class contains a cyclical reference.
+     * @param cls the class to test
+     * @return whether the class contains a cyclical reference
      */
     private static boolean isCyclical(final Class<?> cls) {
         for (final TypeVariable<?> typeParameter : cls.getTypeParameters()) {
@@ -1291,9 +1291,9 @@ private static boolean isCyclical(final Class<?> cls) {
     /**
      * Tests if the given value can be assigned to the target type following the Java generics rules.
      *
-     * @param value the value to be checked.
-     * @param type  the target type.
-     * @return {@code true} if {@code value} is an instance of {@code type}.
+     * @param value the value to be checked
+     * @param type  the target type
+     * @return {@code true} if {@code value} is an instance of {@code type}
      */
     public static boolean isInstance(final Object value, final Type type) {
         if (type == null) {
@@ -1305,10 +1305,10 @@ public static boolean isInstance(final Object value, final Type type) {
     /**
      * Maps type variables.
      *
-     * @param <T>               the generic type of the class in question.
-     * @param cls               the class in question.
-     * @param parameterizedType the parameterized type.
-     * @param typeVarAssigns    the map to be filled.
+     * @param <T>               the generic type of the class in question
+     * @param cls               the class in question
+     * @param parameterizedType the parameterized type
+     * @param typeVarAssigns    the map to be filled
      */
     private static <T> void mapTypeVariablesToArguments(final Class<T> cls, final ParameterizedType parameterizedType,
             final Map<TypeVariable<?>, Type> typeVarAssigns) {
@@ -1362,9 +1362,9 @@ private static <T> void mapTypeVariablesToArguments(final Class<T> cls, final Pa
      * <K extends java.util.List<String>>
      * }</pre>
      *
-     * @param bounds an array of types representing the upper bounds of either {@link WildcardType} or {@link TypeVariable}, not {@code null}.
-     * @return an array containing the values from {@code bounds} minus the redundant types.
-     * @throws NullPointerException if {@code bounds} is {@code null}.
+     * @param bounds an array of types representing the upper bounds of either {@link WildcardType} or {@link TypeVariable}, not {@code null}
+     * @return an array containing the values from {@code bounds} minus the redundant types
+     * @throws NullPointerException if {@code bounds} is {@code null}
      */
     public static Type[] normalizeUpperBounds(final Type[] bounds) {
         Objects.requireNonNull(bounds, "bounds");
@@ -1391,9 +1391,9 @@ public static Type[] normalizeUpperBounds(final Type[] bounds) {
     /**
      * Delegates to {@link #normalizeUpperBounds(Type[])} unless {@code bounds} is empty in which case return an array with the element {@code Object.class}.
      *
-     * @param bounds bounds an array of types representing the upper bounds of either {@link WildcardType} or {@link TypeVariable}, not {@code null}.
+     * @param bounds bounds an array of types representing the upper bounds of either {@link WildcardType} or {@link TypeVariable}, not {@code null}
      * @return result from {@link #normalizeUpperBounds(Type[])} unless {@code bounds} is empty in which case return an array with the element
-     *         {@code Object.class}.
+     *         {@code Object.class}
      */
     private static Type[] normalizeUpperToObject(final Type[] bounds) {
         return bounds.length == 0 ? new Type[] { Object.class } : normalizeUpperBounds(bounds);
@@ -1402,10 +1402,10 @@ private static Type[] normalizeUpperToObject(final Type[] bounds) {
     /**
      * Creates a parameterized type instance.
      *
-     * @param rawClass        the raw class to create a parameterized type instance for.
-     * @param typeVariableMap the map used for parameterization.
-     * @return {@link ParameterizedType}.
-     * @throws NullPointerException if either {@code rawClass} or {@code typeVariableMap} is {@code null}.
+     * @param rawClass        the raw class to create a parameterized type instance for
+     * @param typeVariableMap the map used for parameterization
+     * @return {@link ParameterizedType}
+     * @throws NullPointerException if either {@code rawClass} or {@code typeVariableMap} is {@code null}
      * @since 3.2
      */
     public static final ParameterizedType parameterize(final Class<?> rawClass, final Map<TypeVariable<?>, Type> typeVariableMap) {
@@ -1417,10 +1417,10 @@ public static final ParameterizedType parameterize(final Class<?> rawClass, fina
     /**
      * Creates a parameterized type instance.
      *
-     * @param rawClass      the raw class to create a parameterized type instance for.
-     * @param typeArguments the types used for parameterization.
-     * @return {@link ParameterizedType}.
-     * @throws NullPointerException if {@code rawClass} is {@code null}.
+     * @param rawClass      the raw class to create a parameterized type instance for
+     * @param typeArguments the types used for parameterization
+     * @return {@link ParameterizedType}
+     * @throws NullPointerException if {@code rawClass} is {@code null}
      * @since 3.2
      */
     public static final ParameterizedType parameterize(final Class<?> rawClass, final Type... typeArguments) {
@@ -1430,8 +1430,8 @@ public static final ParameterizedType parameterize(final Class<?> rawClass, fina
     /**
      * Formats a {@link ParameterizedType} as a {@link String}.
      *
-     * @param parameterizedType {@link ParameterizedType} to format.
-     * @return String.
+     * @param parameterizedType {@link ParameterizedType} to format
+     * @return string
      */
     private static String parameterizedTypeToString(final ParameterizedType parameterizedType) {
         final StringBuilder builder = new StringBuilder();
@@ -1459,11 +1459,11 @@ private static String parameterizedTypeToString(final ParameterizedType paramete
     /**
      * Creates a parameterized type instance.
      *
-     * @param owner           the owning type.
-     * @param rawClass        the raw class to create a parameterized type instance for.
-     * @param typeVariableMap the map used for parameterization.
-     * @return {@link ParameterizedType}.
-     * @throws NullPointerException if either {@code rawClass} or {@code typeVariableMap} is {@code null}.
+     * @param owner           the owning type
+     * @param rawClass        the raw class to create a parameterized type instance for
+     * @param typeVariableMap the map used for parameterization
+     * @return {@link ParameterizedType}
+     * @throws NullPointerException if either {@code rawClass} or {@code typeVariableMap} is {@code null}
      * @since 3.2
      */
     public static final ParameterizedType parameterizeWithOwner(final Type owner, final Class<?> rawClass, final Map<TypeVariable<?>, Type> typeVariableMap) {
@@ -1475,11 +1475,11 @@ public static final ParameterizedType parameterizeWithOwner(final Type owner, fi
     /**
      * Creates a parameterized type instance.
      *
-     * @param owner         the owning type.
-     * @param rawClass      the raw class to create a parameterized type instance for.
-     * @param typeArguments the types used for parameterization.
-     * @return {@link ParameterizedType}.
-     * @throws NullPointerException if {@code rawClass} is {@code null}.
+     * @param owner         the owning type
+     * @param rawClass      the raw class to create a parameterized type instance for
+     * @param typeArguments the types used for parameterization
+     * @return {@link ParameterizedType}
+     * @throws NullPointerException if {@code rawClass} is {@code null}
      * @since 3.2
      */
     public static final ParameterizedType parameterizeWithOwner(final Type owner, final Class<?> rawClass, final Type... typeArguments) {
@@ -1503,10 +1503,10 @@ public static final ParameterizedType parameterizeWithOwner(final Type owner, fi
     /**
      * Finds the mapping for {@code type} in {@code typeVarAssigns}.
      *
-     * @param type           the type to be replaced.
-     * @param typeVarAssigns the map with type variables.
-     * @return the replaced type.
-     * @throws IllegalArgumentException if the type cannot be substituted.
+     * @param type           the type to be replaced
+     * @param typeVarAssigns the map with type variables
+     * @return the replaced type
+     * @throws IllegalArgumentException if the type cannot be substituted
      */
     private static Type substituteTypeVariables(final Type type, final Map<TypeVariable<?>, Type> typeVarAssigns) {
         if (type instanceof TypeVariable<?> && typeVarAssigns != null) {
@@ -1522,9 +1522,9 @@ private static Type substituteTypeVariables(final Type type, final Map<TypeVaria
     /**
      * Formats a {@link TypeVariable} including its {@link GenericDeclaration}.
      *
-     * @param typeVariable the type variable to create a String representation for, not {@code null}.
-     * @return String.
-     * @throws NullPointerException if {@code typeVariable} is {@code null}.
+     * @param typeVariable the type variable to create a String representation for, not {@code null}
+     * @return string
+     * @throws NullPointerException if {@code typeVariable} is {@code null}
      * @since 3.2
      */
     public static String toLongString(final TypeVariable<?> typeVariable) {
@@ -1552,9 +1552,9 @@ public static String toLongString(final TypeVariable<?> typeVariable) {
     /**
      * Formats a given type as a Java-esque String.
      *
-     * @param type the type to create a String representation for, not {@code null}.
-     * @return String.
-     * @throws NullPointerException if {@code type} is {@code null}.
+     * @param type the type to create a String representation for, not {@code null}
+     * @return string
+     * @throws NullPointerException if {@code type} is {@code null}
      * @since 3.2
      */
     public static String toString(final Type type) {
@@ -1582,9 +1582,9 @@ public static String toString(final Type type) {
      * {@code <T, S extends T>}), uses another as a type parameter (such as {@code <T, S extends Comparable>>}), or otherwise depends on another type variable
      * to be specified, the dependencies must be included in {@code typeVarAssigns}.
      *
-     * @param typeVariableMap specifies the potential types to be assigned to the type variables, not {@code null}.
-     * @return whether or not the types can be assigned to their respective type variables.
-     * @throws NullPointerException if {@code typeVariableMap} is {@code null}.
+     * @param typeVariableMap specifies the potential types to be assigned to the type variables, not {@code null}
+     * @return whether or not the types can be assigned to their respective type variables
+     * @throws NullPointerException if {@code typeVariableMap} is {@code null}
      */
     public static boolean typesSatisfyVariables(final Map<TypeVariable<?>, Type> typeVariableMap) {
         Objects.requireNonNull(typeVariableMap, "typeVariableMap");
@@ -1605,8 +1605,8 @@ public static boolean typesSatisfyVariables(final Map<TypeVariable<?>, Type> typ
     /**
      * Formats a {@link TypeVariable} as a {@link String}.
      *
-     * @param typeVariable {@link TypeVariable} to format.
-     * @return String.
+     * @param typeVariable {@link TypeVariable} to format
+     * @return string
      */
     private static String typeVariableToString(final TypeVariable<?> typeVariable) {
         final StringBuilder builder = new StringBuilder(typeVariable.getName());
@@ -1635,9 +1635,9 @@ private static String typeVariableToString(final TypeVariable<?> typeVariable) {
     /**
      * Unrolls variables in a type bounds array.
      *
-     * @param typeArguments assignments {@link Map}.
-     * @param bounds        in which to expand variables.
-     * @return {@code bounds} with any variables reassigned.
+     * @param typeArguments assignments {@link Map}
+     * @param bounds        in which to expand variables
+     * @return {@code bounds} with any variables reassigned
      */
     private static Type[] unrollBounds(final Map<TypeVariable<?>, Type> typeArguments, final Type[] bounds) {
         Type[] result = bounds;
@@ -1656,9 +1656,9 @@ private static Type[] unrollBounds(final Map<TypeVariable<?>, Type> typeArgument
     /**
      * Looks up {@code typeVariable} in {@code typeVarAssigns} <em>transitively</em>, i.e. keep looking until the value found is <em>not</em> a type variable.
      *
-     * @param typeVariable   the type variable to look up.
-     * @param typeVarAssigns the map used for the look-up.
-     * @return Type or {@code null} if some variable was not in the map.
+     * @param typeVariable   the type variable to look up
+     * @param typeVarAssigns the map used for the look-up
+     * @return type or {@code null} if some variable was not in the map
      */
     private static Type unrollVariableAssignments(TypeVariable<?> typeVariable, final Map<TypeVariable<?>, Type> typeVarAssigns) {
         Type result;
@@ -1675,9 +1675,9 @@ private static Type unrollVariableAssignments(TypeVariable<?> typeVariable, fina
     /**
      * Gets a type representing {@code type} with variable assignments "unrolled."
      *
-     * @param typeArguments as from {@link TypeUtils#getTypeArguments(Type, Class)}.
-     * @param type          the type to unroll variable assignments for.
-     * @return Type.
+     * @param typeArguments as from {@link TypeUtils#getTypeArguments(Type, Class)}
+     * @param type          the type to unroll variable assignments for
+     * @return type
      * @since 3.2
      */
     public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments, final Type type) {
@@ -1726,7 +1726,7 @@ private static Type unrollVariables(final Map<TypeVariable<?>, Type> typeArgumen
     /**
      * Creates a new {@link WildcardTypeBuilder}.
      *
-     * @return a new {@link WildcardTypeBuilder}.
+     * @return a new {@link WildcardTypeBuilder}
      * @since 3.2
      */
     public static WildcardTypeBuilder wildcardType() {
@@ -1736,8 +1736,8 @@ public static WildcardTypeBuilder wildcardType() {
     /**
      * Formats a {@link WildcardType} as a {@link String}.
      *
-     * @param wildcardType {@link WildcardType} to format.
-     * @return String.
+     * @param wildcardType {@link WildcardType} to format
+     * @return string
      */
     private static String wildcardTypeToString(final WildcardType wildcardType) {
         final StringBuilder builder = new StringBuilder().append('?');
@@ -1754,9 +1754,9 @@ private static String wildcardTypeToString(final WildcardType wildcardType) {
     /**
      * Wraps the specified {@link Class} in a {@link Typed} wrapper.
      *
-     * @param <T>  generic type.
-     * @param type to wrap.
-     * @return {@code Typed<T>}.
+     * @param <T>  generic type
+     * @param type to wrap
+     * @return {@code Typed<T>}
      * @since 3.2
      */
     public static <T> Typed<T> wrap(final Class<T> type) {
@@ -1766,9 +1766,9 @@ public static <T> Typed<T> wrap(final Class<T> type) {
     /**
      * Wraps the specified {@link Type} in a {@link Typed} wrapper.
      *
-     * @param <T>  inferred generic type.
-     * @param type to wrap.
-     * @return {@code Typed<T>}.
+     * @param <T>  inferred generic type
+     * @param type to wrap
+     * @return {@code Typed<T>}
      * @since 3.2
      */
     public static <T> Typed<T> wrap(final Type type) {
diff --git a/src/main/java/org/apache/commons/lang3/reflect/Typed.java b/src/main/java/org/apache/commons/lang3/reflect/Typed.java
index 9f73ff53c13..e61362727d1 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/Typed.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/Typed.java
@@ -31,7 +31,7 @@ public interface Typed<T> {
     /**
      * Gets the {@link Type} represented by this entity.
      *
-     * @return Type
+     * @return type
      */
     Type getType();
 }
diff --git a/src/main/java/org/apache/commons/lang3/stream/IntStreams.java b/src/main/java/org/apache/commons/lang3/stream/IntStreams.java
index 9ed97b48ebd..da0c63333a8 100644
--- a/src/main/java/org/apache/commons/lang3/stream/IntStreams.java
+++ b/src/main/java/org/apache/commons/lang3/stream/IntStreams.java
@@ -31,8 +31,8 @@ public class IntStreams {
     /**
      * Null-safe version of {@link IntStream#of(int[])}.
      *
-     * @param values the elements of the new stream, may be {@code null}.
-     * @return the new stream on {@code values} or {@link IntStream#empty()}.
+     * @param values the elements of the new stream, may be {@code null}
+     * @return the new stream on {@code values} or {@link IntStream#empty()}
      * @since 3.18.0
      */
     @SafeVarargs // Creating a stream from an array is safe
@@ -43,8 +43,8 @@ public static IntStream of(final int... values) {
     /**
      * Shorthand for {@code IntStream.range(0, i)}.
      *
-     * @param endExclusive the exclusive upper bound.
-     * @return a sequential {@link IntStream} for the range of {@code int} elements.
+     * @param endExclusive the exclusive upper bound
+     * @return a sequential {@link IntStream} for the range of {@code int} elements
      */
     public static IntStream range(final int endExclusive) {
         return IntStream.range(0, endExclusive);
@@ -53,8 +53,8 @@ public static IntStream range(final int endExclusive) {
     /**
      * Shorthand for {@code IntStream.rangeClosed(0, i)}.
      *
-     * @param endInclusive the inclusive upper bound.
-     * @return a sequential {@link IntStream} for the range of {@code int} elements.
+     * @param endInclusive the inclusive upper bound
+     * @return a sequential {@link IntStream} for the range of {@code int} elements
      */
     public static IntStream rangeClosed(final int endInclusive) {
         return IntStream.rangeClosed(0, endInclusive);
diff --git a/src/main/java/org/apache/commons/lang3/stream/LangCollectors.java b/src/main/java/org/apache/commons/lang3/stream/LangCollectors.java
index ad7e115ae23..d232f40370d 100644
--- a/src/main/java/org/apache/commons/lang3/stream/LangCollectors.java
+++ b/src/main/java/org/apache/commons/lang3/stream/LangCollectors.java
@@ -96,11 +96,11 @@ public Supplier<A> supplier() {
     /**
      * Delegates to {@link Stream#collect(Collector)} for a Stream on the given array.
      *
-     * @param <T>       The type of the array elements.
-     * @param <R>       the type of the result.
-     * @param <A>       the intermediate accumulation type of the {@code Collector}.
-     * @param collector the {@code Collector} describing the reduction.
-     * @param array     The array, assumed to be unmodified during use, a null array treated as an empty array.
+     * @param <T>       the type of the array elements
+     * @param <R>       the type of the result
+     * @param <A>       the intermediate accumulation type of the {@code Collector}
+     * @param collector the {@code Collector} describing the reduction
+     * @param array     the array, assumed to be unmodified during use, a null array treated as an empty array
      * @return the result of the reduction
      * @see Stream#collect(Collector)
      * @see Arrays#stream(Object[])
@@ -127,7 +127,7 @@ public static <T, R, A> R collect(final Collector<? super T, A, R> collector, fi
      * returns "123"
      * </pre>
      *
-     * @return A {@code Collector} which concatenates Object elements, separated by the specified delimiter, in encounter order.
+     * @return a {@code Collector} which concatenates Object elements, separated by the specified delimiter, in encounter order
      */
     public static Collector<Object, ?, String> joining() {
         return new SimpleCollector<>(StringBuilder::new, StringBuilder::append, StringBuilder::append, StringBuilder::toString, CH_NOID);
@@ -148,8 +148,8 @@ public static <T, R, A> R collect(final Collector<? super T, A, R> collector, fi
      * returns "1-2-3"
      * </pre>
      *
-     * @param delimiter the delimiter to be used between each element.
-     * @return A {@code Collector} which concatenates Object elements, separated by the specified delimiter, in encounter order.
+     * @param delimiter the delimiter to be used between each element
+     * @return a {@code Collector} which concatenates Object elements, separated by the specified delimiter, in encounter order
      */
     public static Collector<Object, ?, String> joining(final CharSequence delimiter) {
         return joining(delimiter, StringUtils.EMPTY, StringUtils.EMPTY);
@@ -175,7 +175,7 @@ public static <T, R, A> R collect(final Collector<? super T, A, R> collector, fi
      * @param delimiter the delimiter to be used between each element
      * @param prefix the sequence of characters to be used at the beginning of the joined result
      * @param suffix the sequence of characters to be used at the end of the joined result
-     * @return A {@code Collector} which concatenates CharSequence elements, separated by the specified delimiter, in
+     * @return a {@code Collector} which concatenates CharSequence elements, separated by the specified delimiter, in
      *         encounter order
      */
     public static Collector<Object, ?, String> joining(final CharSequence delimiter, final CharSequence prefix, final CharSequence suffix) {
@@ -202,8 +202,8 @@ public static <T, R, A> R collect(final Collector<? super T, A, R> collector, fi
      * @param delimiter the delimiter to be used between each element
      * @param prefix    the sequence of characters to be used at the beginning of the joined result
      * @param suffix    the sequence of characters to be used at the end of the joined result
-     * @param toString  A function that takes an Object and returns a non-null String.
-     * @return A {@code Collector} which concatenates CharSequence elements, separated by the specified delimiter, in encounter order
+     * @param toString  a function that takes an Object and returns a non-null String
+     * @return a {@code Collector} which concatenates CharSequence elements, separated by the specified delimiter, in encounter order
      */
     public static Collector<Object, ?, String> joining(final CharSequence delimiter, final CharSequence prefix, final CharSequence suffix,
         final Function<Object, String> toString) {
diff --git a/src/main/java/org/apache/commons/lang3/stream/Streams.java b/src/main/java/org/apache/commons/lang3/stream/Streams.java
index 1be9b6f8d0f..d6b93674f76 100644
--- a/src/main/java/org/apache/commons/lang3/stream/Streams.java
+++ b/src/main/java/org/apache/commons/lang3/stream/Streams.java
@@ -79,7 +79,7 @@ public class Streams {
     /**
      * A Collector type for arrays.
      *
-     * @param <E> The array type.
+     * @param <E> the array type
      */
     public static class ArrayCollector<E> implements Collector<E, List<E>, E[]> {
         private static final Set<Characteristics> characteristics = Collections.emptySet();
@@ -88,7 +88,7 @@ public static class ArrayCollector<E> implements Collector<E, List<E>, E[]> {
         /**
          * Constructs a new instance for the given element type.
          *
-         * @param elementType The element type.
+         * @param elementType the element type
          */
         public ArrayCollector(final Class<E> elementType) {
             this.elementType = Objects.requireNonNull(elementType, "elementType");
@@ -126,7 +126,7 @@ public Supplier<List<E>> supplier() {
     /**
      * Helps implement {@link Streams#of(Enumeration)}.
      *
-     * @param <T> The element type.
+     * @param <T> the element type
      */
     private static final class EnumerationSpliterator<T> extends AbstractSpliterator<T> {
 
@@ -135,10 +135,10 @@ private static final class EnumerationSpliterator<T> extends AbstractSpliterator
         /**
          * Creates a spliterator reporting the given estimated size and additionalCharacteristics.
          *
-         * @param estimatedSize the estimated size of this spliterator if known, otherwise {@code Long.MAX_VALUE}.
+         * @param estimatedSize the estimated size of this spliterator if known, otherwise {@code Long.MAX_VALUE}
          * @param additionalCharacteristics properties of this spliterator's source or elements. If {@code SIZED} is reported then this spliterator will
          *        additionally report {@code SUBSIZED}.
-         * @param enumeration The Enumeration to wrap.
+         * @param enumeration the Enumeration to wrap
          */
         protected EnumerationSpliterator(final long estimatedSize, final int additionalCharacteristics, final Enumeration<T> enumeration) {
             super(estimatedSize, additionalCharacteristics);
@@ -167,7 +167,7 @@ public boolean tryAdvance(final Consumer<? super T> action) {
     /**
      * A reduced, and simplified version of a {@link Stream} with failable method signatures.
      *
-     * @param <T> The streams element type.
+     * @param <T> the streams element type
      */
     public static class FailableStream<T> {
 
@@ -177,7 +177,7 @@ public static class FailableStream<T> {
         /**
          * Constructs a new instance with the given {@code stream}.
          *
-         * @param stream The stream.
+         * @param stream the stream
          */
         public FailableStream(final Stream<T> stream) {
             this.stream = stream;
@@ -196,9 +196,9 @@ public FailableStream(final Stream<T> stream) {
          * (for all x P(x)). If the stream is empty, the quantification is said to be <em>vacuously satisfied</em> and is always
          * {@code true} (regardless of P(x)).
          *
-         * @param predicate A non-interfering, stateless predicate to apply to elements of this stream
+         * @param predicate a non-interfering, stateless predicate to apply to elements of this stream
          * @return {@code true} If either all elements of the stream match the provided predicate or the stream is empty,
-         *         otherwise {@code false}.
+         *         otherwise {@code false}
          */
         public boolean allMatch(final FailablePredicate<T, ?> predicate) {
             assertNotTerminated();
@@ -217,7 +217,7 @@ public boolean allMatch(final FailablePredicate<T, ?> predicate) {
          * Note This method evaluates the <em>existential quantification</em> of the predicate over the elements of the stream
          * (for some x P(x)).
          *
-         * @param predicate A non-interfering, stateless predicate to apply to elements of this stream
+         * @param predicate a non-interfering, stateless predicate to apply to elements of this stream
          * @return {@code true} if any elements of the stream match the provided predicate, otherwise {@code false}
          */
         public boolean anyMatch(final FailablePredicate<T, ?> predicate) {
@@ -228,7 +228,7 @@ public boolean anyMatch(final FailablePredicate<T, ?> predicate) {
         /**
          * Throws IllegalStateException if this stream is already terminated.
          *
-         * @throws IllegalStateException if this stream is already terminated.
+         * @throws IllegalStateException if this stream is already terminated
          */
         protected void assertNotTerminated() {
             if (terminated) {
@@ -336,14 +336,14 @@ public <A, R> R collect(final Collector<? super T, A, R> collector) {
          * </pre>
          *
          * @param <R> type of the result
-         * @param <A> Type of the accumulator.
+         * @param <A> type of the accumulator
          * @param supplier a function that creates a new result container. For a parallel execution, this function may be called
          *        multiple times and must return a fresh value each time.
-         * @param accumulator An associative, non-interfering, stateless function for incorporating an additional element into a
+         * @param accumulator an associative, non-interfering, stateless function for incorporating an additional element into a
          *        result
-         * @param combiner An associative, non-interfering, stateless function for combining two values, which must be
+         * @param combiner an associative, non-interfering, stateless function for combining two values, which must be
          *        compatible with the accumulator function
-         * @return The result of the reduction
+         * @return the result of the reduction
          */
         public <A, R> R collect(final Supplier<R> supplier, final BiConsumer<R, ? super T> accumulator, final BiConsumer<R, R> combiner) {
             makeTerminated();
@@ -357,7 +357,7 @@ public <A, R> R collect(final Supplier<R> supplier, final BiConsumer<R, ? super
          * </p>
          *
          * @param predicate a non-interfering, stateless predicate to apply to each element to determine if it should be
-         *        included.
+         *        included
          * @return the new stream
          */
         public FailableStream<T> filter(final FailablePredicate<T, ?> predicate) {
@@ -388,7 +388,7 @@ public void forEach(final FailableConsumer<T, ?> action) {
         /**
          * Marks this stream as terminated.
          *
-         * @throws IllegalStateException if this stream is already terminated.
+         * @throws IllegalStateException if this stream is already terminated
          */
         protected void makeTerminated() {
             assertNotTerminated();
@@ -402,8 +402,8 @@ protected void makeTerminated() {
          * This is an intermediate operation.
          * </p>
          *
-         * @param <R> The element type of the new stream
-         * @param mapper A non-interfering, stateless function to apply to each element
+         * @param <R> the element type of the new stream
+         * @param mapper a non-interfering, stateless function to apply to each element
          * @return the new stream
          */
         public <R> FailableStream<R> map(final FailableFunction<T, R, ?> mapper) {
@@ -471,7 +471,7 @@ public T reduce(final T identity, final BinaryOperator<T> accumulator) {
         /**
          * Converts the FailableStream into an equivalent stream.
          *
-         * @return A stream, which will return the same elements, which this FailableStream would return.
+         * @return a stream, which will return the same elements, which this FailableStream would return
          */
         public Stream<T> stream() {
             return stream;
@@ -513,9 +513,9 @@ public Stream<T> stream() {
      * intermediate objects, of type FailableStream), it is much more concise, and readable, and meets the spirit of Lambdas
      * better than the first version.
      *
-     * @param <T> The streams element type.
-     * @param stream The stream, which is being converted.
-     * @return The {@link FailableStream}, which has been created by converting the stream.
+     * @param <T> the streams element type
+     * @param stream the stream, which is being converted
+     * @return the {@link FailableStream}, which has been created by converting the stream
      * @since 3.13.0
      */
     public static <T> FailableStream<T> failableStream(final Collection<T> stream) {
@@ -557,9 +557,9 @@ public static <T> FailableStream<T> failableStream(final Collection<T> stream) {
      * intermediate objects, of type FailableStream), it is much more concise, and readable, and meets the spirit of Lambdas
      * better than the first version.
      *
-     * @param <T> The streams element type.
-     * @param stream The stream, which is being converted.
-     * @return The {@link FailableStream}, which has been created by converting the stream.
+     * @param <T> the streams element type
+     * @param stream the stream, which is being converted
+     * @return the {@link FailableStream}, which has been created by converting the stream
      * @since 3.13.0
      */
     public static <T> FailableStream<T> failableStream(final Stream<T> stream) {
@@ -569,9 +569,9 @@ public static <T> FailableStream<T> failableStream(final Stream<T> stream) {
     /**
      * Shorthand for {@code Streams.failableStream(value == null ? Stream.empty() : Stream.of(value))}.
      *
-     * @param <T> the type of stream elements.
-     * @param value the single element of the new stream, may be {@code null}.
-     * @return the new FailableStream on {@code value} or an empty stream.
+     * @param <T> the type of stream elements
+     * @param value the single element of the new stream, may be {@code null}
+     * @return the new FailableStream on {@code value} or an empty stream
      * @since 3.15.0
      */
     public static <T> FailableStream<T> failableStream(final T value) {
@@ -581,9 +581,9 @@ public static <T> FailableStream<T> failableStream(final T value) {
     /**
      * Shorthand for {@code Streams.failableStream(Streams.of(arrayValues))}.
      *
-     * @param <T> the type of stream elements.
-     * @param values the elements of the new stream, may be {@code null}.
-     * @return the new FailableStream on {@code values} or an empty stream.
+     * @param <T> the type of stream elements
+     * @param values the elements of the new stream, may be {@code null}
+     * @return the new FailableStream on {@code values} or an empty stream
      * @since 3.14.0
      */
     @SafeVarargs // Creating a stream from an array is safe
@@ -600,10 +600,10 @@ public static <T> FailableStream<T> failableStream(final T... values) {
      * {@code (Stream<E>) Streams.toStream(collection).filter(collection, SomeClass.class::isInstance);}
      * </pre>
      *
-     * @param <E> the type of elements in the collection we want to stream.
-     * @param clazz the type of elements in the collection we want to stream.
-     * @param collection the collection to stream or null.
-     * @return A non-null stream that only provides instances we want.
+     * @param <E> the type of elements in the collection we want to stream
+     * @param clazz the type of elements in the collection we want to stream
+     * @param collection the collection to stream or null
+     * @return a non-null stream that only provides instances we want
      * @since 3.13.0
      */
     public static <E> Stream<E> instancesOf(final Class<? super E> clazz, final Collection<? super E> collection) {
@@ -618,9 +618,9 @@ private static <E> Stream<E> instancesOf(final Class<? super E> clazz, final Str
     /**
      * Streams the non-null elements of a collection.
      *
-     * @param <E> the type of elements in the collection.
-     * @param collection the collection to stream or null.
-     * @return A non-null stream that filters out null elements.
+     * @param <E> the type of elements in the collection
+     * @param collection the collection to stream or null
+     * @return a non-null stream that filters out null elements
      * @since 3.13.0
      */
     public static <E> Stream<E> nonNull(final Collection<E> collection) {
@@ -630,9 +630,9 @@ public static <E> Stream<E> nonNull(final Collection<E> collection) {
     /**
      * Streams the non-null element.
      *
-     * @param <E> the type of elements in the collection.
-     * @param array the element to stream or null.
-     * @return A non-null stream that filters out a null element.
+     * @param <E> the type of elements in the collection
+     * @param array the element to stream or null
+     * @return a non-null stream that filters out a null element
      * @since 3.15.0
      */
     public static <E> Stream<E> nonNull(final E array) {
@@ -642,9 +642,9 @@ public static <E> Stream<E> nonNull(final E array) {
     /**
      * Streams the non-null elements of an array.
      *
-     * @param <E> the type of elements in the collection.
-     * @param array the array to stream or null.
-     * @return A non-null stream that filters out null elements.
+     * @param <E> the type of elements in the collection
+     * @param array the array to stream or null
+     * @return a non-null stream that filters out null elements
      * @since 3.13.0
      */
     @SafeVarargs
@@ -655,9 +655,9 @@ public static <E> Stream<E> nonNull(final E... array) {
     /**
      * Streams the non-null elements of a stream.
      *
-     * @param <E> the type of elements in the collection.
-     * @param stream the stream to stream or null.
-     * @return A non-null stream that filters out null elements.
+     * @param <E> the type of elements in the collection
+     * @param stream the stream to stream or null
+     * @return a non-null stream that filters out null elements
      * @since 3.13.0
      */
     public static <E> Stream<E> nonNull(final Stream<E> stream) {
@@ -667,9 +667,9 @@ public static <E> Stream<E> nonNull(final Stream<E> stream) {
     /**
      * Delegates to {@link Collection#stream()} or returns {@link Stream#empty()} if the collection is null.
      *
-     * @param <E> the type of elements in the collection.
-     * @param collection the collection to stream or null.
-     * @return {@link Collection#stream()} or {@link Stream#empty()} if the collection is null.
+     * @param <E> the type of elements in the collection
+     * @param collection the collection to stream or null
+     * @return {@link Collection#stream()} or {@link Stream#empty()} if the collection is null
      * @since 3.13.0
      */
     public static <E> Stream<E> of(final Collection<E> collection) {
@@ -679,9 +679,9 @@ public static <E> Stream<E> of(final Collection<E> collection) {
     /**
      * Streams the elements of the given enumeration in order.
      *
-     * @param <E> The enumeration element type.
-     * @param enumeration The enumeration to stream.
-     * @return a new stream.
+     * @param <E> the enumeration element type
+     * @param enumeration the enumeration to stream
+     * @return a new stream
      * @since 3.13.0
      */
     public static <E> Stream<E> of(final Enumeration<E> enumeration) {
@@ -691,9 +691,9 @@ public static <E> Stream<E> of(final Enumeration<E> enumeration) {
     /**
      * Creates a sequential stream on the given Iterable.
      *
-     * @param <E> the type of elements in the Iterable.
-     * @param iterable the Iterable to stream or null.
-     * @return a new Stream or {@link Stream#empty()} if the Iterable is null.
+     * @param <E> the type of elements in the Iterable
+     * @param iterable the Iterable to stream or null
+     * @return a new Stream or {@link Stream#empty()} if the Iterable is null
      * @since 3.13.0
      */
     public static <E> Stream<E> of(final Iterable<E> iterable) {
@@ -703,9 +703,9 @@ public static <E> Stream<E> of(final Iterable<E> iterable) {
     /**
      * Creates a sequential stream on the given Iterator.
      *
-     * @param <E> the type of elements in the Iterator.
-     * @param iterator the Iterator to stream or null.
-     * @return a new Stream or {@link Stream#empty()} if the Iterator is null.
+     * @param <E> the type of elements in the Iterator
+     * @param iterator the Iterator to stream or null
+     * @return a new Stream or {@link Stream#empty()} if the Iterator is null
      * @since 3.13.0
      */
     public static <E> Stream<E> of(final Iterator<E> iterator) {
@@ -715,9 +715,9 @@ public static <E> Stream<E> of(final Iterator<E> iterator) {
     /**
      * Returns the stream or {@link Stream#empty()} if the stream is null.
      *
-     * @param <E> the type of elements in the collection.
-     * @param stream the stream to stream or null.
-     * @return the stream or {@link Stream#empty()} if the stream is null.
+     * @param <E> the type of elements in the collection
+     * @param stream the stream to stream or null
+     * @return the stream or {@link Stream#empty()} if the stream is null
      * @since 3.13.0
      */
     private static <E> Stream<E> of(final Stream<E> stream) {
@@ -727,9 +727,9 @@ private static <E> Stream<E> of(final Stream<E> stream) {
     /**
      * Null-safe version of {@link Stream#of(Object[])}.
      *
-     * @param <T> the type of stream elements.
-     * @param values the elements of the new stream, may be {@code null}.
-     * @return the new stream on {@code values} or {@link Stream#empty()}.
+     * @param <T> the type of stream elements
+     * @param values the elements of the new stream, may be {@code null}
+     * @return the new stream on {@code values} or {@link Stream#empty()}
      * @since 3.13.0
      */
     @SafeVarargs // Creating a stream from an array is safe
@@ -772,9 +772,9 @@ public static <T> Stream<T> of(final T... values) {
      * intermediate objects, of type FailableStream), it is much more concise, and readable, and meets the spirit of Lambdas
      * better than the first version.
      *
-     * @param <E> The streams element type.
-     * @param collection The stream, which is being converted.
-     * @return The {@link FailableStream}, which has been created by converting the stream.
+     * @param <E> the streams element type
+     * @param collection the stream, which is being converted
+     * @return the {@link FailableStream}, which has been created by converting the stream
      * @deprecated Use {@link #failableStream(Collection)}.
      */
     @Deprecated
@@ -817,9 +817,9 @@ public static <E> FailableStream<E> stream(final Collection<E> collection) {
      * intermediate objects, of type FailableStream), it is much more concise, and readable, and meets the spirit of Lambdas
      * better than the first version.
      *
-     * @param <T> The streams element type.
-     * @param stream The stream, which is being converted.
-     * @return The {@link FailableStream}, which has been created by converting the stream.
+     * @param <T> the streams element type
+     * @param stream the stream, which is being converted
+     * @return the {@link FailableStream}, which has been created by converting the stream
      * @deprecated Use {@link #failableStream(Stream)}.
      */
     @Deprecated
@@ -835,7 +835,7 @@ private static <T> Stream<T> streamOf(final T value) {
      * Returns a {@link Collector} that accumulates the input elements into a new array.
      *
      * @param <T> the type of the input elements
-     * @param elementType Type of an element in the array.
+     * @param elementType type of an element in the array
      * @return a {@link Collector} which collects all the input elements into an array, in encounter order
      */
     public static <T> Collector<T, List<T>, T[]> toArray(final Class<T> elementType) {
diff --git a/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java b/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java
index fdfe382f6f4..0f8bb24192c 100644
--- a/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java
+++ b/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java
@@ -63,7 +63,7 @@ public CompositeFormat(final Format parser, final Format formatter) {
      *
      * @param obj the object to format
      * @param toAppendTo the {@link StringBuffer} to append to
-     * @param pos the FieldPosition to use (or ignore).
+     * @param pos the FieldPosition to use (or ignore)
      * @return {@code toAppendTo}
      * @see Format#format(Object, StringBuffer, FieldPosition)
      */
@@ -109,8 +109,8 @@ public Object parseObject(final String source, final ParsePosition pos) {
     /**
      * Utility method to parse and then reformat a String.
      *
-     * @param input String to reformat
-     * @return A reformatted String
+     * @param input string to reformat
+     * @return a reformatted String
      * @throws ParseException thrown by parseObject(String) call
      */
     public String reformat(final String input) throws ParseException {
diff --git a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
index 000e80e8daf..46e3cbbb609 100644
--- a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
+++ b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
@@ -98,7 +98,7 @@ public class ExtendedMessageFormat extends MessageFormat {
      * Create a new ExtendedMessageFormat for the default locale.
      *
      * @param pattern  the pattern to use, not null
-     * @throws IllegalArgumentException in case of a bad pattern.
+     * @throws IllegalArgumentException in case of a bad pattern
      */
     public ExtendedMessageFormat(final String pattern) {
         this(pattern, Locale.getDefault());
@@ -109,7 +109,7 @@ public ExtendedMessageFormat(final String pattern) {
      *
      * @param pattern  the pattern to use, not null
      * @param locale  the locale to use, not null
-     * @throws IllegalArgumentException in case of a bad pattern.
+     * @throws IllegalArgumentException in case of a bad pattern
      */
     public ExtendedMessageFormat(final String pattern, final Locale locale) {
         this(pattern, locale, null);
@@ -118,10 +118,10 @@ public ExtendedMessageFormat(final String pattern, final Locale locale) {
     /**
      * Create a new ExtendedMessageFormat.
      *
-     * @param pattern  the pattern to use, not null.
-     * @param locale  the locale to use.
-     * @param registry  the registry of format factories, may be null.
-     * @throws IllegalArgumentException in case of a bad pattern.
+     * @param pattern  the pattern to use, not null
+     * @param locale  the locale to use
+     * @param registry  the registry of format factories, may be null
+     * @throws IllegalArgumentException in case of a bad pattern
      */
     public ExtendedMessageFormat(final String pattern, final Locale locale, final Map<String, ? extends FormatFactory> registry) {
         super(EMPTY_PATTERN);
@@ -135,7 +135,7 @@ public ExtendedMessageFormat(final String pattern, final Locale locale, final Ma
      *
      * @param pattern  the pattern to use, not null
      * @param registry  the registry of format factories, may be null
-     * @throws IllegalArgumentException in case of a bad pattern.
+     * @throws IllegalArgumentException in case of a bad pattern
      */
     public ExtendedMessageFormat(final String pattern, final Map<String, ? extends FormatFactory> registry) {
         this(pattern, Locale.getDefault(), registry);
@@ -178,7 +178,7 @@ private StringBuilder appendQuotedString(final String pattern, final ParsePositi
     /**
      * Apply the specified pattern.
      *
-     * @param pattern String
+     * @param pattern string
      */
     @Override
     public final void applyPattern(final String pattern) {
@@ -251,7 +251,7 @@ public final void applyPattern(final String pattern) {
      * Learn whether the specified Collection contains non-null elements.
      *
      * @param coll to check
-     * @return {@code true} if some Object was found, {@code false} otherwise.
+     * @return {@code true} if some Object was found, {@code false} otherwise
      */
     private boolean containsElements(final Collection<?> coll) {
         if (coll == null || coll.isEmpty()) {
@@ -278,8 +278,8 @@ public boolean equals(final Object obj) {
     /**
      * Gets a custom format from a format description.
      *
-     * @param desc String
-     * @return Format
+     * @param desc string
+     * @return format
      */
     private Format getFormat(final String desc) {
         if (registry != null) {
@@ -299,7 +299,7 @@ private Format getFormat(final String desc) {
     }
 
     /**
-     * Consume quoted string only
+     * Consume quoted string only.
      *
      * @param pattern pattern to parse
      * @param pos current parse position
@@ -319,7 +319,7 @@ public int hashCode() {
      * Insert formats back into the pattern for toPattern() support.
      *
      * @param pattern source
-     * @param customPatterns The custom patterns to re-insert, if any
+     * @param customPatterns the custom patterns to re-insert, if any
      * @return full pattern
      */
     private String insertFormats(final String pattern, final ArrayList<String> customPatterns) {
@@ -360,7 +360,7 @@ private String insertFormats(final String pattern, final ArrayList<String> custo
     }
 
     /**
-     * Convenience method to advance parse position by 1
+     * Convenience method to advance parse position by 1.
      *
      * @param pos ParsePosition
      * @return {@code pos}
@@ -375,7 +375,7 @@ private ParsePosition next(final ParsePosition pos) {
      *
      * @param pattern string to parse
      * @param pos current parse position
-     * @return Format description String
+     * @return format description String
      */
     private String parseFormatDescription(final String pattern, final ParsePosition pos) {
         final int start = pos.getIndex();
@@ -405,7 +405,7 @@ private String parseFormatDescription(final String pattern, final ParsePosition
     }
 
     /**
-     * Reads the argument index from the current format element
+     * Reads the argument index from the current format element.
      *
      * @param pattern pattern to parse
      * @param pos current parse position
@@ -449,7 +449,7 @@ private int readArgumentIndex(final String pattern, final ParsePosition pos) {
     /**
      * Consume whitespace from the current parse position.
      *
-     * @param pattern String to read
+     * @param pattern string to read
      * @param pos current position
      */
     private void seekNonWs(final String pattern, final ParsePosition pos) {
diff --git a/src/main/java/org/apache/commons/lang3/text/FormatFactory.java b/src/main/java/org/apache/commons/lang3/text/FormatFactory.java
index a863068b948..f87965b8b4c 100644
--- a/src/main/java/org/apache/commons/lang3/text/FormatFactory.java
+++ b/src/main/java/org/apache/commons/lang3/text/FormatFactory.java
@@ -33,11 +33,11 @@ public interface FormatFactory {
     /**
      * Create or retrieve a format instance.
      *
-     * @param name      The format type name.
-     * @param arguments Arguments used to create the format instance. This allows the {@link FormatFactory} to implement the "format style" concept from
+     * @param name      the format type name
+     * @param arguments arguments used to create the format instance. This allows the {@link FormatFactory} to implement the "format style" concept from
      *                  {@link java.text.MessageFormat}.
-     * @param locale    The locale, may be null.
-     * @return The format instance.
+     * @param locale    the locale, may be null
+     * @return the format instance
      */
     Format getFormat(String name, String arguments, Locale locale);
 }
diff --git a/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java b/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
index d8d5d0d5d94..5a7596031a5 100644
--- a/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
@@ -49,12 +49,12 @@ public class FormattableUtils {
      * with no ellipsis on precision overflow, and padding width underflow with
      * spaces.
      *
-     * @param seq  the string to handle, not null.
-     * @param formatter  the destination formatter, not null.
-     * @param flags  the flags for formatting, see {@link Formattable}.
-     * @param width  the width of the output, see {@link Formattable}.
-     * @param precision  the precision of the output, see {@link Formattable}.
-     * @return the {@code formatter} instance, not null.
+     * @param seq  the string to handle, not null
+     * @param formatter  the destination formatter, not null
+     * @param flags  the flags for formatting, see {@link Formattable}
+     * @param width  the width of the output, see {@link Formattable}
+     * @param precision  the precision of the output, see {@link Formattable}
+     * @return the {@code formatter} instance, not null
      */
     public static Formatter append(final CharSequence seq, final Formatter formatter, final int flags, final int width,
             final int precision) {
@@ -65,13 +65,13 @@ public static Formatter append(final CharSequence seq, final Formatter formatter
      * Handles the common {@link Formattable} operations of truncate-pad-append,
      * with no ellipsis on precision overflow.
      *
-     * @param seq  the string to handle, not null.
-     * @param formatter  the destination formatter, not null.
-     * @param flags  the flags for formatting, see {@link Formattable}.
-     * @param width  the width of the output, see {@link Formattable}.
-     * @param precision  the precision of the output, see {@link Formattable}.
-     * @param padChar  the pad character to use.
-     * @return the {@code formatter} instance, not null.
+     * @param seq  the string to handle, not null
+     * @param formatter  the destination formatter, not null
+     * @param flags  the flags for formatting, see {@link Formattable}
+     * @param width  the width of the output, see {@link Formattable}
+     * @param precision  the precision of the output, see {@link Formattable}
+     * @param padChar  the pad character to use
+     * @return the {@code formatter} instance, not null
      */
     public static Formatter append(final CharSequence seq, final Formatter formatter, final int flags, final int width,
             final int precision, final char padChar) {
@@ -81,15 +81,15 @@ public static Formatter append(final CharSequence seq, final Formatter formatter
     /**
      * Handles the common {@link Formattable} operations of truncate-pad-append.
      *
-     * @param seq  the string to handle, not null.
-     * @param formatter  the destination formatter, not null.
-     * @param flags  the flags for formatting, see {@link Formattable}.
-     * @param width  the width of the output, see {@link Formattable}.
-     * @param precision  the precision of the output, see {@link Formattable}.
-     * @param padChar  the pad character to use.
+     * @param seq  the string to handle, not null
+     * @param formatter  the destination formatter, not null
+     * @param flags  the flags for formatting, see {@link Formattable}
+     * @param width  the width of the output, see {@link Formattable}
+     * @param precision  the precision of the output, see {@link Formattable}
+     * @param padChar  the pad character to use
      * @param ellipsis  the ellipsis to use when precision dictates truncation, null or
-     *  empty causes a hard truncation.
-     * @return the {@code formatter} instance, not null.
+     *  empty causes a hard truncation
+     * @return the {@code formatter} instance, not null
      */
     public static Formatter append(final CharSequence seq, final Formatter formatter, final int flags, final int width,
             final int precision, final char padChar, final CharSequence ellipsis) {
@@ -113,13 +113,13 @@ public static Formatter append(final CharSequence seq, final Formatter formatter
      * padding width underflow with spaces.
      *
      * @param seq  the string to handle, not null
-     * @param formatter  the destination formatter, not null.
-     * @param flags  the flags for formatting, see {@link Formattable}.
-     * @param width  the width of the output, see {@link Formattable}.
-     * @param precision  the precision of the output, see {@link Formattable}.
+     * @param formatter  the destination formatter, not null
+     * @param flags  the flags for formatting, see {@link Formattable}
+     * @param width  the width of the output, see {@link Formattable}
+     * @param precision  the precision of the output, see {@link Formattable}
      * @param ellipsis  the ellipsis to use when precision dictates truncation, null or
-     *  empty causes a hard truncation.
-     * @return the {@code formatter} instance, not null.
+     *  empty causes a hard truncation
+     * @return the {@code formatter} instance, not null
      */
     public static Formatter append(final CharSequence seq, final Formatter formatter, final int flags, final int width,
             final int precision, final CharSequence ellipsis) {
@@ -130,8 +130,8 @@ public static Formatter append(final CharSequence seq, final Formatter formatter
      * Gets the default formatted representation of the specified
      * {@link Formattable}.
      *
-     * @param formattable  the instance to convert to a string, not null.
-     * @return the resulting string, not null.
+     * @param formattable  the instance to convert to a string, not null
+     * @return the resulting string, not null
      */
     public static String toString(final Formattable formattable) {
         return String.format(SIMPLEST_FORMAT, formattable);
diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
index 70fbd1e7b7e..61ca645d535 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -102,25 +102,33 @@ final class StrBuilderReader extends Reader {
         StrBuilderReader() {
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void close() {
             // do nothing
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void mark(final int readAheadLimit) {
             mark = pos;
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public boolean markSupported() {
             return true;
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public int read() {
             if (!ready()) {
@@ -129,7 +137,9 @@ public int read() {
             return charAt(pos++);
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public int read(final char[] b, final int off, int len) {
             if (off < 0 || len < 0 || off > b.length ||
@@ -150,19 +160,25 @@ public int read(final char[] b, final int off, int len) {
             return len;
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public boolean ready() {
             return pos < size();
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void reset() {
             pos = mark;
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public long skip(long n) {
             if (pos + n > size()) {
@@ -187,7 +203,9 @@ final class StrBuilderTokenizer extends StrTokenizer {
         StrBuilderTokenizer() {
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public String getContent() {
             final String str = super.getContent();
@@ -197,7 +215,9 @@ public String getContent() {
             return str;
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         protected List<String> tokenize(final char[] chars, final int offset, final int count) {
             if (chars == null) {
@@ -218,43 +238,57 @@ final class StrBuilderWriter extends Writer {
         StrBuilderWriter() {
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void close() {
             // do nothing
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void flush() {
             // do nothing
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void write(final char[] cbuf) {
             StrBuilder.this.append(cbuf);
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void write(final char[] cbuf, final int off, final int len) {
             StrBuilder.this.append(cbuf, off, len);
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void write(final int c) {
             StrBuilder.this.append((char) c);
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void write(final String str) {
             StrBuilder.this.append(str);
         }
 
-        /** {@inheritDoc} */
+        /**
+         * {@inheritDoc}
+         */
         @Override
         public void write(final String str, final int off, final int len) {
             StrBuilder.this.append(str, off, len);
@@ -297,7 +331,7 @@ public StrBuilder() {
     /**
      * Constructor that creates an empty builder the specified initial capacity.
      *
-     * @param initialCapacity  the initial capacity, zero or less will be converted to 32
+     * @param initialCapacity the initial capacity, zero or less will be converted to 32
      */
     public StrBuilder(int initialCapacity) {
         if (initialCapacity <= 0) {
@@ -310,7 +344,7 @@ public StrBuilder(int initialCapacity) {
      * Constructor that creates a builder from the string, allocating
      * 32 extra characters for growth.
      *
-     * @param str  the string to copy, null treated as blank string
+     * @param str the string to copy, null treated as blank string
      */
     public StrBuilder(final String str) {
         if (str == null) {
@@ -325,7 +359,7 @@ public StrBuilder(final String str) {
      * Appends a boolean value to the string builder.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final boolean value) {
         if (value) {
@@ -348,7 +382,7 @@ public StrBuilder append(final boolean value) {
      * Appends a char value to the string builder.
      *
      * @param ch  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.0
      */
     @Override
@@ -364,7 +398,7 @@ public StrBuilder append(final char ch) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param chars  the char array to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final char[] chars) {
         if (chars == null) {
@@ -387,7 +421,7 @@ public StrBuilder append(final char[] chars) {
      * @param chars  the char array to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final char[] chars, final int startIndex, final int length) {
         if (chars == null) {
@@ -413,7 +447,7 @@ public StrBuilder append(final char[] chars, final int startIndex, final int len
      * Appending null will call {@link #appendNull()}.
      *
      * @param buf  the char buffer to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.4
      */
     public StrBuilder append(final CharBuffer buf) {
@@ -439,7 +473,7 @@ public StrBuilder append(final CharBuffer buf) {
      * @param buf  the char buffer to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.4
      */
     public StrBuilder append(final CharBuffer buf, final int startIndex, final int length) {
@@ -469,7 +503,7 @@ public StrBuilder append(final CharBuffer buf, final int startIndex, final int l
      * Appending null will call {@link #appendNull()}.
      *
      * @param seq  the CharSequence to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.0
      */
     @Override
@@ -499,7 +533,7 @@ public StrBuilder append(final CharSequence seq) {
      * @param seq  the CharSequence to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.0
      */
     @Override
@@ -514,7 +548,7 @@ public StrBuilder append(final CharSequence seq, final int startIndex, final int
      * Appends a double value to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final double value) {
         return append(String.valueOf(value));
@@ -524,7 +558,7 @@ public StrBuilder append(final double value) {
      * Appends a float value to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final float value) {
         return append(String.valueOf(value));
@@ -534,7 +568,7 @@ public StrBuilder append(final float value) {
      * Appends an int value to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final int value) {
         return append(String.valueOf(value));
@@ -544,7 +578,7 @@ public StrBuilder append(final int value) {
      * Appends a long value to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final long value) {
         return append(String.valueOf(value));
@@ -555,7 +589,7 @@ public StrBuilder append(final long value) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param obj  the object to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final Object obj) {
         if (obj == null) {
@@ -572,7 +606,7 @@ public StrBuilder append(final Object obj) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param str  the string builder to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final StrBuilder str) {
         if (str == null) {
@@ -595,7 +629,7 @@ public StrBuilder append(final StrBuilder str) {
      * @param str  the string to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final StrBuilder str, final int startIndex, final int length) {
         if (str == null) {
@@ -621,7 +655,7 @@ public StrBuilder append(final StrBuilder str, final int startIndex, final int l
      * Appending null will call {@link #appendNull()}.
      *
      * @param str  the string to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final String str) {
         if (str == null) {
@@ -644,7 +678,7 @@ public StrBuilder append(final String str) {
      * @param str  the string to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final String str, final int startIndex, final int length) {
         if (str == null) {
@@ -683,7 +717,7 @@ public StrBuilder append(final String format, final Object... objs) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param str  the string buffer to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final StringBuffer str) {
         if (str == null) {
@@ -706,7 +740,7 @@ public StrBuilder append(final StringBuffer str) {
      * @param str  the string to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder append(final StringBuffer str, final int startIndex, final int length) {
         if (str == null) {
@@ -732,7 +766,7 @@ public StrBuilder append(final StringBuffer str, final int startIndex, final int
      * Appending null will call {@link #appendNull()}.
      *
      * @param str the StringBuilder to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.2
      */
     public StrBuilder append(final StringBuilder str) {
@@ -756,7 +790,7 @@ public StrBuilder append(final StringBuilder str) {
      * @param str the StringBuilder to append
      * @param startIndex the start index, inclusive, must be valid
      * @param length the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.2
      */
     public StrBuilder append(final StringBuilder str, final int startIndex, final int length) {
@@ -784,7 +818,7 @@ public StrBuilder append(final StringBuilder str, final int startIndex, final in
      * Each object is appended using {@link #append(Object)}.
      *
      * @param iterable  the iterable to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendAll(final Iterable<?> iterable) {
@@ -800,7 +834,7 @@ public StrBuilder appendAll(final Iterable<?> iterable) {
      * Each object is appended using {@link #append(Object)}.
      *
      * @param it  the iterator to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendAll(final Iterator<?> it) {
@@ -817,7 +851,7 @@ public StrBuilder appendAll(final Iterator<?> it) {
      *
      * @param <T>  the element type
      * @param array  the array to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public <T> StrBuilder appendAll(@SuppressWarnings("unchecked") final T... array) {
@@ -843,7 +877,7 @@ public <T> StrBuilder appendAll(@SuppressWarnings("unchecked") final T... array)
      * @param value  the value to append
      * @param width  the fixed field width, zero or negative has no effect
      * @param padChar  the pad character to use
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendFixedWidthPadLeft(final int value, final int width, final char padChar) {
         return appendFixedWidthPadLeft(String.valueOf(value), width, padChar);
@@ -858,7 +892,7 @@ public StrBuilder appendFixedWidthPadLeft(final int value, final int width, fina
      * @param obj  the object to append, null uses null text
      * @param width  the fixed field width, zero or negative has no effect
      * @param padChar  the pad character to use
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendFixedWidthPadLeft(final Object obj, final int width, final char padChar) {
         if (width > 0) {
@@ -889,7 +923,7 @@ public StrBuilder appendFixedWidthPadLeft(final Object obj, final int width, fin
      * @param value  the value to append
      * @param width  the fixed field width, zero or negative has no effect
      * @param padChar  the pad character to use
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendFixedWidthPadRight(final int value, final int width, final char padChar) {
         return appendFixedWidthPadRight(String.valueOf(value), width, padChar);
@@ -904,7 +938,7 @@ public StrBuilder appendFixedWidthPadRight(final int value, final int width, fin
      * @param obj  the object to append, null uses null text
      * @param width  the fixed field width, zero or negative has no effect
      * @param padChar  the pad character to use
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendFixedWidthPadRight(final Object obj, final int width, final char padChar) {
         if (width > 0) {
@@ -930,7 +964,7 @@ public StrBuilder appendFixedWidthPadRight(final Object obj, final int width, fi
      * Appends a boolean value followed by a new line to the string builder.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final boolean value) {
@@ -941,7 +975,7 @@ public StrBuilder appendln(final boolean value) {
      * Appends a char value followed by a new line to the string builder.
      *
      * @param ch  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final char ch) {
@@ -953,7 +987,7 @@ public StrBuilder appendln(final char ch) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param chars  the char array to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final char[] chars) {
@@ -967,7 +1001,7 @@ public StrBuilder appendln(final char[] chars) {
      * @param chars  the char array to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final char[] chars, final int startIndex, final int length) {
@@ -978,7 +1012,7 @@ public StrBuilder appendln(final char[] chars, final int startIndex, final int l
      * Appends a double value followed by a new line to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final double value) {
@@ -989,7 +1023,7 @@ public StrBuilder appendln(final double value) {
      * Appends a float value followed by a new line to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final float value) {
@@ -1000,7 +1034,7 @@ public StrBuilder appendln(final float value) {
      * Appends an int value followed by a new line to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final int value) {
@@ -1011,7 +1045,7 @@ public StrBuilder appendln(final int value) {
      * Appends a long value followed by a new line to the string builder using {@code String.valueOf}.
      *
      * @param value  the value to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final long value) {
@@ -1023,7 +1057,7 @@ public StrBuilder appendln(final long value) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param obj  the object to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final Object obj) {
@@ -1035,7 +1069,7 @@ public StrBuilder appendln(final Object obj) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param str  the string builder to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final StrBuilder str) {
@@ -1049,7 +1083,7 @@ public StrBuilder appendln(final StrBuilder str) {
      * @param str  the string to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final StrBuilder str, final int startIndex, final int length) {
@@ -1061,7 +1095,7 @@ public StrBuilder appendln(final StrBuilder str, final int startIndex, final int
      * Appending null will call {@link #appendNull()}.
      *
      * @param str  the string to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final String str) {
@@ -1075,7 +1109,7 @@ public StrBuilder appendln(final String str) {
      * @param str  the string to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final String str, final int startIndex, final int length) {
@@ -1100,7 +1134,7 @@ public StrBuilder appendln(final String format, final Object... objs) {
      * Appending null will call {@link #appendNull()}.
      *
      * @param str  the string buffer to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final StringBuffer str) {
@@ -1114,7 +1148,7 @@ public StrBuilder appendln(final StringBuffer str) {
      * @param str  the string to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendln(final StringBuffer str, final int startIndex, final int length) {
@@ -1126,7 +1160,7 @@ public StrBuilder appendln(final StringBuffer str, final int startIndex, final i
      * Appending null will call {@link #appendNull()}.
      *
      * @param str  the string builder to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.2
      */
     public StrBuilder appendln(final StringBuilder str) {
@@ -1140,7 +1174,7 @@ public StrBuilder appendln(final StringBuilder str) {
      * @param str  the string builder to append
      * @param startIndex  the start index, inclusive, must be valid
      * @param length  the length to append, must be valid
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 3.2
      */
     public StrBuilder appendln(final StringBuilder str, final int startIndex, final int length) {
@@ -1157,7 +1191,7 @@ public StrBuilder appendln(final StringBuilder str, final int startIndex, final
      * endings even when on Windows.
      * </p>
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @see #getNewLineText()
      * @see #setNewLineText(String)
      */
@@ -1172,7 +1206,7 @@ public StrBuilder appendNewLine() {
     /**
      * Appends the text representing {@code null} to this string builder.
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendNull() {
         if (nullText == null)  {
@@ -1186,7 +1220,7 @@ public StrBuilder appendNull() {
      *
      * @param length  the length to append, negative means no append
      * @param padChar  the character to append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendPadding(final int length, final char padChar) {
         if (length >= 0) {
@@ -1217,7 +1251,7 @@ public StrBuilder appendPadding(final int length, final char padChar) {
      * </p>
      *
      * @param separator  the separator to use
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendSeparator(final char separator) {
@@ -1236,7 +1270,7 @@ public StrBuilder appendSeparator(final char separator) {
      *
      * @param standard the separator if builder is not empty
      * @param defaultIfEmpty the separator if builder is empty
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.5
      */
     public StrBuilder appendSeparator(final char standard, final char defaultIfEmpty) {
@@ -1269,7 +1303,7 @@ public StrBuilder appendSeparator(final char standard, final char defaultIfEmpty
      *
      * @param separator  the separator to use
      * @param loopIndex  the loop index
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendSeparator(final char separator, final int loopIndex) {
@@ -1299,7 +1333,7 @@ public StrBuilder appendSeparator(final char separator, final int loopIndex) {
      * </p>
      *
      * @param separator  the separator to use, null means no separator
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendSeparator(final String separator) {
@@ -1327,7 +1361,7 @@ public StrBuilder appendSeparator(final String separator) {
      *
      * @param separator  the separator to use, null means no separator
      * @param loopIndex  the loop index
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.3
      */
     public StrBuilder appendSeparator(final String separator, final int loopIndex) {
@@ -1363,7 +1397,7 @@ public StrBuilder appendSeparator(final String separator, final int loopIndex) {
      *
      * @param standard the separator if builder is not empty, null means no separator
      * @param defaultIfEmpty the separator if builder is empty, null means no separator
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @since 2.5
      */
     public StrBuilder appendSeparator(final String standard, final String defaultIfEmpty) {
@@ -1383,8 +1417,8 @@ public StrBuilder appendSeparator(final String standard, final String defaultIfE
      *
      * @param appendable  the appendable to append data to
      * @throws IOException  if an I/O error occurs
-     * @since 3.4
      * @see #readFrom(Readable)
+     * @since 3.4
      */
     public void appendTo(final Appendable appendable) throws IOException {
         if (appendable instanceof Writer) {
@@ -1408,7 +1442,7 @@ public void appendTo(final Appendable appendable) throws IOException {
      *
      * @param iterable  the iterable to append
      * @param separator  the separator to use, null means no separator
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendWithSeparators(final Iterable<?> iterable, final String separator) {
         if (iterable != null) {
@@ -1432,7 +1466,7 @@ public StrBuilder appendWithSeparators(final Iterable<?> iterable, final String
      *
      * @param it  the iterator to append
      * @param separator  the separator to use, null means no separator
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendWithSeparators(final Iterator<?> it, final String separator) {
         if (it != null) {
@@ -1455,7 +1489,7 @@ public StrBuilder appendWithSeparators(final Iterator<?> it, final String separa
      *
      * @param array  the array to append
      * @param separator  the separator to use, null means no separator
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder appendWithSeparators(final Object[] array, final String separator) {
         if (array != null && array.length > 0) {
@@ -1569,8 +1603,8 @@ public Writer asWriter() {
      * Implement the {@link Builder} interface.
      *
      * @return the builder as a String
-     * @since 3.2
      * @see #toString()
+     * @since 3.2
      */
     @Override
     public String build() {
@@ -1589,11 +1623,11 @@ public int capacity() {
     /**
      * Gets the character at the specified index.
      *
-     * @see #setCharAt(int, char)
-     * @see #deleteCharAt(int)
      * @param index  the index to retrieve, must be valid
      * @return the character at the index
      * @throws IndexOutOfBoundsException if the index is invalid
+     * @see #setCharAt(int, char)
+     * @see #deleteCharAt(int)
      */
     @Override
     public char charAt(final int index) {
@@ -1614,7 +1648,7 @@ public char charAt(final int index) {
      * and is provided to match the API of Collections.
      * </p>
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder clear() {
         size = 0;
@@ -1669,7 +1703,7 @@ public boolean contains(final StrMatcher matcher) {
      * @param startIndex  the start index, inclusive, must be valid
      * @param endIndex  the end index, exclusive, must be valid except
      *  that if too large it is treated as end of string
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder delete(final int startIndex, int endIndex) {
@@ -1685,7 +1719,7 @@ public StrBuilder delete(final int startIndex, int endIndex) {
      * Deletes the character wherever it occurs in the builder.
      *
      * @param ch  the character to delete
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder deleteAll(final char ch) {
         for (int i = 0; i < size; i++) {
@@ -1708,7 +1742,7 @@ public StrBuilder deleteAll(final char ch) {
      * Deletes the string wherever it occurs in the builder.
      *
      * @param str  the string to delete, null causes no action
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder deleteAll(final String str) {
         final int len = StringUtils.length(str);
@@ -1731,7 +1765,7 @@ public StrBuilder deleteAll(final String str) {
      * </p>
      *
      * @param matcher  the matcher to use to find the deletion, null causes no action
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder deleteAll(final StrMatcher matcher) {
         return replace(matcher, null, 0, size, -1);
@@ -1740,11 +1774,11 @@ public StrBuilder deleteAll(final StrMatcher matcher) {
     /**
      * Deletes the character at the specified index.
      *
-     * @see #charAt(int)
-     * @see #setCharAt(int, char)
      * @param index  the index to delete
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
+     * @see #charAt(int)
+     * @see #setCharAt(int, char)
      */
     public StrBuilder deleteCharAt(final int index) {
         if (index < 0 || index >= size) {
@@ -1758,7 +1792,7 @@ public StrBuilder deleteCharAt(final int index) {
      * Deletes the character wherever it occurs in the builder.
      *
      * @param ch  the character to delete
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder deleteFirst(final char ch) {
         for (int i = 0; i < size; i++) {
@@ -1774,7 +1808,7 @@ public StrBuilder deleteFirst(final char ch) {
      * Deletes the string wherever it occurs in the builder.
      *
      * @param str  the string to delete, null causes no action
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder deleteFirst(final String str) {
         final int len = StringUtils.length(str);
@@ -1796,7 +1830,7 @@ public StrBuilder deleteFirst(final String str) {
      * </p>
      *
      * @param matcher  the matcher to use to find the deletion, null causes no action
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder deleteFirst(final StrMatcher matcher) {
         return replace(matcher, null, 0, size, 1);
@@ -1848,7 +1882,7 @@ public boolean endsWith(final String str) {
      * Checks the capacity and ensures that it is at least the size specified.
      *
      * @param capacity  the capacity to ensure
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder ensureCapacity(final int capacity) {
         if (capacity > buffer.length) {
@@ -1943,8 +1977,8 @@ public char[] getChars(char[] destination) {
      * @param endIndex  last index, exclusive, must be valid
      * @param destination  the destination array, must not be null or too small
      * @param destinationIndex  the index to start copying in destination
-     * @throws NullPointerException if the array is null
      * @throws IndexOutOfBoundsException if any index is invalid
+     * @throws NullPointerException if the array is null
      */
     public void getChars(final int startIndex, final int endIndex, final char[] destination, final int destinationIndex) {
         if (startIndex < 0) {
@@ -1962,7 +1996,7 @@ public void getChars(final int startIndex, final int endIndex, final char[] dest
     /**
      * Gets the text to be appended when a {@link #appendNewLine() new line} is added.
      *
-     * @return The new line text, {@code null} means use the system default from {@link System#lineSeparator()}.
+     * @return the new line text, {@code null} means use the system default from {@link System#lineSeparator()}
      */
     public String getNewLineText() {
         return newLine;
@@ -2099,7 +2133,7 @@ public int indexOf(final StrMatcher matcher, int startIndex) {
      *
      * @param index  the index to add at, must be valid
      * @param value  the value to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(int index, final boolean value) {
@@ -2130,7 +2164,7 @@ public StrBuilder insert(int index, final boolean value) {
      *
      * @param index  the index to add at, must be valid
      * @param value  the value to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, final char value) {
@@ -2148,7 +2182,7 @@ public StrBuilder insert(final int index, final char value) {
      *
      * @param index  the index to add at, must be valid
      * @param chars  the char array to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, final char[] chars) {
@@ -2174,7 +2208,7 @@ public StrBuilder insert(final int index, final char[] chars) {
      * @param chars  the char array to insert
      * @param offset  the offset into the character array to start at, must be valid
      * @param length  the length of the character array part to copy, must be positive
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if any index is invalid
      */
     public StrBuilder insert(final int index, final char[] chars, final int offset, final int length) {
@@ -2202,7 +2236,7 @@ public StrBuilder insert(final int index, final char[] chars, final int offset,
      *
      * @param index  the index to add at, must be valid
      * @param value  the value to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, final double value) {
@@ -2214,7 +2248,7 @@ public StrBuilder insert(final int index, final double value) {
      *
      * @param index  the index to add at, must be valid
      * @param value  the value to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, final float value) {
@@ -2226,7 +2260,7 @@ public StrBuilder insert(final int index, final float value) {
      *
      * @param index  the index to add at, must be valid
      * @param value  the value to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, final int value) {
@@ -2238,7 +2272,7 @@ public StrBuilder insert(final int index, final int value) {
      *
      * @param index  the index to add at, must be valid
      * @param value  the value to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, final long value) {
@@ -2251,7 +2285,7 @@ public StrBuilder insert(final int index, final long value) {
      *
      * @param index  the index to add at, must be valid
      * @param obj  the object to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, final Object obj) {
@@ -2267,7 +2301,7 @@ public StrBuilder insert(final int index, final Object obj) {
      *
      * @param index  the index to add at, must be valid
      * @param str  the string to insert
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder insert(final int index, String str) {
@@ -2295,7 +2329,7 @@ public StrBuilder insert(final int index, String str) {
      * API of Collections.
      * </p>
      *
-     * @return {@code true} if the size is {@code 0}.
+     * @return {@code true} if the size is {@code 0}
      */
     public boolean isEmpty() {
         return size == 0;
@@ -2308,7 +2342,7 @@ public boolean isEmpty() {
      * API of Collections.
      * </p>
      *
-     * @return {@code true} if the size is greater than {@code 0}.
+     * @return {@code true} if the size is greater than {@code 0}
      * @since 3.12.0
      */
     public boolean isNotEmpty() {
@@ -2482,7 +2516,7 @@ public String midString(int index, final int length) {
     /**
      * Minimizes the capacity to the actual length of the string.
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder minimizeCapacity() {
         if (buffer.length > length()) {
@@ -2497,9 +2531,9 @@ public StrBuilder minimizeCapacity() {
      *
      * @param readable  object to read from
      * @return the number of characters read
-     * @throws IOException if an I/O error occurs.
-     * @since 3.4
+     * @throws IOException if an I/O error occurs
      * @see #appendTo(Appendable)
+     * @since 3.4
      */
     public int readFrom(final Readable readable) throws IOException {
         final int oldSize = size;
@@ -2539,7 +2573,7 @@ public int readFrom(final Readable readable) throws IOException {
      * @param endIndex  the end index, exclusive, must be valid except
      *  that if too large it is treated as end of string
      * @param replaceStr  the string to replace with, null means delete range
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
      */
     public StrBuilder replace(final int startIndex, int endIndex, final String replaceStr) {
@@ -2563,7 +2597,7 @@ public StrBuilder replace(final int startIndex, int endIndex, final String repla
      * @param endIndex  the end index, exclusive, must be valid except
      *  that if too large it is treated as end of string
      * @param replaceCount  the number of times to replace, -1 for replace all
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if start index is invalid
      */
     public StrBuilder replace(
@@ -2579,7 +2613,7 @@ public StrBuilder replace(
      *
      * @param search  the search character
      * @param replace  the replace character
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder replaceAll(final char search, final char replace) {
         if (search != replace) {
@@ -2597,7 +2631,7 @@ public StrBuilder replaceAll(final char search, final char replace) {
      *
      * @param searchStr  the search string, null causes no action to occur
      * @param replaceStr  the replace string, null is equivalent to an empty string
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder replaceAll(final String searchStr, final String replaceStr) {
         final int searchLen = StringUtils.length(searchStr);
@@ -2622,7 +2656,7 @@ public StrBuilder replaceAll(final String searchStr, final String replaceStr) {
      *
      * @param matcher  the matcher to use to find the deletion, null causes no action
      * @param replaceStr  the replace string, null is equivalent to an empty string
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder replaceAll(final StrMatcher matcher, final String replaceStr) {
         return replace(matcher, replaceStr, 0, size, -1);
@@ -2634,7 +2668,7 @@ public StrBuilder replaceAll(final StrMatcher matcher, final String replaceStr)
      *
      * @param search  the search character
      * @param replace  the replace character
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder replaceFirst(final char search, final char replace) {
         if (search != replace) {
@@ -2653,7 +2687,7 @@ public StrBuilder replaceFirst(final char search, final char replace) {
      *
      * @param searchStr  the search string, null causes no action to occur
      * @param replaceStr  the replace string, null is equivalent to an empty string
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder replaceFirst(final String searchStr, final String replaceStr) {
         final int searchLen = StringUtils.length(searchStr);
@@ -2677,7 +2711,7 @@ public StrBuilder replaceFirst(final String searchStr, final String replaceStr)
      *
      * @param matcher  the matcher to use to find the deletion, null causes no action
      * @param replaceStr  the replace string, null is equivalent to an empty string
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder replaceFirst(final StrMatcher matcher, final String replaceStr) {
         return replace(matcher, replaceStr, 0, size, 1);
@@ -2718,7 +2752,7 @@ private void replaceImpl(final int startIndex, final int endIndex, final int rem
      * @param from  the start index, must be valid
      * @param to  the end index (exclusive), must be valid
      * @param replaceCount  the number of times to replace, -1 for replace all
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if any index is invalid
      */
     private StrBuilder replaceImpl(
@@ -2746,7 +2780,7 @@ private StrBuilder replaceImpl(
     /**
      * Reverses the string builder placing each character in the opposite index.
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder reverse() {
         if (size == 0) {
@@ -2789,12 +2823,12 @@ public String rightString(final int length) {
     /**
      * Sets the character at the specified index.
      *
-     * @see #charAt(int)
-     * @see #deleteCharAt(int)
      * @param index  the index to set
      * @param ch  the new character
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the index is invalid
+     * @see #charAt(int)
+     * @see #deleteCharAt(int)
      */
     public StrBuilder setCharAt(final int index, final char ch) {
         if (index < 0 || index >= length()) {
@@ -2809,7 +2843,7 @@ public StrBuilder setCharAt(final int index, final char ch) {
      * or adding filler of Unicode zero.
      *
      * @param length  the length to set to, must be zero or positive
-     * @return {@code this} instance.
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the length is negative
      */
     public StrBuilder setLength(final int length) {
@@ -2829,8 +2863,8 @@ public StrBuilder setLength(final int length) {
     /**
      * Sets the text to be appended when {@link #appendNewLine() new line} is called.
      *
-     * @param newLine the new line text, {@code null} means use the system default from {@link System#lineSeparator()}.
-     * @return {@code this} instance.
+     * @param newLine the new line text, {@code null} means use the system default from {@link System#lineSeparator()}
+     * @return {@code this} instance
      */
     public StrBuilder setNewLineText(final String newLine) {
         this.newLine = newLine;
@@ -2841,7 +2875,7 @@ public StrBuilder setNewLineText(final String newLine) {
      * Sets the text to be appended when null is added.
      *
      * @param nullText  the null text, null means no append
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder setNullText(String nullText) {
         if (StringUtils.isEmpty(nullText)) {
@@ -3012,7 +3046,7 @@ public StringBuilder toStringBuilder() {
      * Trims the builder by removing characters less than or equal to a space
      * from the beginning and end.
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrBuilder trim() {
         if (size == 0) {
diff --git a/src/main/java/org/apache/commons/lang3/text/StrLookup.java b/src/main/java/org/apache/commons/lang3/text/StrLookup.java
index 885707c4e15..2173a83a403 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrLookup.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrLookup.java
@@ -37,7 +37,7 @@
  * key as a primary key, and looked up the value on demand from the database.
  * </p>
  *
- * @param <V> Unused.
+ * @param <V> unused
  * @since 2.2
  * @deprecated As of <a href="https://commons.apache.org/proper/commons-lang/changes-report.html#a3.6">3.6</a>, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/lookup/StringLookupFactory.html">
@@ -49,7 +49,7 @@ public abstract class StrLookup<V> {
     /**
      * Lookup implementation that uses a Map.
      *
-     * @param <V> the type of mapped values.
+     * @param <V> the type of mapped values
      */
     private static final class MapStrLookup<V> extends StrLookup<V> {
 
@@ -59,7 +59,7 @@ private static final class MapStrLookup<V> extends StrLookup<V> {
         /**
          * Creates a new instance backed by a Map.
          *
-         * @param map  the map of keys to values, may be null.
+         * @param map the map of keys to values, may be null
          */
         MapStrLookup(final Map<String, V> map) {
             this.map = map;
@@ -72,8 +72,8 @@ private static final class MapStrLookup<V> extends StrLookup<V> {
          * The map result object is converted to a string using toString().
          * </p>
          *
-         * @param key  the key to be looked up, may be null.
-         * @return the matching value, null if no match.
+         * @param key  the key to be looked up, may be null
+         * @return the matching value, null if no match
          */
         @Override
         public String lookup(final String key) {
@@ -115,9 +115,9 @@ public String lookup(final String key) {
      * The map result object is converted to a string using toString().
      * </p>
      *
-     * @param <V> the type of the values supported by the lookup.
-     * @param map  the map of keys to values, may be null.
-     * @return a lookup using the map, not null.
+     * @param <V> the type of the values supported by the lookup
+     * @param map  the map of keys to values, may be null
+     * @return a lookup using the map, not null
      */
     public static <V> StrLookup<V> mapLookup(final Map<String, V> map) {
         return new MapStrLookup<>(map);
@@ -126,7 +126,7 @@ public static <V> StrLookup<V> mapLookup(final Map<String, V> map) {
     /**
      * Returns a lookup which always returns null.
      *
-     * @return a lookup that always returns null, not null.
+     * @return a lookup that always returns null, not null
      */
     public static StrLookup<?> noneLookup() {
         return NONE_LOOKUP;
@@ -143,7 +143,7 @@ public static StrLookup<?> noneLookup() {
      * If a null key is used, this lookup will throw a NullPointerException.
      * </p>
      *
-     * @return a lookup using system properties, not null.
+     * @return a lookup using system properties, not null
      */
     public static StrLookup<String> systemPropertiesLookup() {
         return SYSTEM_PROPERTIES_LOOKUP;
@@ -179,8 +179,8 @@ protected StrLookup() {
      * assertEquals("2", StrLookup.mapLookup(map).lookup("number"));
      * }</pre>
      *
-     * @param key  the key to be looked up, may be null.
-     * @return the matching value, null if no match.
+     * @param key  the key to be looked up, may be null
+     * @return the matching value, null if no match
      */
     public abstract String lookup(String key);
 }
diff --git a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
index f455e079f29..dc94b9078cb 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
@@ -49,7 +49,7 @@ static final class CharMatcher extends StrMatcher {
         /**
          * Constructor that creates a matcher that matches a single character.
          *
-         * @param ch  the character to match.
+         * @param ch the character to match
          */
         CharMatcher(final char ch) {
             this.ch = ch;
@@ -58,11 +58,11 @@ static final class CharMatcher extends StrMatcher {
         /**
          * Tests whether or not the given character matches.
          *
-         * @param buffer  the text content to match against, do not change.
-         * @param pos  the starting position for the match, valid for buffer.
-         * @param bufferStart  the first active index in the buffer, valid for buffer.
-         * @param bufferEnd  the end index of the active buffer, valid for buffer.
-         * @return the number of matching characters, zero for no match.
+         * @param buffer  the text content to match against, do not change
+         * @param pos  the starting position for the match, valid for buffer
+         * @param bufferStart  the first active index in the buffer, valid for buffer
+         * @param bufferEnd  the end index of the active buffer, valid for buffer
+         * @return the number of matching characters, zero for no match
          */
         @Override
         public int isMatch(final char[] buffer, final int pos, final int bufferStart, final int bufferEnd) {
@@ -81,7 +81,7 @@ static final class CharSetMatcher extends StrMatcher {
         /**
          * Constructor that creates a matcher from a character array.
          *
-         * @param chars  the characters to match, must not be null.
+         * @param chars the characters to match, must not be null
          */
         CharSetMatcher(final char[] chars) {
             this.chars = ArraySorter.sort(chars.clone());
@@ -90,11 +90,11 @@ static final class CharSetMatcher extends StrMatcher {
         /**
          * Returns whether or not the given character matches.
          *
-         * @param buffer  the text content to match against, do not change.
-         * @param pos  the starting position for the match, valid for buffer.
-         * @param bufferStart  the first active index in the buffer, valid for buffer.
-         * @param bufferEnd  the end index of the active buffer, valid for buffer.
-         * @return the number of matching characters, zero for no match.
+         * @param buffer  the text content to match against, do not change
+         * @param pos  the starting position for the match, valid for buffer
+         * @param bufferStart  the first active index in the buffer, valid for buffer
+         * @param bufferEnd  the end index of the active buffer, valid for buffer
+         * @return the number of matching characters, zero for no match
          */
         @Override
         public int isMatch(final char[] buffer, final int pos, final int bufferStart, final int bufferEnd) {
@@ -116,11 +116,11 @@ static final class NoMatcher extends StrMatcher {
         /**
          * Always returns {@code false}.
          *
-         * @param buffer  the text content to match against, do not change.
-         * @param pos  the starting position for the match, valid for buffer.
-         * @param bufferStart  the first active index in the buffer, valid for buffer.
-         * @param bufferEnd  the end index of the active buffer, valid for buffer.
-         * @return the number of matching characters, zero for no match.
+         * @param buffer  the text content to match against, do not change
+         * @param pos  the starting position for the match, valid for buffer
+         * @param bufferStart  the first active index in the buffer, valid for buffer
+         * @param bufferEnd  the end index of the active buffer, valid for buffer
+         * @return the number of matching characters, zero for no match
          */
         @Override
         public int isMatch(final char[] buffer, final int pos, final int bufferStart, final int bufferEnd) {
@@ -139,7 +139,7 @@ static final class StringMatcher extends StrMatcher {
         /**
          * Constructor that creates a matcher from a String.
          *
-         * @param str  the string to match, must not be null
+         * @param str the string to match, must not be null
          */
         StringMatcher(final String str) {
             chars = str.toCharArray();
@@ -148,11 +148,11 @@ static final class StringMatcher extends StrMatcher {
         /**
          * Tests whether or not the given text matches the stored string.
          *
-         * @param buffer  the text content to match against, do not change.
-         * @param pos  the starting position for the match, valid for buffer.
-         * @param bufferStart  the first active index in the buffer, valid for buffer.
-         * @param bufferEnd  the end index of the active buffer, valid for buffer.
-         * @return the number of matching characters, zero for no match.
+         * @param buffer  the text content to match against, do not change
+         * @param pos  the starting position for the match, valid for buffer
+         * @param bufferStart  the first active index in the buffer, valid for buffer
+         * @param bufferEnd  the end index of the active buffer, valid for buffer
+         * @return the number of matching characters, zero for no match
          */
         @Override
         public int isMatch(final char[] buffer, int pos, final int bufferStart, final int bufferEnd) {
@@ -189,11 +189,11 @@ static final class TrimMatcher extends StrMatcher {
         /**
          * Tests whether or not the given character matches.
          *
-         * @param buffer  the text content to match against, do not change.
-         * @param pos  the starting position for the match, valid for buffer.
-         * @param bufferStart  the first active index in the buffer, valid for buffer.
-         * @param bufferEnd  the end index of the active buffer, valid for buffer.
-         * @return the number of matching characters, zero for no match.
+         * @param buffer  the text content to match against, do not change
+         * @param pos  the starting position for the match, valid for buffer
+         * @param bufferStart  the first active index in the buffer, valid for buffer
+         * @param bufferEnd  the end index of the active buffer, valid for buffer
+         * @return the number of matching characters, zero for no match
          */
         @Override
         public int isMatch(final char[] buffer, final int pos, final int bufferStart, final int bufferEnd) {
@@ -250,8 +250,8 @@ public int isMatch(final char[] buffer, final int pos, final int bufferStart, fi
     /**
      * Creates a matcher from a character.
      *
-     * @param ch  the character to match, must not be null.
-     * @return a new Matcher for the given char.
+     * @param ch  the character to match, must not be null
+     * @return a new Matcher for the given char
      */
     public static StrMatcher charMatcher(final char ch) {
         return new CharMatcher(ch);
@@ -260,8 +260,8 @@ public static StrMatcher charMatcher(final char ch) {
     /**
      * Creates a matcher from a set of characters.
      *
-     * @param chars  the characters to match, null or empty matches nothing.
-     * @return a new matcher for the given char[].
+     * @param chars  the characters to match, null or empty matches nothing
+     * @return a new matcher for the given char[]
      */
     public static StrMatcher charSetMatcher(final char... chars) {
         if (ArrayUtils.isEmpty(chars)) {
@@ -276,8 +276,8 @@ public static StrMatcher charSetMatcher(final char... chars) {
     /**
      * Creates a matcher from a string representing a set of characters.
      *
-     * @param chars  the characters to match, null or empty matches nothing.
-     * @return a new Matcher for the given characters.
+     * @param chars  the characters to match, null or empty matches nothing
+     * @return a new Matcher for the given characters
      */
     public static StrMatcher charSetMatcher(final String chars) {
         if (StringUtils.isEmpty(chars)) {
@@ -292,7 +292,7 @@ public static StrMatcher charSetMatcher(final String chars) {
     /**
      * Gets the matcher for the comma character.
      *
-     * @return the matcher for a comma.
+     * @return the matcher for a comma
      */
     public static StrMatcher commaMatcher() {
         return COMMA_MATCHER;
@@ -301,7 +301,7 @@ public static StrMatcher commaMatcher() {
     /**
      * Gets the matcher for the double quote character.
      *
-     * @return the matcher for a double quote.
+     * @return the matcher for a double quote
      */
     public static StrMatcher doubleQuoteMatcher() {
         return DOUBLE_QUOTE_MATCHER;
@@ -310,7 +310,7 @@ public static StrMatcher doubleQuoteMatcher() {
     /**
      * Gets the matcher for no characters.
      *
-     * @return the matcher that matches nothing.
+     * @return the matcher that matches nothing
      */
     public static StrMatcher noneMatcher() {
         return NONE_MATCHER;
@@ -319,7 +319,7 @@ public static StrMatcher noneMatcher() {
     /**
      * Gets the matcher for the single or double quote character.
      *
-     * @return the matcher for a single or double quote.
+     * @return the matcher for a single or double quote
      */
     public static StrMatcher quoteMatcher() {
         return QUOTE_MATCHER;
@@ -328,7 +328,7 @@ public static StrMatcher quoteMatcher() {
     /**
      * Gets the matcher for the single quote character.
      *
-     * @return the matcher for a single quote.
+     * @return the matcher for a single quote
      */
     public static StrMatcher singleQuoteMatcher() {
         return SINGLE_QUOTE_MATCHER;
@@ -337,7 +337,7 @@ public static StrMatcher singleQuoteMatcher() {
     /**
      * Gets the matcher for the space character.
      *
-     * @return the matcher for a space.
+     * @return the matcher for a space
      */
     public static StrMatcher spaceMatcher() {
         return SPACE_MATCHER;
@@ -347,7 +347,7 @@ public static StrMatcher spaceMatcher() {
      * Gets the matcher for the same characters as StringTokenizer,
      * namely space, tab, newline and form-feed.
      *
-     * @return the split matcher.
+     * @return the split matcher
      */
     public static StrMatcher splitMatcher() {
         return SPLIT_MATCHER;
@@ -356,8 +356,8 @@ public static StrMatcher splitMatcher() {
     /**
      * Creates a matcher for a string.
      *
-     * @param str  the string to match, null or empty matches nothing.
-     * @return a new Matcher for the given String.
+     * @param str  the string to match, null or empty matches nothing
+     * @return a new Matcher for the given String
      */
     public static StrMatcher stringMatcher(final String str) {
         if (StringUtils.isEmpty(str)) {
@@ -369,7 +369,7 @@ public static StrMatcher stringMatcher(final String str) {
     /**
      * Gets the matcher for the tab character.
      *
-     * @return the matcher for a tab.
+     * @return the matcher for a tab
      */
     public static StrMatcher tabMatcher() {
         return TAB_MATCHER;
@@ -378,7 +378,7 @@ public static StrMatcher tabMatcher() {
     /**
      * Gets the matcher to String trim() whitespace characters.
      *
-     * @return the trim matcher.
+     * @return the trim matcher
      */
     public static StrMatcher trimMatcher() {
         return TRIM_MATCHER;
@@ -408,9 +408,9 @@ protected StrMatcher() {
      * The number indicates the number of characters that matched.
      * </p>
      *
-     * @param buffer  the text content to match against, do not change.
-     * @param pos  the starting position for the match, valid for buffer.
-     * @return the number of matching characters, zero for no match.
+     * @param buffer  the text content to match against, do not change
+     * @param pos  the starting position for the match, valid for buffer
+     * @return the number of matching characters, zero for no match
      * @since 2.4
      */
     public int isMatch(final char[] buffer, final int pos) {
@@ -440,11 +440,11 @@ public int isMatch(final char[] buffer, final int pos) {
      * The number indicates the number of characters that matched.
      * </p>
      *
-     * @param buffer  the text content to match against, do not change.
-     * @param pos  the starting position for the match, valid for buffer.
-     * @param bufferStart  the first active index in the buffer, valid for buffer.
-     * @param bufferEnd  the end index (exclusive) of the active buffer, valid for buffer.
-     * @return the number of matching characters, zero for no match.
+     * @param buffer  the text content to match against, do not change
+     * @param pos  the starting position for the match, valid for buffer
+     * @param bufferStart  the first active index in the buffer, valid for buffer
+     * @param bufferEnd  the end index (exclusive) of the active buffer, valid for buffer
+     * @return the number of matching characters, zero for no match
      */
     public abstract int isMatch(char[] buffer, int pos, int bufferStart, int bufferEnd);
 
diff --git a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
index 24da18a5c1f..409d72f95ea 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
@@ -174,10 +174,10 @@ public class StrSubstitutor {
      * Replaces all the occurrences of variables in the given source object with
      * their matching values from the map.
      *
-     * @param <V> the type of the values in the map.
-     * @param source  the source text containing the variables to substitute, null returns null.
-     * @param valueMap  the map with the values, may be null.
-     * @return the result of the replace operation.
+     * @param <V> the type of the values in the map
+     * @param source  the source text containing the variables to substitute, null returns null
+     * @param valueMap  the map with the values, may be null
+     * @return the result of the replace operation
      */
     public static <V> String replace(final Object source, final Map<String, V> valueMap) {
         return new StrSubstitutor(valueMap).replace(source);
@@ -188,13 +188,13 @@ public static <V> String replace(final Object source, final Map<String, V> value
      * their matching values from the map. This method allows to specify a
      * custom variable prefix and suffix.
      *
-     * @param <V> the type of the values in the map.
-     * @param source  the source text containing the variables to substitute, null returns null.
-     * @param valueMap  the map with the values, may be null.
-     * @param prefix  the prefix of variables, not null.
-     * @param suffix  the suffix of variables, not null.
-     * @return the result of the replace operation.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param <V> the type of the values in the map
+     * @param source  the source text containing the variables to substitute, null returns null
+     * @param valueMap  the map with the values, may be null
+     * @param prefix  the prefix of variables, not null
+     * @param suffix  the suffix of variables, not null
+     * @return the result of the replace operation
+     * @throws IllegalArgumentException if the prefix or suffix is null
      */
     public static <V> String replace(final Object source, final Map<String, V> valueMap, final String prefix, final String suffix) {
         return new StrSubstitutor(valueMap, prefix, suffix).replace(source);
@@ -204,9 +204,9 @@ public static <V> String replace(final Object source, final Map<String, V> value
      * Replaces all the occurrences of variables in the given source object with their matching
      * values from the properties.
      *
-     * @param source the source text containing the variables to substitute, null returns null.
-     * @param valueProperties the properties with values, may be null.
-     * @return the result of the replace operation.
+     * @param source the source text containing the variables to substitute, null returns null
+     * @param valueProperties the properties with values, may be null
+     * @return the result of the replace operation
      */
     public static String replace(final Object source, final Properties valueProperties) {
         if (valueProperties == null) {
@@ -226,8 +226,8 @@ public static String replace(final Object source, final Properties valueProperti
      * Replaces all the occurrences of variables in the given source object with
      * their matching values from the system properties.
      *
-     * @param source  the source text containing the variables to substitute, null returns null.
-     * @return the result of the replace operation.
+     * @param source  the source text containing the variables to substitute, null returns null
+     * @return the result of the replace operation
      */
     public static String replaceSystemProperties(final Object source) {
         return new StrSubstitutor(StrLookup.systemPropertiesLookup()).replace(source);
@@ -249,7 +249,7 @@ public static String replaceSystemProperties(final Object source) {
     private StrMatcher suffixMatcher;
 
     /**
-     * Stores the default variable value delimiter
+     * Stores the default variable value delimiter.
      */
     private StrMatcher valueDelimiterMatcher;
 
@@ -280,8 +280,8 @@ public StrSubstitutor() {
      * Creates a new instance and initializes it. Uses defaults for variable
      * prefix and suffix and the escaping character.
      *
-     * @param <V> the type of the values in the map.
-     * @param valueMap  the map with the variables' values, may be null.
+     * @param <V> the type of the values in the map
+     * @param valueMap  the map with the variables' values, may be null
      */
     public <V> StrSubstitutor(final Map<String, V> valueMap) {
         this(StrLookup.mapLookup(valueMap), DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
@@ -290,11 +290,11 @@ public <V> StrSubstitutor(final Map<String, V> valueMap) {
     /**
      * Creates a new instance and initializes it. Uses a default escaping character.
      *
-     * @param <V> the type of the values in the map.
-     * @param valueMap  the map with the variables' values, may be null.
-     * @param prefix  the prefix for variables, not null.
-     * @param suffix  the suffix for variables, not null.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param <V> the type of the values in the map
+     * @param valueMap  the map with the variables' values, may be null
+     * @param prefix  the prefix for variables, not null
+     * @param suffix  the suffix for variables, not null
+     * @throws IllegalArgumentException if the prefix or suffix is null
      */
     public <V> StrSubstitutor(final Map<String, V> valueMap, final String prefix, final String suffix) {
         this(StrLookup.mapLookup(valueMap), prefix, suffix, DEFAULT_ESCAPE);
@@ -303,12 +303,12 @@ public <V> StrSubstitutor(final Map<String, V> valueMap, final String prefix, fi
     /**
      * Creates a new instance and initializes it.
      *
-     * @param <V> the type of the values in the map.
-     * @param valueMap  the map with the variables' values, may be null.
-     * @param prefix  the prefix for variables, not null.
-     * @param suffix  the suffix for variables, not null.
-     * @param escape  the escape character.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param <V> the type of the values in the map
+     * @param valueMap  the map with the variables' values, may be null
+     * @param prefix  the prefix for variables, not null
+     * @param suffix  the suffix for variables, not null
+     * @param escape  the escape character
+     * @throws IllegalArgumentException if the prefix or suffix is null
      */
     public <V> StrSubstitutor(final Map<String, V> valueMap, final String prefix, final String suffix, final char escape) {
         this(StrLookup.mapLookup(valueMap), prefix, suffix, escape);
@@ -317,13 +317,13 @@ public <V> StrSubstitutor(final Map<String, V> valueMap, final String prefix, fi
     /**
      * Creates a new instance and initializes it.
      *
-     * @param <V> the type of the values in the map.
-     * @param valueMap  the map with the variables' values, may be null.
-     * @param prefix  the prefix for variables, not null.
-     * @param suffix  the suffix for variables, not null.
-     * @param escape  the escape character.
-     * @param valueDelimiter  the variable default value delimiter, may be null.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param <V> the type of the values in the map
+     * @param valueMap  the map with the variables' values, may be null
+     * @param prefix  the prefix for variables, not null
+     * @param suffix  the suffix for variables, not null
+     * @param escape  the escape character
+     * @param valueDelimiter  the variable default value delimiter, may be null
+     * @throws IllegalArgumentException if the prefix or suffix is null
      * @since 3.2
      */
     public <V> StrSubstitutor(final Map<String, V> valueMap, final String prefix, final String suffix, final char escape, final String valueDelimiter) {
@@ -333,7 +333,7 @@ public <V> StrSubstitutor(final Map<String, V> valueMap, final String prefix, fi
     /**
      * Creates a new instance and initializes it.
      *
-     * @param variableResolver  the variable resolver, may be null
+     * @param variableResolver the variable resolver, may be null
      */
     public StrSubstitutor(final StrLookup<?> variableResolver) {
         this(variableResolver, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
@@ -342,11 +342,11 @@ public StrSubstitutor(final StrLookup<?> variableResolver) {
     /**
      * Creates a new instance and initializes it.
      *
-     * @param variableResolver  the variable resolver, may be null.
-     * @param prefix  the prefix for variables, not null.
-     * @param suffix  the suffix for variables, not null.
-     * @param escape  the escape character.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param variableResolver  the variable resolver, may be null
+     * @param prefix  the prefix for variables, not null
+     * @param suffix  the suffix for variables, not null
+     * @param escape  the escape character
+     * @throws IllegalArgumentException if the prefix or suffix is null
      */
     public StrSubstitutor(final StrLookup<?> variableResolver, final String prefix, final String suffix, final char escape) {
         setVariableResolver(variableResolver);
@@ -359,12 +359,12 @@ public StrSubstitutor(final StrLookup<?> variableResolver, final String prefix,
     /**
      * Creates a new instance and initializes it.
      *
-     * @param variableResolver  the variable resolver, may be null.
-     * @param prefix  the prefix for variables, not null.
-     * @param suffix  the suffix for variables, not null.
-     * @param escape  the escape character.
-     * @param valueDelimiter  the variable default value delimiter string, may be null.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param variableResolver  the variable resolver, may be null
+     * @param prefix  the prefix for variables, not null
+     * @param suffix  the suffix for variables, not null
+     * @param escape  the escape character
+     * @param valueDelimiter  the variable default value delimiter string, may be null
+     * @throws IllegalArgumentException if the prefix or suffix is null
      * @since 3.2
      */
     public StrSubstitutor(final StrLookup<?> variableResolver, final String prefix, final String suffix, final char escape, final String valueDelimiter) {
@@ -378,11 +378,11 @@ public StrSubstitutor(final StrLookup<?> variableResolver, final String prefix,
     /**
      * Creates a new instance and initializes it.
      *
-     * @param variableResolver  the variable resolver, may be null.
-     * @param prefixMatcher  the prefix for variables, not null.
-     * @param suffixMatcher  the suffix for variables, not null.
-     * @param escape  the escape character.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param variableResolver  the variable resolver, may be null
+     * @param prefixMatcher  the prefix for variables, not null
+     * @param suffixMatcher  the suffix for variables, not null
+     * @param escape  the escape character
+     * @throws IllegalArgumentException if the prefix or suffix is null
      */
     public StrSubstitutor(final StrLookup<?> variableResolver, final StrMatcher prefixMatcher, final StrMatcher suffixMatcher, final char escape) {
         this(variableResolver, prefixMatcher, suffixMatcher, escape, DEFAULT_VALUE_DELIMITER);
@@ -391,12 +391,12 @@ public StrSubstitutor(final StrLookup<?> variableResolver, final StrMatcher pref
     /**
      * Creates a new instance and initializes it.
      *
-     * @param variableResolver  the variable resolver, may be null.
-     * @param prefixMatcher  the prefix for variables, not null.
-     * @param suffixMatcher  the suffix for variables, not null.
-     * @param escape  the escape character.
-     * @param valueDelimiterMatcher  the variable default value delimiter matcher, may be null.
-     * @throws IllegalArgumentException if the prefix or suffix is null.
+     * @param variableResolver  the variable resolver, may be null
+     * @param prefixMatcher  the prefix for variables, not null
+     * @param suffixMatcher  the suffix for variables, not null
+     * @param escape  the escape character
+     * @param valueDelimiterMatcher  the variable default value delimiter matcher, may be null
+     * @throws IllegalArgumentException if the prefix or suffix is null
      * @since 3.2
      */
     public StrSubstitutor(final StrLookup<?> variableResolver, final StrMatcher prefixMatcher, final StrMatcher suffixMatcher, final char escape,
@@ -411,8 +411,8 @@ public StrSubstitutor(final StrLookup<?> variableResolver, final StrMatcher pref
     /**
      * Checks if the specified variable is already in the stack (list) of variables.
      *
-     * @param varName  the variable name to check.
-     * @param priorVariables  the list of prior variables.
+     * @param varName  the variable name to check
+     * @param priorVariables  the list of prior variables
      */
     private void checkCyclicSubstitution(final String varName, final List<String> priorVariables) {
         if (!priorVariables.contains(varName)) {
@@ -446,7 +446,7 @@ public char getEscapeChar() {
      * If it returns null, then the variable default value resolution is disabled.
      * </p>
      *
-     * @return the variable default value delimiter matcher in use, may be null.
+     * @return the variable default value delimiter matcher in use, may be null
      * @since 3.2
      */
     public StrMatcher getValueDelimiterMatcher() {
@@ -461,7 +461,7 @@ public StrMatcher getValueDelimiterMatcher() {
      * allowing advanced prefix matches.
      * </p>
      *
-     * @return the prefix matcher in use.
+     * @return the prefix matcher in use
      */
     public StrMatcher getVariablePrefixMatcher() {
         return prefixMatcher;
@@ -470,7 +470,7 @@ public StrMatcher getVariablePrefixMatcher() {
     /**
      * Gets the VariableResolver that is used to lookup variables.
      *
-     * @return the VariableResolver.
+     * @return the VariableResolver
      */
     public StrLookup<?> getVariableResolver() {
         return this.variableResolver;
@@ -484,7 +484,7 @@ public StrLookup<?> getVariableResolver() {
      * allowing advanced suffix matches.
      * </p>
      *
-     * @return the suffix matcher in use.
+     * @return the suffix matcher in use
      */
     public StrMatcher getVariableSuffixMatcher() {
         return suffixMatcher;
@@ -493,7 +493,7 @@ public StrMatcher getVariableSuffixMatcher() {
     /**
      * Tests whether substitution is done in variable names.
      *
-     * @return the substitution in variable names flag.
+     * @return the substitution in variable names flag
      * @since 3.0
      */
     public boolean isEnableSubstitutionInVariables() {
@@ -503,7 +503,7 @@ public boolean isEnableSubstitutionInVariables() {
     /**
      * Tests whether escapes are preserved during substitution.
      *
-     * @return the preserve escape flag.
+     * @return the preserve escape flag
      * @since 3.5
      */
     public boolean isPreserveEscapes() {
@@ -515,8 +515,8 @@ public boolean isPreserveEscapes() {
      * from the resolver using the given source array as a template.
      * The array is not altered by this method.
      *
-     * @param source  the character array to replace in, not altered, null returns null.
-     * @return the result of the replace operation.
+     * @param source  the character array to replace in, not altered, null returns null
+     * @return the result of the replace operation
      */
     public String replace(final char[] source) {
         if (source == null) {
@@ -536,10 +536,10 @@ public String replace(final char[] source) {
      * The rest of the array is not processed, and is not returned.
      * </p>
      *
-     * @param source  the character array to replace in, not altered, null returns null.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the array to be processed, must be valid.
-     * @return the result of the replace operation.
+     * @param source  the character array to replace in, not altered, null returns null
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the array to be processed, must be valid
+     * @return the result of the replace operation
      */
     public String replace(final char[] source, final int offset, final int length) {
         if (source == null) {
@@ -555,8 +555,8 @@ public String replace(final char[] source, final int offset, final int length) {
      * from the resolver using the given source as a template.
      * The source is not altered by this method.
      *
-     * @param source  the buffer to use as a template, not changed, null returns null.
-     * @return the result of the replace operation.
+     * @param source  the buffer to use as a template, not changed, null returns null
+     * @return the result of the replace operation
      * @since 3.2
      */
     public String replace(final CharSequence source) {
@@ -575,10 +575,10 @@ public String replace(final CharSequence source) {
      * The rest of the buffer is not processed, and is not returned.
      * </p>
      *
-     * @param source  the buffer to use as a template, not changed, null returns null.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the array to be processed, must be valid.
-     * @return the result of the replace operation.
+     * @param source  the buffer to use as a template, not changed, null returns null
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the array to be processed, must be valid
+     * @return the result of the replace operation
      * @since 3.2
      */
     public String replace(final CharSequence source, final int offset, final int length) {
@@ -595,8 +595,8 @@ public String replace(final CharSequence source, final int offset, final int len
      * their matching values from the resolver. The input source object is
      * converted to a string using {@code toString} and is not altered.
      *
-     * @param source  the source to replace in, null returns null.
-     * @return the result of the replace operation.
+     * @param source  the source to replace in, null returns null
+     * @return the result of the replace operation
      */
     public String replace(final Object source) {
         if (source == null) {
@@ -612,8 +612,8 @@ public String replace(final Object source) {
      * from the resolver using the given source builder as a template.
      * The builder is not altered by this method.
      *
-     * @param source  the builder to use as a template, not changed, null returns null.
-     * @return the result of the replace operation.
+     * @param source  the builder to use as a template, not changed, null returns null
+     * @return the result of the replace operation
      */
     public String replace(final StrBuilder source) {
         if (source == null) {
@@ -633,10 +633,10 @@ public String replace(final StrBuilder source) {
      * The rest of the builder is not processed, and is not returned.
      * </p>
      *
-     * @param source  the builder to use as a template, not changed, null returns null.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the array to be processed, must be valid.
-     * @return the result of the replace operation.
+     * @param source  the builder to use as a template, not changed, null returns null
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the array to be processed, must be valid
+     * @return the result of the replace operation
      */
     public String replace(final StrBuilder source, final int offset, final int length) {
         if (source == null) {
@@ -651,8 +651,8 @@ public String replace(final StrBuilder source, final int offset, final int lengt
      * Replaces all the occurrences of variables with their matching values
      * from the resolver using the given source string as a template.
      *
-     * @param source  the string to replace in, null returns null.
-     * @return the result of the replace operation.
+     * @param source  the string to replace in, null returns null
+     * @return the result of the replace operation
      */
     public String replace(final String source) {
         if (source == null) {
@@ -673,10 +673,10 @@ public String replace(final String source) {
      * The rest of the string is not processed, and is not returned.
      * </p>
      *
-     * @param source  the string to replace in, null returns null.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the array to be processed, must be valid.
-     * @return the result of the replace operation.
+     * @param source  the string to replace in, null returns null
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the array to be processed, must be valid
+     * @return the result of the replace operation
      */
     public String replace(final String source, final int offset, final int length) {
         if (source == null) {
@@ -694,8 +694,8 @@ public String replace(final String source, final int offset, final int length) {
      * from the resolver using the given source buffer as a template.
      * The buffer is not altered by this method.
      *
-     * @param source  the buffer to use as a template, not changed, null returns null.
-     * @return the result of the replace operation.
+     * @param source  the buffer to use as a template, not changed, null returns null
+     * @return the result of the replace operation
      */
     public String replace(final StringBuffer source) {
         if (source == null) {
@@ -715,10 +715,10 @@ public String replace(final StringBuffer source) {
      * The rest of the buffer is not processed, and is not returned.
      * </p>
      *
-     * @param source  the buffer to use as a template, not changed, null returns null.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the array to be processed, must be valid.
-     * @return the result of the replace operation.
+     * @param source  the buffer to use as a template, not changed, null returns null
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the array to be processed, must be valid
+     * @return the result of the replace operation
      */
     public String replace(final StringBuffer source, final int offset, final int length) {
         if (source == null) {
@@ -733,8 +733,8 @@ public String replace(final StringBuffer source, final int offset, final int len
      * Replaces all the occurrences of variables within the given source
      * builder with their matching values from the resolver.
      *
-     * @param source  the builder to replace in, updated, null returns zero.
-     * @return true if altered.
+     * @param source  the builder to replace in, updated, null returns zero
+     * @return true if altered
      */
     public boolean replaceIn(final StrBuilder source) {
         if (source == null) {
@@ -751,10 +751,10 @@ public boolean replaceIn(final StrBuilder source) {
      * The rest of the builder is not processed, but it is not deleted.
      * </p>
      *
-     * @param source  the builder to replace in, null returns zero.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the builder to be processed, must be valid.
-     * @return true if altered.
+     * @param source  the builder to replace in, null returns zero
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the builder to be processed, must be valid
+     * @return true if altered
      */
     public boolean replaceIn(final StrBuilder source, final int offset, final int length) {
         if (source == null) {
@@ -768,8 +768,8 @@ public boolean replaceIn(final StrBuilder source, final int offset, final int le
      * with their matching values from the resolver.
      * The buffer is updated with the result.
      *
-     * @param source  the buffer to replace in, updated, null returns zero.
-     * @return true if altered.
+     * @param source  the buffer to replace in, updated, null returns zero
+     * @return true if altered
      */
     public boolean replaceIn(final StringBuffer source) {
         if (source == null) {
@@ -787,10 +787,10 @@ public boolean replaceIn(final StringBuffer source) {
      * The rest of the buffer is not processed, but it is not deleted.
      * </p>
      *
-     * @param source  the buffer to replace in, updated, null returns zero.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the buffer to be processed, must be valid.
-     * @return true if altered.
+     * @param source  the buffer to replace in, updated, null returns zero
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the buffer to be processed, must be valid
+     * @return true if altered
      */
     public boolean replaceIn(final StringBuffer source, final int offset, final int length) {
         if (source == null) {
@@ -809,8 +809,8 @@ public boolean replaceIn(final StringBuffer source, final int offset, final int
      * with their matching values from the resolver.
      * The buffer is updated with the result.
      *
-     * @param source  the buffer to replace in, updated, null returns zero.
-     * @return true if altered.
+     * @param source  the buffer to replace in, updated, null returns zero
+     * @return true if altered
      * @since 3.2
      */
     public boolean replaceIn(final StringBuilder source) {
@@ -829,10 +829,10 @@ public boolean replaceIn(final StringBuilder source) {
      * The rest of the buffer is not processed, but it is not deleted.
      * </p>
      *
-     * @param source  the buffer to replace in, updated, null returns zero.
-     * @param offset  the start offset within the array, must be valid.
-     * @param length  the length within the buffer to be processed, must be valid.
-     * @return true if altered.
+     * @param source  the buffer to replace in, updated, null returns zero
+     * @param offset  the start offset within the array, must be valid
+     * @param length  the length within the buffer to be processed, must be valid
+     * @return true if altered
      * @since 3.2
      */
     public boolean replaceIn(final StringBuilder source, final int offset, final int length) {
@@ -860,11 +860,11 @@ public boolean replaceIn(final StringBuilder source, final int offset, final int
      * {@link #getVariableResolver()} with the variable's name as the key.
      * </p>
      *
-     * @param variableName  the name of the variable, not null.
-     * @param buf  the buffer where the substitution is occurring, not null.
-     * @param startPos  the start position of the variable including the prefix, valid.
-     * @param endPos  the end position of the variable including the suffix, valid.
-     * @return the variable's value or <strong>null</strong> if the variable is unknown.
+     * @param variableName  the name of the variable, not null
+     * @param buf  the buffer where the substitution is occurring, not null
+     * @param startPos  the start position of the variable including the prefix, valid
+     * @param endPos  the end position of the variable including the suffix, valid
+     * @return the variable's value or <strong>null</strong> if the variable is unknown
      */
     protected String resolveVariable(final String variableName, final StrBuilder buf, final int startPos, final int endPos) {
         final StrLookup<?> resolver = getVariableResolver();
@@ -880,7 +880,7 @@ protected String resolveVariable(final String variableName, final StrBuilder buf
      * processed first before the original variable is evaluated, e.g.
      * {@code ${jre-${java.version}}}. The default value is <strong>false</strong>.
      *
-     * @param enableSubstitutionInVariables the new value of the flag.
+     * @param enableSubstitutionInVariables the new value of the flag
      * @since 3.0
      */
     public void setEnableSubstitutionInVariables(
@@ -893,7 +893,7 @@ public void setEnableSubstitutionInVariables(
      * If this character is placed before a variable reference in the source
      * text, this variable will be ignored.
      *
-     * @param escapeCharacter  the escape character (0 for disabling escaping)
+     * @param escapeCharacter the escape character (0 for disabling escaping)
      */
     public void setEscapeChar(final char escapeCharacter) {
         this.escapeChar = escapeCharacter;
@@ -908,7 +908,7 @@ public void setEscapeChar(final char escapeCharacter) {
      * {@code $${this-is-escaped}} becomes
      * {@code ${this-is-escaped}}).  The default value is <strong>false</strong>
      *
-     * @param preserveEscapes true if escapes are to be preserved.
+     * @param preserveEscapes true if escapes are to be preserved
      * @since 3.5
      */
     public void setPreserveEscapes(final boolean preserveEscapes) {
@@ -923,8 +923,8 @@ public void setPreserveEscapes(final boolean preserveEscapes) {
      * variable default value delimiter to be easily set.
      * </p>
      *
-     * @param valueDelimiter  the variable default value delimiter character to use.
-     * @return {@code this} instance.
+     * @param valueDelimiter  the variable default value delimiter character to use
+     * @return {@code this} instance
      * @since 3.2
      */
     public StrSubstitutor setValueDelimiter(final char valueDelimiter) {
@@ -943,8 +943,8 @@ public StrSubstitutor setValueDelimiter(final char valueDelimiter) {
      * value resolution becomes disabled.
      * </p>
      *
-     * @param valueDelimiter  the variable default value delimiter string to use, may be null or empty.
-     * @return {@code this} instance.
+     * @param valueDelimiter  the variable default value delimiter string to use, may be null or empty
+     * @return {@code this} instance
      * @since 3.2
      */
     public StrSubstitutor setValueDelimiter(final String valueDelimiter) {
@@ -967,8 +967,8 @@ public StrSubstitutor setValueDelimiter(final String valueDelimiter) {
      * becomes disabled.
      * </p>
      *
-     * @param valueDelimiterMatcher  variable default value delimiter matcher to use, may be null.
-     * @return {@code this} instance.
+     * @param valueDelimiterMatcher  variable default value delimiter matcher to use, may be null
+     * @return {@code this} instance
      * @since 3.2
      */
     public StrSubstitutor setValueDelimiterMatcher(final StrMatcher valueDelimiterMatcher) {
@@ -984,8 +984,8 @@ public StrSubstitutor setValueDelimiterMatcher(final StrMatcher valueDelimiterMa
      * be easily set.
      * </p>
      *
-     * @param prefix  the prefix character to use.
-     * @return {@code this} instance.
+     * @param prefix  the prefix character to use
+     * @return {@code this} instance
      */
     public StrSubstitutor setVariablePrefix(final char prefix) {
         return setVariablePrefixMatcher(StrMatcher.charMatcher(prefix));
@@ -998,9 +998,9 @@ public StrSubstitutor setVariablePrefix(final char prefix) {
      * start of a variable. This method allows a string prefix to be easily set.
      * </p>
      *
-     * @param prefix  the prefix for variables, not null.
-     * @return {@code this} instance.
-     * @throws NullPointerException if the prefix is null.
+     * @param prefix  the prefix for variables, not null
+     * @return {@code this} instance
+     * @throws NullPointerException if the prefix is null
      */
     public StrSubstitutor setVariablePrefix(final String prefix) {
         return setVariablePrefixMatcher(StrMatcher.stringMatcher(Objects.requireNonNull(prefix)));
@@ -1014,9 +1014,9 @@ public StrSubstitutor setVariablePrefix(final String prefix) {
      * allowing advanced prefix matches.
      * </p>
      *
-     * @param prefixMatcher  the prefix matcher to use, null ignored.
-     * @return {@code this} instance.
-     * @throws NullPointerException if the prefix matcher is null.
+     * @param prefixMatcher  the prefix matcher to use, null ignored
+     * @return {@code this} instance
+     * @throws NullPointerException if the prefix matcher is null
      */
     public StrSubstitutor setVariablePrefixMatcher(final StrMatcher prefixMatcher) {
         this.prefixMatcher = Objects.requireNonNull(prefixMatcher, "prefixMatcher");
@@ -1026,7 +1026,7 @@ public StrSubstitutor setVariablePrefixMatcher(final StrMatcher prefixMatcher) {
     /**
      * Sets the VariableResolver that is used to lookup variables.
      *
-     * @param variableResolver  the VariableResolver
+     * @param variableResolver the VariableResolver
      */
     public void setVariableResolver(final StrLookup<?> variableResolver) {
         this.variableResolver = variableResolver;
@@ -1040,8 +1040,8 @@ public void setVariableResolver(final StrLookup<?> variableResolver) {
      * be easily set.
      * </p>
      *
-     * @param suffix  the suffix character to use.
-     * @return {@code this} instance.
+     * @param suffix  the suffix character to use
+     * @return {@code this} instance
      */
     public StrSubstitutor setVariableSuffix(final char suffix) {
         return setVariableSuffixMatcher(StrMatcher.charMatcher(suffix));
@@ -1054,9 +1054,9 @@ public StrSubstitutor setVariableSuffix(final char suffix) {
      * end of a variable. This method allows a string suffix to be easily set.
      * </p>
      *
-     * @param suffix  the suffix for variables, not null.
-     * @return {@code this} instance.
-     * @throws NullPointerException if the suffix is null.
+     * @param suffix  the suffix for variables, not null
+     * @return {@code this} instance
+     * @throws NullPointerException if the suffix is null
      */
     public StrSubstitutor setVariableSuffix(final String suffix) {
         return setVariableSuffixMatcher(StrMatcher.stringMatcher(Objects.requireNonNull(suffix)));
@@ -1070,9 +1070,9 @@ public StrSubstitutor setVariableSuffix(final String suffix) {
      * allowing advanced suffix matches.
      * </p>
      *
-     * @param suffixMatcher  the suffix matcher to use, null ignored.
-     * @return {@code this} instance.
-     * @throws NullPointerException if the suffix matcher is null.
+     * @param suffixMatcher  the suffix matcher to use, null ignored
+     * @return {@code this} instance
+     * @throws NullPointerException if the suffix matcher is null
      */
     public StrSubstitutor setVariableSuffixMatcher(final StrMatcher suffixMatcher) {
         this.suffixMatcher = Objects.requireNonNull(suffixMatcher);
@@ -1090,10 +1090,10 @@ public StrSubstitutor setVariableSuffixMatcher(final StrMatcher suffixMatcher) {
      * the substitution process at the start or end.
      * </p>
      *
-     * @param buf  the string builder to substitute into, not null.
-     * @param offset  the start offset within the builder, must be valid.
-     * @param length  the length within the builder to be processed, must be valid.
-     * @return true if altered.
+     * @param buf  the string builder to substitute into, not null
+     * @param offset  the start offset within the builder, must be valid
+     * @param length  the length within the builder to be processed, must be valid
+     * @return true if altered
      */
     protected boolean substitute(final StrBuilder buf, final int offset, final int length) {
         return substitute(buf, offset, length, null) > 0;
@@ -1104,12 +1104,12 @@ protected boolean substitute(final StrBuilder buf, final int offset, final int l
      * interpolation method, which resolves the values of all variable references
      * contained in the passed-in text.
      *
-     * @param buf  the string builder to substitute into, not null.
-     * @param offset  the start offset within the builder, must be valid.
-     * @param length  the length within the builder to be processed, must be valid.
-     * @param priorVariables  the stack keeping track of the replaced variables, may be null.
+     * @param buf  the string builder to substitute into, not null
+     * @param offset  the start offset within the builder, must be valid
+     * @param length  the length within the builder to be processed, must be valid
+     * @param priorVariables  the stack keeping track of the replaced variables, may be null
      * @return the length change that occurs, unless priorVariables is null when the int
-     *  represents a boolean flag as to whether any change occurred.
+     *  represents a boolean flag as to whether any change occurred
      */
     private int substitute(final StrBuilder buf, final int offset, final int length, List<String> priorVariables) {
         final StrMatcher pfxMatcher = getVariablePrefixMatcher();
diff --git a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
index 73e3e3a7ed9..8d26d975114 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
@@ -119,7 +119,7 @@ public class StrTokenizer implements ListIterator<String>, Cloneable {
     /**
      * Gets a clone of {@code CSV_TOKENIZER_PROTOTYPE}.
      *
-     * @return a clone of {@code CSV_TOKENIZER_PROTOTYPE}.
+     * @return a clone of {@code CSV_TOKENIZER_PROTOTYPE}
      */
     private static StrTokenizer getCSVClone() {
         return (StrTokenizer) CSV_TOKENIZER_PROTOTYPE.clone();
@@ -134,7 +134,7 @@ private static StrTokenizer getCSVClone() {
      * You must call a "reset" method to set the string which you want to parse.
      * </p>
      *
-     * @return a new tokenizer instance which parses Comma Separated Value strings.
+     * @return a new tokenizer instance which parses Comma Separated Value strings
      */
     public static StrTokenizer getCSVInstance() {
         return getCSVClone();
@@ -146,8 +146,8 @@ public static StrTokenizer getCSVInstance() {
      * will be trim whitespace from both ends (which can be overridden with
      * the setTrimmer method).
      *
-     * @param input  the text to parse.
-     * @return a new tokenizer instance which parses Comma Separated Value strings.
+     * @param input  the text to parse
+     * @return a new tokenizer instance which parses Comma Separated Value strings
      */
     public static StrTokenizer getCSVInstance(final char[] input) {
         final StrTokenizer tok = getCSVClone();
@@ -161,8 +161,8 @@ public static StrTokenizer getCSVInstance(final char[] input) {
      * will be trim whitespace from both ends (which can be overridden with
      * the setTrimmer method).
      *
-     * @param input  the text to parse.
-     * @return a new tokenizer instance which parses Comma Separated Value strings.
+     * @param input  the text to parse
+     * @return a new tokenizer instance which parses Comma Separated Value strings
      */
     public static StrTokenizer getCSVInstance(final String input) {
         final StrTokenizer tok = getCSVClone();
@@ -173,7 +173,7 @@ public static StrTokenizer getCSVInstance(final String input) {
     /**
      * Gets a clone of {@code TSV_TOKENIZER_PROTOTYPE}.
      *
-     * @return a clone of {@code TSV_TOKENIZER_PROTOTYPE}.
+     * @return a clone of {@code TSV_TOKENIZER_PROTOTYPE}
      */
     private static StrTokenizer getTSVClone() {
         return (StrTokenizer) TSV_TOKENIZER_PROTOTYPE.clone();
@@ -187,7 +187,7 @@ private static StrTokenizer getTSVClone() {
      * You must call a "reset" method to set the string which you want to parse.
      * </p>
      *
-     * @return a new tokenizer instance which parses Tab Separated Value strings.
+     * @return a new tokenizer instance which parses Tab Separated Value strings
      */
     public static StrTokenizer getTSVInstance() {
         return getTSVClone();
@@ -198,8 +198,8 @@ public static StrTokenizer getTSVInstance() {
      * The default for CSV processing will be trim whitespace from both ends
      * (which can be overridden with the setTrimmer method).
      *
-     * @param input  the string to parse.
-     * @return a new tokenizer instance which parses Tab Separated Value strings.
+     * @param input  the string to parse
+     * @return a new tokenizer instance which parses Tab Separated Value strings
      */
     public static StrTokenizer getTSVInstance(final char[] input) {
         final StrTokenizer tok = getTSVClone();
@@ -212,8 +212,8 @@ public static StrTokenizer getTSVInstance(final char[] input) {
      * The default for CSV processing will be trim whitespace from both ends
      * (which can be overridden with the setTrimmer method).
      *
-     * @param input  the string to parse.
-     * @return a new tokenizer instance which parses Tab Separated Value strings.
+     * @param input  the string to parse
+     * @return a new tokenizer instance which parses Tab Separated Value strings
      */
     public static StrTokenizer getTSVInstance(final String input) {
         final StrTokenizer tok = getTSVClone();
@@ -224,28 +224,28 @@ public static StrTokenizer getTSVInstance(final String input) {
     /** The text to work on. */
     private char[] chars;
 
-    /** The parsed tokens */
+    /** The parsed tokens. */
     private String[] tokens;
 
-    /** The current iteration position */
+    /** The current iteration position. */
     private int tokenPos;
 
-    /** The delimiter matcher */
+    /** The delimiter matcher. */
     private StrMatcher delimMatcher = StrMatcher.splitMatcher();
 
-    /** The quote matcher */
+    /** The quote matcher. */
     private StrMatcher quoteMatcher = StrMatcher.noneMatcher();
 
-    /** The ignored matcher */
+    /** The ignored matcher. */
     private StrMatcher ignoredMatcher = StrMatcher.noneMatcher();
 
-    /** The trimmer matcher */
+    /** The trimmer matcher. */
     private StrMatcher trimmerMatcher = StrMatcher.noneMatcher();
 
-    /** Whether to return empty tokens as null */
+    /** Whether to return empty tokens as null. */
     private boolean emptyAsNull;
 
-    /** Whether to ignore empty tokens */
+    /** Whether to ignore empty tokens. */
     private boolean ignoreEmptyTokens = true;
 
     /**
@@ -263,7 +263,7 @@ public StrTokenizer() {
      * Constructs a tokenizer splitting on space, tab, newline and formfeed
      * as per StringTokenizer.
      *
-     * @param input  the string which is to be parsed, not cloned.
+     * @param input the string which is to be parsed, not cloned
      */
     public StrTokenizer(final char[] input) {
         this.chars = ArrayUtils.clone(input);
@@ -272,8 +272,8 @@ public StrTokenizer(final char[] input) {
     /**
      * Constructs a tokenizer splitting on the specified character.
      *
-     * @param input  the string which is to be parsed, not cloned.
-     * @param delim the field delimiter character.
+     * @param input  the string which is to be parsed, not cloned
+     * @param delim the field delimiter character
      */
     public StrTokenizer(final char[] input, final char delim) {
         this(input);
@@ -284,9 +284,9 @@ public StrTokenizer(final char[] input, final char delim) {
      * Constructs a tokenizer splitting on the specified delimiter character
      * and handling quotes using the specified quote character.
      *
-     * @param input  the string which is to be parsed, not cloned.
-     * @param delim  the field delimiter character.
-     * @param quote  the field quoted string character.
+     * @param input  the string which is to be parsed, not cloned
+     * @param delim  the field delimiter character
+     * @param quote  the field quoted string character
      */
     public StrTokenizer(final char[] input, final char delim, final char quote) {
         this(input, delim);
@@ -296,8 +296,8 @@ public StrTokenizer(final char[] input, final char delim, final char quote) {
     /**
      * Constructs a tokenizer splitting on the specified string.
      *
-     * @param input  the string which is to be parsed, not cloned.
-     * @param delim the field delimiter string.
+     * @param input  the string which is to be parsed, not cloned
+     * @param delim the field delimiter string
      */
     public StrTokenizer(final char[] input, final String delim) {
         this(input);
@@ -307,8 +307,8 @@ public StrTokenizer(final char[] input, final String delim) {
     /**
      * Constructs a tokenizer splitting using the specified delimiter matcher.
      *
-     * @param input  the string which is to be parsed, not cloned.
-     * @param delim  the field delimiter matcher.
+     * @param input  the string which is to be parsed, not cloned
+     * @param delim  the field delimiter matcher
      */
     public StrTokenizer(final char[] input, final StrMatcher delim) {
         this(input);
@@ -319,9 +319,9 @@ public StrTokenizer(final char[] input, final StrMatcher delim) {
      * Constructs a tokenizer splitting using the specified delimiter matcher
      * and handling quotes using the specified quote matcher.
      *
-     * @param input  the string which is to be parsed, not cloned.
-     * @param delim  the field delimiter character.
-     * @param quote  the field quoted string character.
+     * @param input  the string which is to be parsed, not cloned
+     * @param delim  the field delimiter character
+     * @param quote  the field quoted string character
      */
     public StrTokenizer(final char[] input, final StrMatcher delim, final StrMatcher quote) {
         this(input, delim);
@@ -332,7 +332,7 @@ public StrTokenizer(final char[] input, final StrMatcher delim, final StrMatcher
      * Constructs a tokenizer splitting on space, tab, newline and formfeed
      * as per StringTokenizer.
      *
-     * @param input  the string which is to be parsed.
+     * @param input the string which is to be parsed
      */
     public StrTokenizer(final String input) {
         if (input != null) {
@@ -345,8 +345,8 @@ public StrTokenizer(final String input) {
     /**
      * Constructs a tokenizer splitting on the specified delimiter character.
      *
-     * @param input  the string which is to be parsed.
-     * @param delim  the field delimiter character.
+     * @param input  the string which is to be parsed
+     * @param delim  the field delimiter character
      */
     public StrTokenizer(final String input, final char delim) {
         this(input);
@@ -357,9 +357,9 @@ public StrTokenizer(final String input, final char delim) {
      * Constructs a tokenizer splitting on the specified delimiter character
      * and handling quotes using the specified quote character.
      *
-     * @param input  the string which is to be parsed.
-     * @param delim  the field delimiter character.
-     * @param quote  the field quoted string character.
+     * @param input  the string which is to be parsed
+     * @param delim  the field delimiter character
+     * @param quote  the field quoted string character
      */
     public StrTokenizer(final String input, final char delim, final char quote) {
         this(input, delim);
@@ -369,8 +369,8 @@ public StrTokenizer(final String input, final char delim, final char quote) {
     /**
      * Constructs a tokenizer splitting on the specified delimiter string.
      *
-     * @param input  the string which is to be parsed.
-     * @param delim  the field delimiter string.
+     * @param input  the string which is to be parsed
+     * @param delim  the field delimiter string
      */
     public StrTokenizer(final String input, final String delim) {
         this(input);
@@ -380,8 +380,8 @@ public StrTokenizer(final String input, final String delim) {
     /**
      * Constructs a tokenizer splitting using the specified delimiter matcher.
      *
-     * @param input  the string which is to be parsed.
-     * @param delim  the field delimiter matcher.
+     * @param input  the string which is to be parsed
+     * @param delim  the field delimiter matcher
      */
     public StrTokenizer(final String input, final StrMatcher delim) {
         this(input);
@@ -392,9 +392,9 @@ public StrTokenizer(final String input, final StrMatcher delim) {
      * Constructs a tokenizer splitting using the specified delimiter matcher
      * and handling quotes using the specified quote matcher.
      *
-     * @param input  the string which is to be parsed.
-     * @param delim  the field delimiter matcher.
-     * @param quote  the field quoted string matcher.
+     * @param input  the string which is to be parsed
+     * @param delim  the field delimiter matcher
+     * @param quote  the field quoted string matcher
      */
     public StrTokenizer(final String input, final StrMatcher delim, final StrMatcher quote) {
         this(input, delim);
@@ -404,8 +404,8 @@ public StrTokenizer(final String input, final StrMatcher delim, final StrMatcher
     /**
      * Unsupported ListIterator operation.
      *
-     * @param obj this parameter ignored.
-     * @throws UnsupportedOperationException always.
+     * @param obj this parameter ignored
+     * @throws UnsupportedOperationException always
      */
     @Override
     public void add(final String obj) {
@@ -415,8 +415,8 @@ public void add(final String obj) {
     /**
      * Adds a token to a list, paying attention to the parameters we've set.
      *
-     * @param list  the list to add to.
-     * @param tok  the token to add.
+     * @param list  the list to add to
+     * @param tok  the token to add
      */
     private void addToken(final List<String> list, String tok) {
         if (StringUtils.isEmpty(tok)) {
@@ -451,7 +451,7 @@ private void checkTokenized() {
      * that it will be at the start of the token list.
      * If a {@link CloneNotSupportedException} is caught, return {@code null}.
      *
-     * @return a new instance of this Tokenizer which has been reset.
+     * @return a new instance of this Tokenizer which has been reset
      */
     @Override
     public Object clone() {
@@ -466,8 +466,8 @@ public Object clone() {
      * Creates a new instance of this Tokenizer. The new instance is reset so that
      * it will be at the start of the token list.
      *
-     * @return a new instance of this Tokenizer which has been reset.
-     * @throws CloneNotSupportedException if there is a problem cloning.
+     * @return a new instance of this Tokenizer which has been reset
+     * @throws CloneNotSupportedException if there is a problem cloning
      */
     Object cloneReset() throws CloneNotSupportedException {
         // this method exists to enable 100% test coverage
@@ -482,7 +482,7 @@ Object cloneReset() throws CloneNotSupportedException {
     /**
      * Gets the String content that the tokenizer is parsing.
      *
-     * @return the string content being parsed.
+     * @return the string content being parsed
      */
     public String getContent() {
         if (chars == null) {
@@ -494,7 +494,7 @@ public String getContent() {
     /**
      * Gets the field delimiter matcher.
      *
-     * @return the delimiter matcher in use.
+     * @return the delimiter matcher in use
      */
     public StrMatcher getDelimiterMatcher() {
         return this.delimMatcher;
@@ -508,7 +508,7 @@ public StrMatcher getDelimiterMatcher() {
      * The default value is not to ignore anything.
      * </p>
      *
-     * @return the ignored matcher in use.
+     * @return the ignored matcher in use
      */
     public StrMatcher getIgnoredMatcher() {
         return ignoredMatcher;
@@ -522,7 +522,7 @@ public StrMatcher getIgnoredMatcher() {
      * The default value is '"' (double quote).
      * </p>
      *
-     * @return the quote matcher in use.
+     * @return the quote matcher in use
      */
     public StrMatcher getQuoteMatcher() {
         return quoteMatcher;
@@ -531,7 +531,7 @@ public StrMatcher getQuoteMatcher() {
     /**
      * Gets a copy of the full token list as an independent modifiable array.
      *
-     * @return the tokens as a String array.
+     * @return the tokens as a String array
      */
     public String[] getTokenArray() {
         checkTokenized();
@@ -541,7 +541,7 @@ public String[] getTokenArray() {
     /**
      * Gets a copy of the full token list as an independent modifiable list.
      *
-     * @return the tokens as a String array.
+     * @return the tokens as a String array
      */
     public List<String> getTokenList() {
         checkTokenized();
@@ -558,7 +558,7 @@ public List<String> getTokenList() {
      * The default value is not to trim anything.
      * </p>
      *
-     * @return the trimmer matcher in use.
+     * @return the trimmer matcher in use
      */
     public StrMatcher getTrimmerMatcher() {
         return trimmerMatcher;
@@ -567,7 +567,7 @@ public StrMatcher getTrimmerMatcher() {
     /**
      * Checks whether there are any more tokens.
      *
-     * @return true if there are more tokens.
+     * @return true if there are more tokens
      */
     @Override
     public boolean hasNext() {
@@ -578,7 +578,7 @@ public boolean hasNext() {
     /**
      * Checks whether there are any previous tokens that can be iterated to.
      *
-     * @return true if there are previous tokens.
+     * @return true if there are previous tokens
      */
     @Override
     public boolean hasPrevious() {
@@ -590,7 +590,7 @@ public boolean hasPrevious() {
      * Gets whether the tokenizer currently returns empty tokens as null.
      * The default for this property is false.
      *
-     * @return true if empty tokens are returned as null.
+     * @return true if empty tokens are returned as null
      */
     public boolean isEmptyTokenAsNull() {
         return this.emptyAsNull;
@@ -600,7 +600,7 @@ public boolean isEmptyTokenAsNull() {
      * Gets whether the tokenizer currently ignores empty tokens.
      * The default for this property is true.
      *
-     * @return true if empty tokens are not returned.
+     * @return true if empty tokens are not returned
      */
     public boolean isIgnoreEmptyTokens() {
         return ignoreEmptyTokens;
@@ -610,12 +610,12 @@ public boolean isIgnoreEmptyTokens() {
      * Checks if the characters at the index specified match the quote
      * already matched in readNextToken().
      *
-     * @param srcChars  the character array being tokenized.
-     * @param pos  the position to check for a quote.
-     * @param len  the length of the character array being tokenized.
-     * @param quoteStart  the start position of the matched quote, 0 if no quoting.
-     * @param quoteLen  the length of the matched quote, 0 if no quoting.
-     * @return true if a quote is matched.
+     * @param srcChars  the character array being tokenized
+     * @param pos  the position to check for a quote
+     * @param len  the length of the character array being tokenized
+     * @param quoteStart  the start position of the matched quote, 0 if no quoting
+     * @param quoteLen  the length of the matched quote, 0 if no quoting
+     * @return true if a quote is matched
      */
     private boolean isQuote(final char[] srcChars, final int pos, final int len, final int quoteStart, final int quoteLen) {
         for (int i = 0; i < quoteLen; i++) {
@@ -629,8 +629,8 @@ private boolean isQuote(final char[] srcChars, final int pos, final int len, fin
     /**
      * Gets the next token.
      *
-     * @return the next String token.
-     * @throws NoSuchElementException if there are no more elements.
+     * @return the next String token
+     * @throws NoSuchElementException if there are no more elements
      */
     @Override
     public String next() {
@@ -643,7 +643,7 @@ public String next() {
     /**
      * Gets the index of the next token to return.
      *
-     * @return the next token index.
+     * @return the next token index
      */
     @Override
     public int nextIndex() {
@@ -655,7 +655,7 @@ public int nextIndex() {
      * Equivalent to {@link #next()} except it returns null rather than
      * throwing {@link NoSuchElementException} when no tokens remain.
      *
-     * @return the next sequential token, or null when no more tokens are found.
+     * @return the next sequential token, or null when no more tokens are found
      */
     public String nextToken() {
         if (hasNext()) {
@@ -667,7 +667,7 @@ public String nextToken() {
     /**
      * Gets the token previous to the last returned token.
      *
-     * @return the previous token.
+     * @return the previous token
      */
     @Override
     public String previous() {
@@ -680,7 +680,7 @@ public String previous() {
     /**
      * Gets the index of the previous token.
      *
-     * @return the previous token index.
+     * @return the previous token index
      */
     @Override
     public int previousIndex() {
@@ -690,7 +690,7 @@ public int previousIndex() {
     /**
      * Gets the previous token from the String.
      *
-     * @return the previous sequential token, or null when no more tokens are found.
+     * @return the previous sequential token, or null when no more tokens are found
      */
     public String previousToken() {
         if (hasPrevious()) {
@@ -702,13 +702,13 @@ public String previousToken() {
     /**
      * Reads character by character through the String to get the next token.
      *
-     * @param srcChars  the character array being tokenized.
-     * @param start  the first character of field.
-     * @param len  the length of the character array being tokenized.
-     * @param workArea  a temporary work area.
-     * @param tokenList  the list of parsed tokens.
+     * @param srcChars  the character array being tokenized
+     * @param start  the first character of field
+     * @param len  the length of the character array being tokenized
+     * @param workArea  a temporary work area
+     * @param tokenList  the list of parsed tokens
      * @return the starting position of the next field (the character
-     *  immediately after the delimiter), or -1 if end of string found.
+     *  immediately after the delimiter), or -1 if end of string found
      */
     private int readNextToken(final char[] srcChars, int start, final int len, final StrBuilder workArea, final List<String> tokenList) {
         // skip all leading whitespace, unless it is the
@@ -749,16 +749,16 @@ private int readNextToken(final char[] srcChars, int start, final int len, final
     /**
      * Reads a possibly quoted string token.
      *
-     * @param srcChars  the character array being tokenized.
-     * @param start  the first character of field.
-     * @param len  the length of the character array being tokenized.
-     * @param workArea  a temporary work area.
-     * @param tokenList  the list of parsed tokens.
-     * @param quoteStart  the start position of the matched quote, 0 if no quoting.
-     * @param quoteLen  the length of the matched quote, 0 if no quoting.
+     * @param srcChars  the character array being tokenized
+     * @param start  the first character of field
+     * @param len  the length of the character array being tokenized
+     * @param workArea  a temporary work area
+     * @param tokenList  the list of parsed tokens
+     * @param quoteStart  the start position of the matched quote, 0 if no quoting
+     * @param quoteLen  the length of the matched quote, 0 if no quoting
      * @return the starting position of the next field (the character
      *  immediately after the delimiter, or if end of string found,
-     *  then the length of string.
+     *  then the length of string
      */
     private int readWithQuotes(final char[] srcChars, final int start, final int len, final StrBuilder workArea,
                                final List<String> tokenList, final int quoteStart, final int quoteLen) {
@@ -843,7 +843,7 @@ private int readWithQuotes(final char[] srcChars, final int start, final int len
     /**
      * Unsupported ListIterator operation.
      *
-     * @throws UnsupportedOperationException always.
+     * @throws UnsupportedOperationException always
      */
     @Override
     public void remove() {
@@ -856,7 +856,7 @@ public void remove() {
      * This method allows the same tokenizer to be reused for the same String.
      * </p>
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public StrTokenizer reset() {
         tokenPos = 0;
@@ -869,8 +869,8 @@ public StrTokenizer reset() {
      * In this manner you can re-use a tokenizer with the same settings
      * on multiple input lines.
      *
-     * @param input  the new character array to tokenize, not cloned, null sets no text to parse.
-     * @return {@code this} instance.
+     * @param input  the new character array to tokenize, not cloned, null sets no text to parse
+     * @return {@code this} instance
      */
     public StrTokenizer reset(final char[] input) {
         reset();
@@ -883,8 +883,8 @@ public StrTokenizer reset(final char[] input) {
      * In this manner you can re-use a tokenizer with the same settings
      * on multiple input lines.
      *
-     * @param input  the new string to tokenize, null sets no text to parse.
-     * @return {@code this} instance.
+     * @param input  the new string to tokenize, null sets no text to parse
+     * @return {@code this} instance
      */
     public StrTokenizer reset(final String input) {
         reset();
@@ -899,8 +899,8 @@ public StrTokenizer reset(final String input) {
     /**
      * Unsupported ListIterator operation.
      *
-     * @param obj this parameter ignored.
-     * @throws UnsupportedOperationException always.
+     * @param obj this parameter ignored
+     * @throws UnsupportedOperationException always
      */
     @Override
     public void set(final String obj) {
@@ -910,8 +910,8 @@ public void set(final String obj) {
     /**
      * Sets the field delimiter character.
      *
-     * @param delim  the delimiter character to use.
-     * @return {@code this} instance.
+     * @param delim  the delimiter character to use
+     * @return {@code this} instance
      */
     public StrTokenizer setDelimiterChar(final char delim) {
         return setDelimiterMatcher(StrMatcher.charMatcher(delim));
@@ -923,8 +923,8 @@ public StrTokenizer setDelimiterChar(final char delim) {
      * The delimiter is used to separate one token from another.
      * </p>
      *
-     * @param delim  the delimiter matcher to use.
-     * @return {@code this} instance.
+     * @param delim  the delimiter matcher to use
+     * @return {@code this} instance
      */
     public StrTokenizer setDelimiterMatcher(final StrMatcher delim) {
         if (delim == null) {
@@ -938,8 +938,8 @@ public StrTokenizer setDelimiterMatcher(final StrMatcher delim) {
     /**
      * Sets the field delimiter string.
      *
-     * @param delim  the delimiter string to use.
-     * @return {@code this} instance.
+     * @param delim  the delimiter string to use
+     * @return {@code this} instance
      */
     public StrTokenizer setDelimiterString(final String delim) {
         return setDelimiterMatcher(StrMatcher.stringMatcher(delim));
@@ -949,8 +949,8 @@ public StrTokenizer setDelimiterString(final String delim) {
      * Sets whether the tokenizer should return empty tokens as null.
      * The default for this property is false.
      *
-     * @param emptyAsNull  whether empty tokens are returned as null.
-     * @return {@code this} instance.
+     * @param emptyAsNull  whether empty tokens are returned as null
+     * @return {@code this} instance
      */
     public StrTokenizer setEmptyTokenAsNull(final boolean emptyAsNull) {
         this.emptyAsNull = emptyAsNull;
@@ -963,8 +963,8 @@ public StrTokenizer setEmptyTokenAsNull(final boolean emptyAsNull) {
      * This character is ignored when parsing the String, unless it is
      * within a quoted region.
      *
-     * @param ignored  the ignored character to use.
-     * @return {@code this} instance.
+     * @param ignored  the ignored character to use
+     * @return {@code this} instance
      */
     public StrTokenizer setIgnoredChar(final char ignored) {
         return setIgnoredMatcher(StrMatcher.charMatcher(ignored));
@@ -977,8 +977,8 @@ public StrTokenizer setIgnoredChar(final char ignored) {
      * within a quoted region.
      * </p>
      *
-     * @param ignored  the ignored matcher to use, null ignored.
-     * @return {@code this} instance.
+     * @param ignored  the ignored matcher to use, null ignored
+     * @return {@code this} instance
      */
     public StrTokenizer setIgnoredMatcher(final StrMatcher ignored) {
         if (ignored != null) {
@@ -991,8 +991,8 @@ public StrTokenizer setIgnoredMatcher(final StrMatcher ignored) {
      * Sets whether the tokenizer should ignore and not return empty tokens.
      * The default for this property is true.
      *
-     * @param ignoreEmptyTokens  whether empty tokens are not returned.
-     * @return {@code this} instance.
+     * @param ignoreEmptyTokens  whether empty tokens are not returned
+     * @return {@code this} instance
      */
     public StrTokenizer setIgnoreEmptyTokens(final boolean ignoreEmptyTokens) {
         this.ignoreEmptyTokens = ignoreEmptyTokens;
@@ -1006,8 +1006,8 @@ public StrTokenizer setIgnoreEmptyTokens(final boolean ignoreEmptyTokens) {
      * This enables delimiters to be entered as data.
      * </p>
      *
-     * @param quote  the quote character to use.
-     * @return {@code this} instance.
+     * @param quote  the quote character to use
+     * @return {@code this} instance
      */
     public StrTokenizer setQuoteChar(final char quote) {
         return setQuoteMatcher(StrMatcher.charMatcher(quote));
@@ -1020,8 +1020,8 @@ public StrTokenizer setQuoteChar(final char quote) {
      * This enables delimiters to be entered as data.
      * </p>
      *
-     * @param quote  the quote matcher to use, null ignored.
-     * @return {@code this} instance.
+     * @param quote  the quote matcher to use, null ignored
+     * @return {@code this} instance
      */
     public StrTokenizer setQuoteMatcher(final StrMatcher quote) {
         if (quote != null) {
@@ -1037,8 +1037,8 @@ public StrTokenizer setQuoteMatcher(final StrMatcher quote) {
      * until the token or quote is found.
      * </p>
      *
-     * @param trimmer  the trimmer matcher to use, null ignored.
-     * @return {@code this} instance.
+     * @param trimmer  the trimmer matcher to use, null ignored
+     * @return {@code this} instance
      */
     public StrTokenizer setTrimmerMatcher(final StrMatcher trimmer) {
         if (trimmer != null) {
@@ -1050,7 +1050,7 @@ public StrTokenizer setTrimmerMatcher(final StrMatcher trimmer) {
     /**
      * Gets the number of tokens found in the String.
      *
-     * @return the number of matched tokens.
+     * @return the number of matched tokens
      */
     public int size() {
         checkTokenized();
@@ -1075,10 +1075,10 @@ public int size() {
      * may pass other values, or even an entirely different array.
      * </p>
      *
-     * @param srcChars  the character array being tokenized, may be null.
-     * @param offset  the start position within the character array, must be valid.
-     * @param count  the number of characters to tokenize, must be valid.
-     * @return the modifiable list of String tokens, unmodifiable if null array or zero count.
+     * @param srcChars  the character array being tokenized, may be null
+     * @param offset  the start position within the character array, must be valid
+     * @param count  the number of characters to tokenize, must be valid
+     * @return the modifiable list of String tokens, unmodifiable if null array or zero count
      */
     protected List<String> tokenize(final char[] srcChars, final int offset, final int count) {
         if (ArrayUtils.isEmpty(srcChars)) {
@@ -1104,7 +1104,7 @@ protected List<String> tokenize(final char[] srcChars, final int offset, final i
     /**
      * Gets the String content that the tokenizer is parsing.
      *
-     * @return the string content being parsed.
+     * @return the string content being parsed
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/text/WordUtils.java b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
index ea6c2ad548d..74f9297ed45 100644
--- a/src/main/java/org/apache/commons/lang3/text/WordUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
@@ -54,8 +54,8 @@ public class WordUtils {
      * WordUtils.capitalize("i am FINE") = "I Am FINE"
      * </pre>
      *
-     * @param str  the String to capitalize, may be null.
-     * @return capitalized String, {@code null} if null String input.
+     * @param str  the String to capitalize, may be null
+     * @return capitalized String, {@code null} if null String input
      * @see #uncapitalize(String)
      * @see #capitalizeFully(String)
      */
@@ -85,9 +85,9 @@ public static String capitalize(final String str) {
      * WordUtils.capitalize("i aM.fine", {'.'}) = "I aM.Fine"
      * </pre>
      *
-     * @param str  the String to capitalize, may be null.
-     * @param delimiters  set of characters to determine capitalization, null means whitespace.
-     * @return capitalized String, {@code null} if null String input.
+     * @param str  the String to capitalize, may be null
+     * @param delimiters  set of characters to determine capitalization, null means whitespace
+     * @return capitalized String, {@code null} if null String input
      * @see #uncapitalize(String)
      * @see #capitalizeFully(String)
      * @since 2.1
@@ -127,8 +127,8 @@ public static String capitalize(final String str, final char... delimiters) {
      * WordUtils.capitalizeFully("i am FINE") = "I Am Fine"
      * </pre>
      *
-     * @param str  the String to capitalize, may be null.
-     * @return capitalized String, {@code null} if null String input.
+     * @param str  the String to capitalize, may be null
+     * @return capitalized String, {@code null} if null String input
      */
     public static String capitalizeFully(final String str) {
         return capitalizeFully(str, null);
@@ -155,9 +155,9 @@ public static String capitalizeFully(final String str) {
      * WordUtils.capitalizeFully("i aM.fine", {'.'}) = "I am.Fine"
      * </pre>
      *
-     * @param str  the String to capitalize, may be null.
-     * @param delimiters  set of characters to determine capitalization, null means whitespace.
-     * @return capitalized String, {@code null} if null String input.
+     * @param str  the String to capitalize, may be null
+     * @param delimiters  set of characters to determine capitalization, null means whitespace
+     * @return capitalized String, {@code null} if null String input
      * @since 2.1
      */
     public static String capitalizeFully(final String str, final char... delimiters) {
@@ -185,9 +185,9 @@ public static String capitalizeFully(final String str, final char... delimiters)
      * WordUtils.containsAllWords("abc def", "def", "abc") = true
      * </pre>
      *
-     * @param word The CharSequence to check, may be null.
-     * @param words The array of String words to search for, may be null.
-     * @return {@code true} if all search words are found, {@code false} otherwise.
+     * @param word the CharSequence to check, may be null
+     * @param words the array of String words to search for, may be null
+     * @return {@code true} if all search words are found, {@code false} otherwise
      * @since 3.5
      */
     public static boolean containsAllWords(final CharSequence word, final CharSequence... words) {
@@ -222,8 +222,8 @@ public static boolean containsAllWords(final CharSequence word, final CharSequen
      * WordUtils.initials("Ben J.Lee")      = "BJ"
      * </pre>
      *
-     * @param str  the String to get initials from, may be null.
-     * @return String of initial letters, {@code null} if null String input.
+     * @param str  the String to get initials from, may be null
+     * @return string of initial letters, {@code null} if null String input
      * @see #initials(String,char[])
      * @since 2.2
      */
@@ -251,9 +251,9 @@ public static String initials(final String str) {
      * WordUtils.initials(*, new char[0])         = ""
      * </pre>
      *
-     * @param str  the String to get initials from, may be null.
-     * @param delimiters  set of characters to determine words, null means whitespace.
-     * @return String of initial characters, {@code null} if null String input.
+     * @param str  the String to get initials from, may be null
+     * @param delimiters  set of characters to determine words, null means whitespace
+     * @return string of initial characters, {@code null} if null String input
      * @see #initials(String)
      * @since 2.2
      */
@@ -285,9 +285,9 @@ public static String initials(final String str, final char... delimiters) {
     /**
      * Tests if the character is a delimiter.
      *
-     * @param ch  the character to check.
-     * @param delimiters  the delimiters.
-     * @return true if it is a delimiter.
+     * @param ch  the character to check
+     * @param delimiters  the delimiters
+     * @return true if it is a delimiter
      */
     private static boolean isDelimiter(final char ch, final char[] delimiters) {
         return delimiters == null ? Character.isWhitespace(ch) : ArrayUtils.contains(delimiters, ch);
@@ -312,8 +312,8 @@ private static boolean isDelimiter(final char ch, final char[] delimiters) {
      * StringUtils.swapCase("The dog has a BONE") = "tHE DOG HAS A bone"
      * </pre>
      *
-     * @param str  the String to swap case, may be null.
-     * @return A new String, {@code null} if null String input.
+     * @param str  the String to swap case, may be null
+     * @return a new String, {@code null} if null String input
      */
     public static String swapCase(final String str) {
         if (StringUtils.isEmpty(str)) {
@@ -355,8 +355,8 @@ public static String swapCase(final String str) {
      * WordUtils.uncapitalize("I Am FINE") = "i am fINE"
      * </pre>
      *
-     * @param str  the String to uncapitalize, may be null.
-     * @return uncapitalized String, {@code null} if null String input.
+     * @param str  the String to uncapitalize, may be null
+     * @return uncapitalized String, {@code null} if null String input
      * @see #capitalize(String)
      */
     public static String uncapitalize(final String str) {
@@ -382,9 +382,9 @@ public static String uncapitalize(final String str) {
      * WordUtils.uncapitalize("I AM.FINE", {'.'}) = "i AM.fINE"
      * </pre>
      *
-     * @param str  the String to uncapitalize, may be null.
-     * @param delimiters  set of characters to determine uncapitalization, null means whitespace.
-     * @return uncapitalized String, {@code null} if null String input.
+     * @param str  the String to uncapitalize, may be null
+     * @param delimiters  set of characters to determine uncapitalization, null means whitespace
+     * @return uncapitalized String, {@code null} if null String input
      * @see #capitalize(String)
      * @since 2.1
      */
@@ -452,9 +452,9 @@ public static String uncapitalize(final String str, final char... delimiters) {
      *
      * (assuming that '\n' is the systems line separator)
      *
-     * @param str  the String to be word wrapped, may be null.
-     * @param wrapLength  the column to wrap the words at, less than 1 is treated as 1.
-     * @return a line with newlines inserted, {@code null} if null input.
+     * @param str  the String to be word wrapped, may be null
+     * @param wrapLength  the column to wrap the words at, less than 1 is treated as 1
+     * @return a line with newlines inserted, {@code null} if null input
      */
     public static String wrap(final String str, final int wrapLength) {
         return wrap(str, wrapLength, null, false);
@@ -526,12 +526,12 @@ public static String wrap(final String str, final int wrapLength) {
      *  </tr>
      * </table>
      *
-     * @param str  the String to be word wrapped, may be null.
-     * @param wrapLength  the column to wrap the words at, less than 1 is treated as 1.
+     * @param str  the String to be word wrapped, may be null
+     * @param wrapLength  the column to wrap the words at, less than 1 is treated as 1
      * @param newLineStr  the string to insert for a new line,
-     *  {@code null} uses the system property line separator.
-     * @param wrapLongWords  true if long words (such as URLs) should be wrapped.
-     * @return a line with newlines inserted, {@code null} if null input.
+     *  {@code null} uses the system property line separator
+     * @param wrapLongWords  true if long words (such as URLs) should be wrapped
+     * @return a line with newlines inserted, {@code null} if null input
      */
     public static String wrap(final String str, final int wrapLength, final String newLineStr, final boolean wrapLongWords) {
         return wrap(str, wrapLength, newLineStr, wrapLongWords, " ");
@@ -619,14 +619,14 @@ public static String wrap(final String str, final int wrapLength, final String n
      *  </tr>
      * </table>
      *
-     * @param str  the String to be word wrapped, may be null.
-     * @param wrapLength  the column to wrap the words at, less than 1 is treated as 1.
+     * @param str  the String to be word wrapped, may be null
+     * @param wrapLength  the column to wrap the words at, less than 1 is treated as 1
      * @param newLineStr  the string to insert for a new line,
-     *  {@code null} uses the system property line separator.
-     * @param wrapLongWords  true if long words (such as URLs) should be wrapped.
+     *  {@code null} uses the system property line separator
+     * @param wrapLongWords  true if long words (such as URLs) should be wrapped
      * @param wrapOn regex expression to be used as a breakable characters,
-     *               if blank string is provided a space character will be used.
-     * @return a line with newlines inserted, {@code null} if null input.
+     *               if blank string is provided a space character will be used
+     * @return a line with newlines inserted, {@code null} if null input
      */
     public static String wrap(final String str, int wrapLength, String newLineStr, final boolean wrapLongWords, String wrapOn) {
         if (str == null) {
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
index 3ebd11d9d55..7d8db1c61e5 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
@@ -44,8 +44,8 @@ public abstract class CharSequenceTranslator {
      * Returns an upper case hexadecimal {@link String} for the given
      * character.
      *
-     * @param codePoint The code point to convert.
-     * @return An upper case hexadecimal {@link String}.
+     * @param codePoint the code point to convert
+     * @return an upper case hexadecimal {@link String}
      */
     public static String hex(final int codePoint) {
         return Integer.toHexString(codePoint).toUpperCase(Locale.ENGLISH);
@@ -61,8 +61,8 @@ public CharSequenceTranslator() {
     /**
      * Helper for non-Writer usage.
      *
-     * @param input CharSequence to be translated.
-     * @return String output of translation.
+     * @param input CharSequence to be translated
+     * @return string output of translation
      */
     public final String translate(final CharSequence input) {
         if (input == null) {
@@ -84,11 +84,11 @@ public final String translate(final CharSequence input) {
      * and the only IOExceptions thrown must be from interacting with the Writer so that
      * the top level API may reliably ignore StringWriter IOExceptions.
      *
-     * @param input CharSequence that is being translated.
-     * @param index int representing the current point of translation.
-     * @param out Writer to translate the text to.
-     * @return int count of code points consumed.
-     * @throws IOException if and only if the Writer produces an IOException.
+     * @param input CharSequence that is being translated
+     * @param index int representing the current point of translation
+     * @param out writer to translate the text to
+     * @return int count of code points consumed
+     * @throws IOException if and only if the Writer produces an IOException
      */
     public abstract int translate(CharSequence input, int index, Writer out) throws IOException;
 
@@ -96,9 +96,9 @@ public final String translate(final CharSequence input) {
      * Translate an input onto a Writer. This is intentionally final as its algorithm is
      * tightly coupled with the abstract method of this class.
      *
-     * @param input CharSequence that is being translated.
-     * @param writer Writer to translate the text to.
-     * @throws IOException if and only if the Writer produces an IOException.
+     * @param input CharSequence that is being translated
+     * @param writer writer to translate the text to
+     * @throws IOException if and only if the Writer produces an IOException
      */
     @SuppressWarnings("resource") // Caller closes writer
     public final void translate(final CharSequence input, final Writer writer) throws IOException {
@@ -137,8 +137,8 @@ public final void translate(final CharSequence input, final Writer writer) throw
      * Helper method to create a merger of this translator with another set of
      * translators. Useful in customizing the standard functionality.
      *
-     * @param translators CharSequenceTranslator array of translators to merge with this one.
-     * @return CharSequenceTranslator merging this translator with the others.
+     * @param translators CharSequenceTranslator array of translators to merge with this one
+     * @return CharSequenceTranslator merging this translator with the others
      */
     public final CharSequenceTranslator with(final CharSequenceTranslator... translators) {
         final CharSequenceTranslator[] newArray = new CharSequenceTranslator[translators.length + 1];
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java
index 4aea85fdc95..08a8c92865f 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java
@@ -52,10 +52,10 @@ public final int translate(final CharSequence input, final int index, final Writ
     /**
      * Translate the specified code point into another.
      *
-     * @param codePoint int character input to translate.
-     * @param out Writer to optionally push the translated output to.
-     * @return boolean as to whether translation occurred or not.
-     * @throws IOException if and only if the Writer produces an IOException.
+     * @param codePoint int character input to translate
+     * @param out writer to optionally push the translated output to
+     * @return boolean as to whether translation occurred or not
+     * @throws IOException if and only if the Writer produces an IOException
      */
     public abstract boolean translate(int codePoint, Writer out) throws IOException;
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java b/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
index 364283ff36c..85a46019df6 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
@@ -357,7 +357,7 @@ public class EntityArrays {
     /**
      * Mapping to escape the apostrophe character to its XML character entity.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] APOS_ESCAPE() {
         return APOS_ESCAPE.clone();
@@ -366,7 +366,7 @@ public static String[][] APOS_ESCAPE() {
     /**
      * Reverse of {@link #APOS_ESCAPE()} for unescaping purposes.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] APOS_UNESCAPE() {
         return APOS_UNESCAPE.clone();
@@ -377,7 +377,7 @@ public static String[][] APOS_UNESCAPE() {
      *
      * Namely: {@code " & < >}
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] BASIC_ESCAPE() {
         return BASIC_ESCAPE.clone();
@@ -386,7 +386,7 @@ public static String[][] BASIC_ESCAPE() {
     /**
      * Reverse of {@link #BASIC_ESCAPE()} for unescaping purposes.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] BASIC_UNESCAPE() {
         return BASIC_UNESCAPE.clone();
@@ -397,7 +397,7 @@ public static String[][] BASIC_UNESCAPE() {
      * references</a>. Note that this must be used with {@link #ISO8859_1_ESCAPE()} to get the full list of
      * HTML 4.0 character entities.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] HTML40_EXTENDED_ESCAPE() {
         return HTML40_EXTENDED_ESCAPE.clone();
@@ -406,7 +406,7 @@ public static String[][] HTML40_EXTENDED_ESCAPE() {
     /**
      * Reverse of {@link #HTML40_EXTENDED_ESCAPE()} for unescaping purposes.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] HTML40_EXTENDED_UNESCAPE() {
         return HTML40_EXTENDED_UNESCAPE.clone();
@@ -415,8 +415,8 @@ public static String[][] HTML40_EXTENDED_UNESCAPE() {
     /**
      * Used to invert an escape array into an unescape array.
      *
-     * @param array String[][] to be inverted.
-     * @return String[][] inverted array.
+     * @param array string[][] to be inverted
+     * @return string[][] inverted array
      */
     public static String[][] invert(final String[][] array) {
         final String[][] newArray = new String[array.length][2];
@@ -431,7 +431,7 @@ public static String[][] invert(final String[][] array) {
      * Mapping to escape <a href="https://secure.wikimedia.org/wikipedia/en/wiki/ISO/IEC_8859-1">ISO-8859-1</a>
      * characters to their named HTML 3.x equivalents.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] ISO8859_1_ESCAPE() {
         return ISO8859_1_ESCAPE.clone();
@@ -440,7 +440,7 @@ public static String[][] ISO8859_1_ESCAPE() {
     /**
      * Reverse of {@link #ISO8859_1_ESCAPE()} for unescaping purposes.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] ISO8859_1_UNESCAPE() {
         return ISO8859_1_UNESCAPE.clone();
@@ -452,7 +452,7 @@ public static String[][] ISO8859_1_UNESCAPE() {
      * Namely: {@code \b \n \t \f \r}
      * </p>
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] JAVA_CTRL_CHARS_ESCAPE() {
         return JAVA_CTRL_CHARS_ESCAPE.clone();
@@ -461,7 +461,7 @@ public static String[][] JAVA_CTRL_CHARS_ESCAPE() {
     /**
      * Reverse of {@link #JAVA_CTRL_CHARS_ESCAPE()} for unescaping purposes.
      *
-     * @return the mapping table.
+     * @return the mapping table
      */
     public static String[][] JAVA_CTRL_CHARS_UNESCAPE() {
         return JAVA_CTRL_CHARS_UNESCAPE.clone();
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java
index 91ee7db7cc4..1a00ba3f7da 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java
@@ -31,8 +31,8 @@ public class JavaUnicodeEscaper extends UnicodeEscaper {
      * Constructs a {@link JavaUnicodeEscaper} above the specified value (exclusive).
      *
      * @param codePoint
-     *            above which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     *            above which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static JavaUnicodeEscaper above(final int codePoint) {
         return outsideOf(0, codePoint);
@@ -42,8 +42,8 @@ public static JavaUnicodeEscaper above(final int codePoint) {
      * Constructs a {@link JavaUnicodeEscaper} below the specified value (exclusive).
      *
      * @param codePoint
-     *            below which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     *            below which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static JavaUnicodeEscaper below(final int codePoint) {
         return outsideOf(codePoint, Integer.MAX_VALUE);
@@ -53,10 +53,10 @@ public static JavaUnicodeEscaper below(final int codePoint) {
      * Constructs a {@link JavaUnicodeEscaper} between the specified values (inclusive).
      *
      * @param codePointLow
-     *            above which to escape.
+     *            above which to escape
      * @param codePointHigh
-     *            below which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     *            below which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static JavaUnicodeEscaper between(final int codePointLow, final int codePointHigh) {
         return new JavaUnicodeEscaper(codePointLow, codePointHigh, true);
@@ -66,10 +66,10 @@ public static JavaUnicodeEscaper between(final int codePointLow, final int codeP
      * Constructs a {@link JavaUnicodeEscaper} outside of the specified values (exclusive).
      *
      * @param codePointLow
-     *            below which to escape.
+     *            below which to escape
      * @param codePointHigh
-     *            above which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     *            above which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static JavaUnicodeEscaper outsideOf(final int codePointLow, final int codePointHigh) {
         return new JavaUnicodeEscaper(codePointLow, codePointHigh, false);
@@ -81,11 +81,11 @@ public static JavaUnicodeEscaper outsideOf(final int codePointLow, final int cod
      * {@code between} is {@code true} and exclusive when it is {@code false}.
      *
      * @param below
-     *            int value representing the lowest code point boundary.
+     *            int value representing the lowest code point boundary
      * @param above
-     *            int value representing the highest code point boundary.
+     *            int value representing the highest code point boundary
      * @param between
-     *            whether to escape between the boundaries or outside them.
+     *            whether to escape between the boundaries or outside them
      */
     public JavaUnicodeEscaper(final int below, final int above, final boolean between) {
         super(below, above, between);
@@ -95,8 +95,8 @@ public JavaUnicodeEscaper(final int below, final int above, final boolean betwee
      * Converts the given code point to a hexadecimal string of the form {@code "\\uXXXX\\uXXXX"}
      *
      * @param codePoint
-     *            a Unicode code point.
-     * @return the hexadecimal string for the given code point.
+     *            a Unicode code point
+     * @return the hexadecimal string for the given code point
      */
     @Override
     protected String toUtf16Escape(final int codePoint) {
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java
index 7034d6ffecf..b3186106c15 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java
@@ -33,8 +33,8 @@ public class NumericEntityEscaper extends CodePointTranslator {
     /**
      * Constructs a {@link NumericEntityEscaper} above the specified value (exclusive).
      *
-     * @param codePoint above which to escape.
-     * @return the newly created {@link NumericEntityEscaper} instance.
+     * @param codePoint above which to escape
+     * @return the newly created {@link NumericEntityEscaper} instance
      */
     public static NumericEntityEscaper above(final int codePoint) {
         return outsideOf(0, codePoint);
@@ -43,8 +43,8 @@ public static NumericEntityEscaper above(final int codePoint) {
     /**
      * Constructs a {@link NumericEntityEscaper} below the specified value (exclusive).
      *
-     * @param codePoint below which to escape.
-     * @return the newly created {@link NumericEntityEscaper} instance.
+     * @param codePoint below which to escape
+     * @return the newly created {@link NumericEntityEscaper} instance
      */
     public static NumericEntityEscaper below(final int codePoint) {
         return outsideOf(codePoint, Integer.MAX_VALUE);
@@ -53,9 +53,9 @@ public static NumericEntityEscaper below(final int codePoint) {
     /**
      * Constructs a {@link NumericEntityEscaper} between the specified values (inclusive).
      *
-     * @param codePointLow above which to escape.
-     * @param codePointHigh below which to escape.
-     * @return the newly created {@link NumericEntityEscaper} instance.
+     * @param codePointLow above which to escape
+     * @param codePointHigh below which to escape
+     * @return the newly created {@link NumericEntityEscaper} instance
      */
     public static NumericEntityEscaper between(final int codePointLow, final int codePointHigh) {
         return new NumericEntityEscaper(codePointLow, codePointHigh, true);
@@ -64,9 +64,9 @@ public static NumericEntityEscaper between(final int codePointLow, final int cod
     /**
      * Constructs a {@link NumericEntityEscaper} outside of the specified values (exclusive).
      *
-     * @param codePointLow below which to escape.
-     * @param codePointHigh above which to escape.
-     * @return the newly created {@link NumericEntityEscaper} instance.
+     * @param codePointLow below which to escape
+     * @param codePointHigh above which to escape
+     * @return the newly created {@link NumericEntityEscaper} instance
      */
     public static NumericEntityEscaper outsideOf(final int codePointLow, final int codePointHigh) {
         return new NumericEntityEscaper(codePointLow, codePointHigh, false);
@@ -91,9 +91,9 @@ public NumericEntityEscaper() {
      * and {@code above} boundaries are inclusive when {@code between} is
      * {@code true} and exclusive when it is {@code false}.
      *
-     * @param below int value representing the lowest code point boundary.
-     * @param above int value representing the highest code point boundary.
-     * @param between whether to escape between the boundaries or outside them.
+     * @param below int value representing the lowest code point boundary
+     * @param above int value representing the highest code point boundary
+     * @param between whether to escape between the boundaries or outside them
      */
     private NumericEntityEscaper(final int below, final int above, final boolean between) {
         this.below = below;
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
index 805ceef4927..56db01a5d9b 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
@@ -80,7 +80,7 @@ public enum OPTION {
      *
      * Note that the default behavior is to ignore them.
      *
-     * @param options to apply to this unescaper.
+     * @param options to apply to this unescaper
      */
     public NumericEntityUnescaper(final OPTION... options) {
         if (options.length > 0) {
@@ -93,8 +93,8 @@ public NumericEntityUnescaper(final OPTION... options) {
     /**
      * Tests whether the passed in option is currently set.
      *
-     * @param option to check state of.
-     * @return whether the option is set.
+     * @param option to check state of
+     * @return whether the option is set
      */
     public boolean isSet(final OPTION option) {
         return options != null && options.contains(option);
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java
index 8526deab574..ae51c8f9c42 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java
@@ -47,8 +47,8 @@ public OctalUnescaper() {
     /**
      * Checks if the given char is the character representation of one of the digit from 0 to 3.
      *
-     * @param ch the char to check.
-     * @return true if the given char is the character representation of one of the digits from 0 to 3.
+     * @param ch the char to check
+     * @return true if the given char is the character representation of one of the digits from 0 to 3
      */
     private boolean isZeroToThree(final char ch) {
         return ch >= '0' && ch <= '3';
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
index 9113d57079b..38a8c27a8d3 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
@@ -33,8 +33,8 @@ public class UnicodeEscaper extends CodePointTranslator {
     /**
      * Constructs a {@link UnicodeEscaper} above the specified value (exclusive).
      *
-     * @param codePoint above which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     * @param codePoint above which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static UnicodeEscaper above(final int codePoint) {
         return outsideOf(0, codePoint);
@@ -43,8 +43,8 @@ public static UnicodeEscaper above(final int codePoint) {
     /**
      * Constructs a {@link UnicodeEscaper} below the specified value (exclusive).
      *
-     * @param codePoint below which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     * @param codePoint below which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static UnicodeEscaper below(final int codePoint) {
         return outsideOf(codePoint, Integer.MAX_VALUE);
@@ -53,9 +53,9 @@ public static UnicodeEscaper below(final int codePoint) {
     /**
      * Constructs a {@link UnicodeEscaper} between the specified values (inclusive).
      *
-     * @param codePointLow above which to escape.
-     * @param codePointHigh below which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     * @param codePointLow above which to escape
+     * @param codePointHigh below which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static UnicodeEscaper between(final int codePointLow, final int codePointHigh) {
         return new UnicodeEscaper(codePointLow, codePointHigh, true);
@@ -64,9 +64,9 @@ public static UnicodeEscaper between(final int codePointLow, final int codePoint
     /**
      * Constructs a {@link UnicodeEscaper} outside of the specified values (exclusive).
      *
-     * @param codePointLow below which to escape.
-     * @param codePointHigh above which to escape.
-     * @return the newly created {@link UnicodeEscaper} instance.
+     * @param codePointLow below which to escape
+     * @param codePointHigh above which to escape
+     * @return the newly created {@link UnicodeEscaper} instance
      */
     public static UnicodeEscaper outsideOf(final int codePointLow, final int codePointHigh) {
         return new UnicodeEscaper(codePointLow, codePointHigh, false);
@@ -91,9 +91,9 @@ public UnicodeEscaper() {
      * and {@code above} boundaries are inclusive when {@code between} is
      * {@code true} and exclusive when it is {@code false}.
      *
-     * @param below int value representing the lowest code point boundary.
-     * @param above int value representing the highest code point boundary.
-     * @param between whether to escape between the boundaries or outside them.
+     * @param below int value representing the lowest code point boundary
+     * @param above int value representing the highest code point boundary
+     * @param between whether to escape between the boundaries or outside them
      */
     protected UnicodeEscaper(final int below, final int above, final boolean between) {
         this.below = below;
@@ -105,8 +105,8 @@ protected UnicodeEscaper(final int below, final int above, final boolean between
      * Converts the given code point to a hexadecimal string of the form {@code "\\uXXXX"}
      *
      * @param codePoint
-     *            a Unicode code point.
-     * @return the hexadecimal string for the given code point.
+     *            a Unicode code point
+     * @return the hexadecimal string for the given code point
      * @since 3.2
      */
     protected String toUtf16Escape(final int codePoint) {
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java
index a7f0f050d09..3180aff1568 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java
@@ -47,4 +47,3 @@ public boolean translate(final int codePoint, final Writer out) throws IOExcepti
         // It's not a surrogate. Don't translate it.
     }
 }
-
diff --git a/src/main/java/org/apache/commons/lang3/time/AbstractFormatCache.java b/src/main/java/org/apache/commons/lang3/time/AbstractFormatCache.java
index 611d3cf7096..dc3cc2583eb 100644
--- a/src/main/java/org/apache/commons/lang3/time/AbstractFormatCache.java
+++ b/src/main/java/org/apache/commons/lang3/time/AbstractFormatCache.java
@@ -31,7 +31,7 @@
 /**
  * Caches for {@link Format} instances.
  *
- * @param <F> The Format type.
+ * @param <F> the Format type
  * @since 3.0
  */
 // TODO: Before making public move from getDateTimeInstance(Integer, ...) to int; or some other approach.
@@ -94,11 +94,11 @@ static void clear() {
     /**
      * Gets a date/time format for the specified styles and locale.
      *
-     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT, null indicates no date in format.
-     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT, null indicates no time in format.
-     * @param locale  The non-null locale of the desired format.
-     * @return a localized standard date/time format.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT, null indicates no date in format
+     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT, null indicates no time in format
+     * @param locale  the non-null locale of the desired format
+     * @return a localized standard date/time format
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      */
     // package protected, for access from test code; do not make public or protected
     static String getPatternForStyle(final Integer dateStyle, final Integer timeStyle, final Locale locale) {
@@ -134,11 +134,11 @@ void clearInstance() {
      * Create a format instance using the specified pattern, time zone
      * and locale.
      *
-     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern, this will not be null.
-     * @param timeZone  time zone, this will not be null.
-     * @param locale  locale, this will not be null.
-     * @return a pattern based date/time formatter.
-     * @throws IllegalArgumentException if pattern is invalid or {@code null}.
+     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern, this will not be null
+     * @param timeZone  time zone, this will not be null
+     * @param locale  locale, this will not be null
+     * @return a pattern based date/time formatter
+     * @throws IllegalArgumentException if pattern is invalid or {@code null}
      */
     protected abstract F createInstance(String pattern, TimeZone timeZone, Locale locale);
 
@@ -146,11 +146,11 @@ void clearInstance() {
      * Gets a date formatter instance using the specified style,
      * time zone and locale.
      *
-     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT.
-     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale.
-     * @param locale  optional locale, overrides system locale.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT
+     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale
+     * @param locale  optional locale, overrides system locale
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      */
     // package protected, for access from FastDateFormat; do not make public or protected
     F getDateInstance(final int dateStyle, final TimeZone timeZone, final Locale locale) {
@@ -161,12 +161,12 @@ F getDateInstance(final int dateStyle, final TimeZone timeZone, final Locale loc
      * Gets a date/time formatter instance using the specified style,
      * time zone and locale.
      *
-     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT.
-     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT.
-     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale.
-     * @param locale  optional locale, overrides system locale.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT
+     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT
+     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale
+     * @param locale  optional locale, overrides system locale
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      */
     // package protected, for access from FastDateFormat; do not make public or protected
     F getDateTimeInstance(final int dateStyle, final int timeStyle, final TimeZone timeZone, final Locale locale) {
@@ -177,12 +177,12 @@ F getDateTimeInstance(final int dateStyle, final int timeStyle, final TimeZone t
      * Gets a date/time formatter instance using the specified style,
      * time zone and locale.
      *
-     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT, null indicates no date in format.
-     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT, null indicates no time in format.
-     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale.
-     * @param locale  optional locale, overrides system locale.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle  date style: FULL, LONG, MEDIUM, or SHORT, null indicates no date in format
+     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT, null indicates no time in format
+     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale
+     * @param locale  optional locale, overrides system locale
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      */
     // This must remain private, see LANG-884
     private F getDateTimeInstance(final Integer dateStyle, final Integer timeStyle, final TimeZone timeZone, Locale locale) {
@@ -194,7 +194,7 @@ private F getDateTimeInstance(final Integer dateStyle, final Integer timeStyle,
      * Gets a formatter instance using the default pattern in the
      * default time zone and locale.
      *
-     * @return a date/time formatter.
+     * @return a date/time formatter
      */
     public F getInstance() {
         return getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, TimeZone.getDefault(), Locale.getDefault());
@@ -204,12 +204,12 @@ public F getInstance() {
      * Gets a formatter instance using the specified pattern, time zone
      * and locale.
      *
-     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern, non-null.
-     * @param timeZone  the time zone, null means use the default TimeZone.
-     * @param locale  the locale, null means use the default Locale.
-     * @return a pattern based date/time formatter.
-     * @throws NullPointerException if pattern is {@code null}.
-     * @throws IllegalArgumentException if pattern is invalid.
+     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern, non-null
+     * @param timeZone  the time zone, null means use the default TimeZone
+     * @param locale  the locale, null means use the default Locale
+     * @return a pattern based date/time formatter
+     * @throws IllegalArgumentException if pattern is invalid
+     * @throws NullPointerException if pattern is {@code null}
      */
     public F getInstance(final String pattern, final TimeZone timeZone, final Locale locale) {
         Objects.requireNonNull(pattern, "pattern");
@@ -223,11 +223,11 @@ public F getInstance(final String pattern, final TimeZone timeZone, final Locale
      * Gets a time formatter instance using the specified style,
      * time zone and locale.
      *
-     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT.
-     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale.
-     * @param locale  optional locale, overrides system locale.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param timeStyle  time style: FULL, LONG, MEDIUM, or SHORT
+     * @param timeZone  optional time zone, overrides time zone of formatted date, null means use default Locale
+     * @param locale  optional locale, overrides system locale
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      */
     // package protected, for access from FastDateFormat; do not make public or protected
     F getTimeInstance(final int timeStyle, final TimeZone timeZone, final Locale locale) {
diff --git a/src/main/java/org/apache/commons/lang3/time/CalendarUtils.java b/src/main/java/org/apache/commons/lang3/time/CalendarUtils.java
index fe535479f86..c47d0669b09 100644
--- a/src/main/java/org/apache/commons/lang3/time/CalendarUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/CalendarUtils.java
@@ -46,7 +46,7 @@ public class CalendarUtils {
     /**
      * Creates a new instance based on the current time in the default time zone with the default {@link Category#FORMAT} locale.
      *
-     * @return a new instance.
+     * @return a new instance
      * @since 3.14.0
      */
     public static CalendarUtils getInstance() {
@@ -58,7 +58,7 @@ public static CalendarUtils getInstance() {
      * default time zone with the given locale.
      *
      * @param locale the locale for the week data
-     * @return a Calendar.
+     * @return a Calendar
      */
     static CalendarUtils getInstance(final Locale locale) {
         return new CalendarUtils(Calendar.getInstance(locale), locale);
@@ -67,8 +67,8 @@ static CalendarUtils getInstance(final Locale locale) {
     /**
      * Converts a Calendar to a LocalDateTime.
      *
-     * @param calendar the Calendar to convert.
-     * @return a LocalDateTime.
+     * @param calendar the Calendar to convert
+     * @return a LocalDateTime
      * @since 3.17.0
      */
     public static LocalDateTime toLocalDateTime(final Calendar calendar) {
@@ -78,8 +78,8 @@ public static LocalDateTime toLocalDateTime(final Calendar calendar) {
     /**
      * Converts a Calendar to a OffsetDateTime.
      *
-     * @param calendar the Calendar to convert.
-     * @return a OffsetDateTime.
+     * @param calendar the Calendar to convert
+     * @return a OffsetDateTime
      * @since 3.17.0
      */
     public static OffsetDateTime toOffsetDateTime(final Calendar calendar) {
@@ -89,8 +89,8 @@ public static OffsetDateTime toOffsetDateTime(final Calendar calendar) {
     /**
      * Converts a Calendar to a ZonedDateTime.
      *
-     * @param calendar the Calendar to convert.
-     * @return a ZonedDateTime.
+     * @param calendar the Calendar to convert
+     * @return a ZonedDateTime
      * @since 3.17.0
      */
     public static ZonedDateTime toZonedDateTime(final Calendar calendar) {
@@ -108,7 +108,7 @@ private static ZoneId toZoneId(final Calendar calendar) {
     /**
      * Creates an instance for the given Calendar.
      *
-     * @param calendar A Calendar.
+     * @param calendar a Calendar
      */
     public CalendarUtils(final Calendar calendar) {
         this(calendar, Locale.getDefault());
@@ -117,8 +117,8 @@ public CalendarUtils(final Calendar calendar) {
     /**
      * Creates an instance for the given Calendar.
      *
-     * @param calendar A Calendar.
-     * @param locale A Locale.
+     * @param calendar a Calendar
+     * @param locale a Locale
      */
     CalendarUtils(final Calendar calendar, final Locale locale) {
         this.calendar = Objects.requireNonNull(calendar, "calendar");
@@ -128,7 +128,7 @@ public CalendarUtils(final Calendar calendar) {
     /**
      * Gets the current day of month.
      *
-     * @return the current day of month.
+     * @return the current day of month
      */
     public int getDayOfMonth() {
         return calendar.get(Calendar.DAY_OF_MONTH);
@@ -137,7 +137,7 @@ public int getDayOfMonth() {
     /**
      * Gets the current day of year.
      *
-     * @return the current day of year.
+     * @return the current day of year
      * @since 3.13.0
      */
     public int getDayOfYear() {
@@ -147,7 +147,7 @@ public int getDayOfYear() {
     /**
      * Gets the current month.
      *
-     * @return the current month.
+     * @return the current month
      */
     public int getMonth() {
         return calendar.get(Calendar.MONTH);
@@ -156,8 +156,8 @@ public int getMonth() {
     /**
      * Gets month names in the requested style.
      *
-     * @param style Must be a valid {@link Calendar#getDisplayNames(int, int, Locale)} month style.
-     * @return Styled names of months
+     * @param style must be a valid {@link Calendar#getDisplayNames(int, int, Locale)} month style
+     * @return styled names of months
      */
     String[] getMonthDisplayNames(final int style) {
         // Unfortunately standalone month names are not available in DateFormatSymbols,
@@ -174,7 +174,7 @@ String[] getMonthDisplayNames(final int style) {
     /**
      * Gets full standalone month names as used in "LLLL" date formatting.
      *
-     * @return Long names of months
+     * @return long names of months
      */
     String[] getStandaloneLongMonthNames() {
         return getMonthDisplayNames(Calendar.LONG_STANDALONE);
@@ -183,7 +183,7 @@ String[] getStandaloneLongMonthNames() {
     /**
      * Gets short standalone month names as used in "LLLL" date formatting.
      *
-     * @return Short names of months
+     * @return short names of months
      */
     String[] getStandaloneShortMonthNames() {
         return getMonthDisplayNames(Calendar.SHORT_STANDALONE);
@@ -192,7 +192,7 @@ String[] getStandaloneShortMonthNames() {
     /**
      * Gets the current year.
      *
-     * @return the current year.
+     * @return the current year
      */
     public int getYear() {
         return calendar.get(Calendar.YEAR);
@@ -201,7 +201,7 @@ public int getYear() {
     /**
      * Converts this instance to a {@link LocalDate}.
      *
-     * @return a LocalDate.
+     * @return a LocalDate
      * @since 3.18.0
      */
     public LocalDate toLocalDate() {
@@ -211,7 +211,7 @@ public LocalDate toLocalDate() {
     /**
      * Converts this instance to a {@link LocalDateTime}.
      *
-     * @return a LocalDateTime.
+     * @return a LocalDateTime
      * @since 3.17.0
      */
     public LocalDateTime toLocalDateTime() {
@@ -221,7 +221,7 @@ public LocalDateTime toLocalDateTime() {
     /**
      * Converts this instance to a {@link OffsetDateTime}.
      *
-     * @return a OffsetDateTime.
+     * @return a OffsetDateTime
      * @since 3.17.0
      */
     public OffsetDateTime toOffsetDateTime() {
@@ -231,7 +231,7 @@ public OffsetDateTime toOffsetDateTime() {
     /**
      * Converts this instance to a {@link ZonedDateTime}.
      *
-     * @return a ZonedDateTime.
+     * @return a ZonedDateTime
      * @since 3.17.0
      */
     public ZonedDateTime toZonedDateTime() {
diff --git a/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
index 8554c967b19..075c431e84d 100644
--- a/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
@@ -58,7 +58,7 @@ public class DateFormatUtils {
             = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss");
 
     /**
-     * @deprecated - as of 4.0, ISO_DATETIME_FORMAT will be replaced by ISO_8601_EXTENDED_DATETIME_FORMAT.
+     * @deprecated as of 4.0, ISO_DATETIME_FORMAT will be replaced by ISO_8601_EXTENDED_DATETIME_FORMAT.
      */
     @Deprecated
     public static final FastDateFormat ISO_DATETIME_FORMAT = ISO_8601_EXTENDED_DATETIME_FORMAT;
@@ -77,7 +77,7 @@ public class DateFormatUtils {
             = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ssZZ");
 
     /**
-     * @deprecated - as of 4.0, ISO_DATETIME_TIME_ZONE_FORMAT will be replaced by ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.
+     * @deprecated as of 4.0, ISO_DATETIME_TIME_ZONE_FORMAT will be replaced by ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.
      */
     @Deprecated
     public static final FastDateFormat ISO_DATETIME_TIME_ZONE_FORMAT = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
@@ -96,7 +96,7 @@ public class DateFormatUtils {
             = FastDateFormat.getInstance("yyyy-MM-dd");
 
     /**
-     * @deprecated - as of 4.0, ISO_DATE_FORMAT will be replaced by ISO_8601_EXTENDED_DATE_FORMAT.
+     * @deprecated as of 4.0, ISO_DATE_FORMAT will be replaced by ISO_8601_EXTENDED_DATE_FORMAT.
      */
     @Deprecated
     public static final FastDateFormat ISO_DATE_FORMAT = ISO_8601_EXTENDED_DATE_FORMAT;
@@ -111,7 +111,7 @@ public class DateFormatUtils {
      * effect at the time of loading DateFormatUtils class.
      * </p>
      *
-     * @deprecated - as of 4.0, ISO_DATE_TIME_ZONE_FORMAT will be removed.
+     * @deprecated as of 4.0, ISO_DATE_TIME_ZONE_FORMAT will be removed.
      */
     @Deprecated
     public static final FastDateFormat ISO_DATE_TIME_ZONE_FORMAT
@@ -126,7 +126,7 @@ public class DateFormatUtils {
      * TimeZone in effect at the time of loading DateFormatUtils class.
      * </p>
      *
-     * @deprecated - as of 4.0, ISO_TIME_FORMAT will be removed.
+     * @deprecated as of 4.0, ISO_TIME_FORMAT will be removed.
      */
     @Deprecated
     public static final FastDateFormat ISO_TIME_FORMAT
@@ -141,7 +141,7 @@ public class DateFormatUtils {
      * TimeZone in effect at the time of loading DateFormatUtils class.
      * </p>
      *
-     * @deprecated - as of 4.0, ISO_TIME_TIME_ZONE_FORMAT will be removed.
+     * @deprecated as of 4.0, ISO_TIME_TIME_ZONE_FORMAT will be removed.
      */
     @Deprecated
     public static final FastDateFormat ISO_TIME_TIME_ZONE_FORMAT
@@ -161,7 +161,7 @@ public class DateFormatUtils {
             = FastDateFormat.getInstance("HH:mm:ss");
 
     /**
-     * @deprecated - as of 4.0, ISO_TIME_NO_T_FORMAT will be replaced by ISO_8601_EXTENDED_TIME_FORMAT.
+     * @deprecated as of 4.0, ISO_TIME_NO_T_FORMAT will be replaced by ISO_8601_EXTENDED_TIME_FORMAT.
      */
     @Deprecated
     public static final FastDateFormat ISO_TIME_NO_T_FORMAT = ISO_8601_EXTENDED_TIME_FORMAT;
@@ -180,7 +180,7 @@ public class DateFormatUtils {
             = FastDateFormat.getInstance("HH:mm:ssZZ");
 
     /**
-     * @deprecated - as of 4.0, ISO_TIME_NO_T_TIME_ZONE_FORMAT will be replaced by ISO_8601_EXTENDED_TIME_TIME_ZONE_FORMAT.
+     * @deprecated as of 4.0, ISO_TIME_NO_T_TIME_ZONE_FORMAT will be replaced by ISO_8601_EXTENDED_TIME_TIME_ZONE_FORMAT.
      */
     @Deprecated
     public static final FastDateFormat ISO_TIME_NO_T_TIME_ZONE_FORMAT = ISO_8601_EXTENDED_TIME_TIME_ZONE_FORMAT;
@@ -201,9 +201,9 @@ public class DateFormatUtils {
      * Formats a calendar into a specific pattern. The TimeZone from the calendar
      * will be used for formatting.
      *
-     * @param calendar  the calendar to format, not null.
-     * @param pattern  the pattern to use to format the calendar, not null.
-     * @return the formatted calendar.
+     * @param calendar  the calendar to format, not null
+     * @param pattern  the pattern to use to format the calendar, not null
+     * @return the formatted calendar
      * @see FastDateFormat#format(Calendar)
      * @since 2.4
      */
@@ -215,10 +215,10 @@ public static String format(final Calendar calendar, final String pattern) {
      * Formats a calendar into a specific pattern in a locale. The TimeZone from the calendar
      * will be used for formatting.
      *
-     * @param calendar  the calendar to format, not null.
-     * @param pattern  the pattern to use to format the calendar, not null.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted calendar.
+     * @param calendar  the calendar to format, not null
+     * @param pattern  the pattern to use to format the calendar, not null
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted calendar
      * @see FastDateFormat#format(Calendar)
      * @since 2.4
      */
@@ -229,10 +229,10 @@ public static String format(final Calendar calendar, final String pattern, final
     /**
      * Formats a calendar into a specific pattern in a time zone.
      *
-     * @param calendar  the calendar to format, not null.
-     * @param pattern  the pattern to use to format the calendar, not null.
-     * @param timeZone  the time zone  to use, may be {@code null}.
-     * @return the formatted calendar.
+     * @param calendar  the calendar to format, not null
+     * @param pattern  the pattern to use to format the calendar, not null
+     * @param timeZone  the time zone  to use, may be {@code null}
+     * @return the formatted calendar
      * @see FastDateFormat#format(Calendar)
      * @since 2.4
      */
@@ -243,11 +243,11 @@ public static String format(final Calendar calendar, final String pattern, final
     /**
      * Formats a calendar into a specific pattern in a time zone and locale.
      *
-     * @param calendar  the calendar to format, not null.
-     * @param pattern  the pattern to use to format the calendar, not null.
-     * @param timeZone  the time zone  to use, may be {@code null}.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted calendar.
+     * @param calendar  the calendar to format, not null
+     * @param pattern  the pattern to use to format the calendar, not null
+     * @param timeZone  the time zone  to use, may be {@code null}
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted calendar
      * @see FastDateFormat#format(Calendar)
      * @since 2.4
      */
@@ -259,9 +259,9 @@ public static String format(final Calendar calendar, final String pattern, final
     /**
      * Formats a date/time into a specific pattern.
      *
-     * @param date  the date to format, not null.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @return the formatted date.
+     * @param date  the date to format, not null
+     * @param pattern  the pattern to use to format the date, not null
+     * @return the formatted date
      */
     public static String format(final Date date, final String pattern) {
         return format(date, pattern, null, null);
@@ -270,10 +270,10 @@ public static String format(final Date date, final String pattern) {
     /**
      * Formats a date/time into a specific pattern in a locale.
      *
-     * @param date  the date to format, not null.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted date.
+     * @param date  the date to format, not null
+     * @param pattern  the pattern to use to format the date, not null
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted date
      */
     public static String format(final Date date, final String pattern, final Locale locale) {
         return format(date, pattern, null, locale);
@@ -282,10 +282,10 @@ public static String format(final Date date, final String pattern, final Locale
     /**
      * Formats a date/time into a specific pattern in a time zone.
      *
-     * @param date  the date to format, not null.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @param timeZone  the time zone  to use, may be {@code null}.
-     * @return the formatted date.
+     * @param date  the date to format, not null
+     * @param pattern  the pattern to use to format the date, not null
+     * @param timeZone  the time zone  to use, may be {@code null}
+     * @return the formatted date
      */
     public static String format(final Date date, final String pattern, final TimeZone timeZone) {
         return format(date, pattern, timeZone, null);
@@ -294,11 +294,11 @@ public static String format(final Date date, final String pattern, final TimeZon
     /**
      * Formats a date/time into a specific pattern in a time zone and locale.
      *
-     * @param date  the date to format, not null.
-     * @param pattern  the pattern to use to format the date, not null, not null.
-     * @param timeZone  the time zone  to use, may be {@code null}.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted date.
+     * @param date  the date to format, not null
+     * @param pattern  the pattern to use to format the date, not null, not null
+     * @param timeZone  the time zone  to use, may be {@code null}
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted date
      */
     public static String format(final Date date, final String pattern, final TimeZone timeZone, final Locale locale) {
         final FastDateFormat df = FastDateFormat.getInstance(pattern, timeZone, locale);
@@ -308,9 +308,9 @@ public static String format(final Date date, final String pattern, final TimeZon
     /**
      * Formats a date/time into a specific pattern.
      *
-     * @param millis  the date to format expressed in milliseconds.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @return the formatted date.
+     * @param millis  the date to format expressed in milliseconds
+     * @param pattern  the pattern to use to format the date, not null
+     * @return the formatted date
      */
     public static String format(final long millis, final String pattern) {
         return format(new Date(millis), pattern, null, null);
@@ -319,10 +319,10 @@ public static String format(final long millis, final String pattern) {
     /**
      * Formats a date/time into a specific pattern in a locale.
      *
-     * @param millis  the date to format expressed in milliseconds.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted date.
+     * @param millis  the date to format expressed in milliseconds
+     * @param pattern  the pattern to use to format the date, not null
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted date
      */
     public static String format(final long millis, final String pattern, final Locale locale) {
         return format(new Date(millis), pattern, null, locale);
@@ -331,10 +331,10 @@ public static String format(final long millis, final String pattern, final Local
     /**
      * Formats a date/time into a specific pattern in a time zone.
      *
-     * @param millis  the time expressed in milliseconds.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @param timeZone  the time zone  to use, may be {@code null}.
-     * @return the formatted date.
+     * @param millis  the time expressed in milliseconds
+     * @param pattern  the pattern to use to format the date, not null
+     * @param timeZone  the time zone  to use, may be {@code null}
+     * @return the formatted date
      */
     public static String format(final long millis, final String pattern, final TimeZone timeZone) {
         return format(new Date(millis), pattern, timeZone, null);
@@ -343,11 +343,11 @@ public static String format(final long millis, final String pattern, final TimeZ
     /**
      * Formats a date/time into a specific pattern in a time zone and locale.
      *
-     * @param millis  the date to format expressed in milliseconds.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @param timeZone  the time zone  to use, may be {@code null}.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted date.
+     * @param millis  the date to format expressed in milliseconds
+     * @param pattern  the pattern to use to format the date, not null
+     * @param timeZone  the time zone  to use, may be {@code null}
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted date
      */
     public static String format(final long millis, final String pattern, final TimeZone timeZone, final Locale locale) {
         return format(new Date(millis), pattern, timeZone, locale);
@@ -356,9 +356,9 @@ public static String format(final long millis, final String pattern, final TimeZ
     /**
      * Formats a date/time into a specific pattern using the UTC time zone.
      *
-     * @param date  the date to format, not null.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @return the formatted date.
+     * @param date  the date to format, not null
+     * @param pattern  the pattern to use to format the date, not null
+     * @return the formatted date
      */
     public static String formatUTC(final Date date, final String pattern) {
         return format(date, pattern, UTC_TIME_ZONE, null);
@@ -367,10 +367,10 @@ public static String formatUTC(final Date date, final String pattern) {
     /**
      * Formats a date/time into a specific pattern using the UTC time zone.
      *
-     * @param date  the date to format, not null.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted date.
+     * @param date  the date to format, not null
+     * @param pattern  the pattern to use to format the date, not null
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted date
      */
     public static String formatUTC(final Date date, final String pattern, final Locale locale) {
         return format(date, pattern, UTC_TIME_ZONE, locale);
@@ -379,9 +379,9 @@ public static String formatUTC(final Date date, final String pattern, final Loca
     /**
      * Formats a date/time into a specific pattern using the UTC time zone.
      *
-     * @param millis  the date to format expressed in milliseconds.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @return the formatted date.
+     * @param millis  the date to format expressed in milliseconds
+     * @param pattern  the pattern to use to format the date, not null
+     * @return the formatted date
      */
     public static String formatUTC(final long millis, final String pattern) {
         return format(new Date(millis), pattern, UTC_TIME_ZONE, null);
@@ -390,10 +390,10 @@ public static String formatUTC(final long millis, final String pattern) {
     /**
      * Formats a date/time into a specific pattern using the UTC time zone.
      *
-     * @param millis  the date to format expressed in milliseconds.
-     * @param pattern  the pattern to use to format the date, not null.
-     * @param locale  the locale to use, may be {@code null}.
-     * @return the formatted date.
+     * @param millis  the date to format expressed in milliseconds
+     * @param pattern  the pattern to use to format the date, not null
+     * @param locale  the locale to use, may be {@code null}
+     * @return the formatted date
      */
     public static String formatUTC(final long millis, final String pattern, final Locale locale) {
         return format(new Date(millis), pattern, UTC_TIME_ZONE, locale);
diff --git a/src/main/java/org/apache/commons/lang3/time/DateParser.java b/src/main/java/org/apache/commons/lang3/time/DateParser.java
index e3ec6e05d5c..03aa1a00561 100644
--- a/src/main/java/org/apache/commons/lang3/time/DateParser.java
+++ b/src/main/java/org/apache/commons/lang3/time/DateParser.java
@@ -46,7 +46,7 @@ public interface DateParser {
     /**
      * Gets the pattern used by this parser.
      *
-     * @return the pattern, {@link java.text.SimpleDateFormat} compatible.
+     * @return the pattern, {@link java.text.SimpleDateFormat} compatible
      */
     String getPattern();
 
@@ -67,9 +67,9 @@ public interface DateParser {
      *
      * See {@link java.text.DateFormat#parse(String)} for more information.
      *
-     * @param source A {@link String} whose beginning should be parsed.
-     * @return A {@link Date} parsed from the string.
-     * @throws ParseException if the beginning of the specified string cannot be parsed.
+     * @param source a {@link String} whose beginning should be parsed
+     * @return a {@link Date} parsed from the string
+     * @throws ParseException if the beginning of the specified string cannot be parsed
      */
     Date parse(String source) throws ParseException;
 
@@ -78,11 +78,11 @@ public interface DateParser {
      *
      * See {@link java.text.DateFormat#parse(String, ParsePosition)} for more information.
      *
-     * @param source A {@link String}, part of which should be parsed.
-     * @param pos A {@link ParsePosition} object with index and error index information
-     * as described above.
-     * @return A {@link Date} parsed from the string. In case of error, returns null.
-     * @throws NullPointerException if text or pos is null.
+     * @param source a {@link String}, part of which should be parsed
+     * @param pos a {@link ParsePosition} object with index and error index information
+     * as described above
+     * @return a {@link Date} parsed from the string. In case of error, returns null.
+     * @throws NullPointerException if text or pos is null
      */
     Date parse(String source, ParsePosition pos);
 
@@ -92,13 +92,12 @@ public interface DateParser {
      * Not all source text needs to be consumed.  Upon parse failure, ParsePosition error index is updated to
      * the offset of the source text which does not match the supplied format.
      *
-     * @param source The text to parse.
-     * @param pos On input, the position in the source to start parsing, on output, updated position.
-     * @param calendar The calendar into which to set parsed fields.
+     * @param source the text to parse
+     * @param pos on input, the position in the source to start parsing, on output, updated position
+     * @param calendar the calendar into which to set parsed fields
      * @return true, if source has been parsed (pos parsePosition is updated); otherwise false (and pos errorIndex is updated)
      * @throws IllegalArgumentException when Calendar has been set to be not lenient, and a parsed field is
-     * out of range.
-     *
+     * out of range
      * @since 3.5
      */
     boolean parse(String source, ParsePosition pos, Calendar calendar);
@@ -106,9 +105,9 @@ public interface DateParser {
     /**
      * Parses text from a string to produce a Date.
      *
-     * @param source A {@link String} whose beginning should be parsed.
-     * @return a {@link java.util.Date} object.
-     * @throws ParseException if the beginning of the specified string cannot be parsed.
+     * @param source a {@link String} whose beginning should be parsed
+     * @return a {@link java.util.Date} object
+     * @throws ParseException if the beginning of the specified string cannot be parsed
      * @see java.text.DateFormat#parseObject(String)
      */
     Object parseObject(String source) throws ParseException;
@@ -116,9 +115,9 @@ public interface DateParser {
     /**
      * Parses a date/time string according to the given parse position.
      *
-     * @param source A {@link String} whose beginning should be parsed.
-     * @param pos the parse position.
-     * @return a {@link java.util.Date} object.
+     * @param source a {@link String} whose beginning should be parsed
+     * @param pos the parse position
+     * @return a {@link java.util.Date} object
      * @see java.text.DateFormat#parseObject(String, ParsePosition)
      */
     Object parseObject(String source, ParsePosition pos);
diff --git a/src/main/java/org/apache/commons/lang3/time/DatePrinter.java b/src/main/java/org/apache/commons/lang3/time/DatePrinter.java
index 5cda1a43fab..f056cea7eed 100644
--- a/src/main/java/org/apache/commons/lang3/time/DatePrinter.java
+++ b/src/main/java/org/apache/commons/lang3/time/DatePrinter.java
@@ -41,8 +41,8 @@ public interface DatePrinter {
      * The TimeZone specified during the construction of the Parser will determine the TimeZone
      * used in the formatted string.
      *
-     * @param calendar  the calendar to format.
-     * @return the formatted string.
+     * @param calendar  the calendar to format
+     * @return the formatted string
      */
     String format(Calendar calendar);
 
@@ -52,10 +52,10 @@ public interface DatePrinter {
      * The TimeZone specified during the construction of the Parser will determine the TimeZone
      * used in the formatted string.
      *
-     * @param calendar  the calendar to format.
-     * @param buf  the buffer to format into.
-     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer.
-     * @return the specified string buffer.
+     * @param calendar  the calendar to format
+     * @param buf  the buffer to format into
+     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer
+     * @return the specified string buffer
      * @since 3.5
      */
     <B extends Appendable> B format(Calendar calendar, B buf);
@@ -66,9 +66,9 @@ public interface DatePrinter {
      * The TimeZone specified during the construction of the Parser will determine the TimeZone
      * used in the formatted string.
      *
-     * @param calendar  the calendar to format.
-     * @param buf  the buffer to format into.
-     * @return the specified string buffer.
+     * @param calendar  the calendar to format
+     * @param buf  the buffer to format into
+     * @return the specified string buffer
      * @deprecated Use {{@link #format(Calendar, Appendable)}.
      */
     @Deprecated
@@ -86,10 +86,10 @@ public interface DatePrinter {
      * Formats a {@link Date} object into the
      * supplied {@link Appendable} using a {@link GregorianCalendar}.
      *
-     * @param date  the date to format.
-     * @param buf  the buffer to format into.
-     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer.
-     * @return the specified string buffer.
+     * @param date  the date to format
+     * @param buf  the buffer to format into
+     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer
+     * @return the specified string buffer
      * @since 3.5
      */
     <B extends Appendable> B format(Date date, B buf);
@@ -98,9 +98,9 @@ public interface DatePrinter {
      * Formats a {@link Date} object into the
      * supplied {@link StringBuffer} using a {@link GregorianCalendar}.
      *
-     * @param date  the date to format.
-     * @param buf  the buffer to format into.
-     * @return the specified string buffer.
+     * @param date  the date to format
+     * @param buf  the buffer to format into
+     * @return the specified string buffer
      * @deprecated Use {{@link #format(Date, Appendable)}.
      */
     @Deprecated
@@ -109,8 +109,8 @@ public interface DatePrinter {
     /**
      * Formats a millisecond {@code long} value.
      *
-     * @param millis  the millisecond value to format.
-     * @return the formatted string.
+     * @param millis  the millisecond value to format
+     * @return the formatted string
      * @since 2.1
      */
     String format(long millis);
@@ -119,10 +119,10 @@ public interface DatePrinter {
      * Formats a millisecond {@code long} value into the
      * supplied {@link Appendable}.
      *
-     * @param millis  the millisecond value to format.
-     * @param buf  the buffer to format into.
-     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer.
-     * @return the specified string buffer.
+     * @param millis  the millisecond value to format
+     * @param buf  the buffer to format into
+     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer
+     * @return the specified string buffer
      * @since 3.5
      */
     <B extends Appendable> B format(long millis, B buf);
@@ -131,9 +131,9 @@ public interface DatePrinter {
      * Formats a millisecond {@code long} value into the
      * supplied {@link StringBuffer}.
      *
-     * @param millis  the millisecond value to format.
-     * @param buf  the buffer to format into.
-     * @return the specified string buffer.
+     * @param millis  the millisecond value to format
+     * @param buf  the buffer to format into
+     * @return the specified string buffer
      * @deprecated Use {{@link #format(long, Appendable)}.
      */
     @Deprecated
@@ -143,10 +143,10 @@ public interface DatePrinter {
      * Formats a {@link Date}, {@link Calendar} or
      * {@link Long} (milliseconds) object.
      *
-     * @param obj  the object to format.
-     * @param toAppendTo  the buffer to append to.
-     * @param pos  the position - ignored.
-     * @return the buffer passed in.
+     * @param obj  the object to format
+     * @param toAppendTo  the buffer to append to
+     * @param pos  the position - ignored
+     * @return the buffer passed in
      * @see java.text.DateFormat#format(Object, StringBuffer, FieldPosition)
      */
     StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos);
@@ -154,14 +154,14 @@ public interface DatePrinter {
     /**
      * Gets the locale used by this printer.
      *
-     * @return the locale.
+     * @return the locale
      */
     Locale getLocale();
 
     /**
      * Gets the pattern used by this printer.
      *
-     * @return the pattern, {@link java.text.SimpleDateFormat} compatible.
+     * @return the pattern, {@link java.text.SimpleDateFormat} compatible
      */
     String getPattern();
 
@@ -170,7 +170,7 @@ public interface DatePrinter {
      *
      * <p>This zone is always used for {@link Date} printing.</p>
      *
-     * @return the time zone.
+     * @return the time zone
      */
     TimeZone getTimeZone();
 }
diff --git a/src/main/java/org/apache/commons/lang3/time/DateUtils.java b/src/main/java/org/apache/commons/lang3/time/DateUtils.java
index f8abf1429b7..eee37c03fc0 100644
--- a/src/main/java/org/apache/commons/lang3/time/DateUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DateUtils.java
@@ -68,8 +68,8 @@ static final class DateIterator implements Iterator<Calendar> {
         /**
          * Constructs a DateIterator that ranges from one date to another.
          *
-         * @param startFinal start date (inclusive).
-         * @param endFinal end date (inclusive).
+         * @param startFinal start date (inclusive)
+         * @param endFinal end date (inclusive)
          */
         DateIterator(final Calendar startFinal, final Calendar endFinal) {
             this.endFinal = endFinal;
@@ -80,7 +80,7 @@ static final class DateIterator implements Iterator<Calendar> {
         /**
          * Has the iterator not reached the end date yet?
          *
-         * @return {@code true} if the iterator has yet to reach the end date.
+         * @return {@code true} if the iterator has yet to reach the end date
          */
         @Override
         public boolean hasNext() {
@@ -90,7 +90,7 @@ public boolean hasNext() {
         /**
          * Returns the next calendar in the iteration.
          *
-         * @return Object calendar for the next date.
+         * @return object calendar for the next date
          */
         @Override
         public Calendar next() {
@@ -104,7 +104,7 @@ public Calendar next() {
         /**
          * Always throws UnsupportedOperationException.
          *
-         * @throws UnsupportedOperationException Always thrown.
+         * @throws UnsupportedOperationException always thrown
          * @see java.util.Iterator#remove()
          */
         @Override
@@ -213,11 +213,11 @@ private enum ModifyType {
      * Adds to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param calendarField  the calendar field to add to.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param calendarField  the calendar field to add to
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     private static Date add(final Date date, final int calendarField, final int amount) {
         validateDateNotNull(date);
@@ -231,10 +231,10 @@ private static Date add(final Date date, final int calendarField, final int amou
      * Adds a number of days to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addDays(final Date date, final int amount) {
         return add(date, Calendar.DAY_OF_MONTH, amount);
@@ -244,10 +244,10 @@ public static Date addDays(final Date date, final int amount) {
      * Adds a number of hours to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addHours(final Date date, final int amount) {
         return add(date, Calendar.HOUR_OF_DAY, amount);
@@ -257,10 +257,10 @@ public static Date addHours(final Date date, final int amount) {
      * Adds a number of milliseconds to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addMilliseconds(final Date date, final int amount) {
         return add(date, Calendar.MILLISECOND, amount);
@@ -270,10 +270,10 @@ public static Date addMilliseconds(final Date date, final int amount) {
      * Adds a number of minutes to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addMinutes(final Date date, final int amount) {
         return add(date, Calendar.MINUTE, amount);
@@ -283,10 +283,10 @@ public static Date addMinutes(final Date date, final int amount) {
      * Adds a number of months to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addMonths(final Date date, final int amount) {
         return add(date, Calendar.MONTH, amount);
@@ -296,10 +296,10 @@ public static Date addMonths(final Date date, final int amount) {
      * Adds a number of seconds to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addSeconds(final Date date, final int amount) {
         return add(date, Calendar.SECOND, amount);
@@ -309,10 +309,10 @@ public static Date addSeconds(final Date date, final int amount) {
      * Adds a number of weeks to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addWeeks(final Date date, final int amount) {
         return add(date, Calendar.WEEK_OF_YEAR, amount);
@@ -322,10 +322,10 @@ public static Date addWeeks(final Date date, final int amount) {
      * Adds a number of years to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount  the amount to add, may be negative.
-     * @return the new {@link Date} with the amount added.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount  the amount to add, may be negative
+     * @return the new {@link Date} with the amount added
+     * @throws NullPointerException if the date is null
      */
     public static Date addYears(final Date date, final int amount) {
         return add(date, Calendar.YEAR, amount);
@@ -340,11 +340,11 @@ public static Date addYears(final Date date, final int amount) {
      * 2002 14:00:00.000.  If this was passed with MONTH, it would
      * return 1 Apr 2002 0:00:00.000.</p>
      *
-     * @param calendar  the date to work with, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different ceil date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param calendar  the date to work with, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different ceil date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.5
      */
     public static Calendar ceiling(final Calendar calendar, final int field) {
@@ -361,11 +361,11 @@ public static Calendar ceiling(final Calendar calendar, final int field) {
      * 2002 14:00:00.000.  If this was passed with MONTH, it would
      * return 1 Apr 2002 0:00:00.000.</p>
      *
-     * @param date  the date to work with, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different ceil date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param date  the date to work with, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different ceil date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.5
      */
     public static Date ceiling(final Date date, final int field) {
@@ -381,12 +381,12 @@ public static Date ceiling(final Date date, final int field) {
      * 2002 14:00:00.000.  If this was passed with MONTH, it would
      * return 1 Apr 2002 0:00:00.000.</p>
      *
-     * @param date  the date to work with, either {@link Date} or {@link Calendar}, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different ceil date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param date  the date to work with, either {@link Date} or {@link Calendar}, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different ceil date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.5
      */
     public static Date ceiling(final Object date, final int field) {
@@ -403,11 +403,11 @@ public static Date ceiling(final Object date, final int field) {
     /**
      * Gets a Calendar fragment for any unit.
      *
-     * @param calendar the calendar to work with, not null.
-     * @param fragment the Calendar field part of calendar to calculate.
-     * @param unit     the time unit.
-     * @return number of units within the fragment of the calendar.
-     * @throws NullPointerException if the date is {@code null} or fragment is not supported.
+     * @param calendar the calendar to work with, not null
+     * @param fragment the Calendar field part of calendar to calculate
+     * @param unit     the time unit
+     * @return number of units within the fragment of the calendar
+     * @throws NullPointerException if the date is {@code null} or fragment is not supported
      * @since 2.4
      */
     private static long getFragment(final Calendar calendar, final int fragment, final TimeUnit unit) {
@@ -455,12 +455,12 @@ private static long getFragment(final Calendar calendar, final int fragment, fin
     /**
      * Gets a Date fragment for any unit.
      *
-     * @param date the date to work with, not null.
-     * @param fragment the Calendar field part of date to calculate.
-     * @param unit the time unit.
-     * @return number of units within the fragment of the date.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws IllegalArgumentException if fragment is not supported.
+     * @param date the date to work with, not null
+     * @param fragment the Calendar field part of date to calculate
+     * @param unit the time unit
+     * @return number of units within the fragment of the date
+     * @throws IllegalArgumentException if fragment is not supported
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.4
      */
     private static long getFragment(final Date date, final int fragment, final TimeUnit unit) {
@@ -499,11 +499,11 @@ private static long getFragment(final Date date, final int fragment, final TimeU
      *   (a millisecond cannot be split in days)</li>
      * </ul>
      *
-     * @param calendar the calendar to work with, not null.
-     * @param fragment the {@link Calendar} field part of calendar to calculate.
-     * @return number of days within the fragment of date.
+     * @param calendar the calendar to work with, not null
+     * @param fragment the {@link Calendar} field part of calendar to calculate
+     * @return number of days within the fragment of date
      * @throws NullPointerException if the date is {@code null} or
-     * fragment is not supported.
+     * fragment is not supported
      * @since 2.4
      */
     public static long getFragmentInDays(final Calendar calendar, final int fragment) {
@@ -537,11 +537,11 @@ public static long getFragmentInDays(final Calendar calendar, final int fragment
      *   (a millisecond cannot be split in days)</li>
      * </ul>
      *
-     * @param date the date to work with, not null.
-     * @param fragment the {@link Calendar} field part of date to calculate.
-     * @return number of days  within the fragment of date.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws IllegalArgumentException if the fragment is not supported.
+     * @param date the date to work with, not null
+     * @param fragment the {@link Calendar} field part of date to calculate
+     * @return number of days  within the fragment of date
+     * @throws IllegalArgumentException if the fragment is not supported
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.4
      */
     public static long getFragmentInDays(final Date date, final int fragment) {
@@ -575,11 +575,11 @@ public static long getFragmentInDays(final Date date, final int fragment) {
      *   (a millisecond cannot be split in hours)</li>
      * </ul>
      *
-     * @param calendar the calendar to work with, not null.
-     * @param fragment the {@link Calendar} field part of calendar to calculate.
-     * @return number of hours within the fragment of date.
+     * @param calendar the calendar to work with, not null
+     * @param fragment the {@link Calendar} field part of calendar to calculate
+     * @return number of hours within the fragment of date
      * @throws NullPointerException if the date is {@code null} or
-     * fragment is not supported.
+     * fragment is not supported
      * @since 2.4
      */
     public static long getFragmentInHours(final Calendar calendar, final int fragment) {
@@ -613,11 +613,11 @@ public static long getFragmentInHours(final Calendar calendar, final int fragmen
      *   (a millisecond cannot be split in hours)</li>
      * </ul>
      *
-     * @param date the date to work with, not null.
-     * @param fragment the {@link Calendar} field part of date to calculate.
-     * @return number of hours within the fragment of date.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws IllegalArgumentException if the fragment is not supported.
+     * @param date the date to work with, not null
+     * @param fragment the {@link Calendar} field part of date to calculate
+     * @return number of hours within the fragment of date
+     * @throws IllegalArgumentException if the fragment is not supported
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.4
      */
     public static long getFragmentInHours(final Date date, final int fragment) {
@@ -651,11 +651,11 @@ public static long getFragmentInHours(final Date date, final int fragment) {
      *   (a millisecond cannot be split in milliseconds)</li>
      * </ul>
      *
-     * @param calendar the calendar to work with, not null.
-     * @param fragment the {@link Calendar} field part of calendar to calculate.
-     * @return number of milliseconds within the fragment of date.
+     * @param calendar the calendar to work with, not null
+     * @param fragment the {@link Calendar} field part of calendar to calculate
+     * @return number of milliseconds within the fragment of date
      * @throws NullPointerException if the date is {@code null} or
-     * fragment is not supported.
+     * fragment is not supported
      * @since 2.4
      */
   public static long getFragmentInMilliseconds(final Calendar calendar, final int fragment) {
@@ -686,11 +686,11 @@ public static long getFragmentInMilliseconds(final Calendar calendar, final int
      *   (a millisecond cannot be split in milliseconds)</li>
      * </ul>
      *
-     * @param date the date to work with, not null.
-     * @param fragment the {@link Calendar} field part of date to calculate.
-     * @return number of milliseconds within the fragment of date.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws IllegalArgumentException if the fragment is not supported.
+     * @param date the date to work with, not null
+     * @param fragment the {@link Calendar} field part of date to calculate
+     * @return number of milliseconds within the fragment of date
+     * @throws IllegalArgumentException if the fragment is not supported
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.4
      */
     public static long getFragmentInMilliseconds(final Date date, final int fragment) {
@@ -724,11 +724,11 @@ public static long getFragmentInMilliseconds(final Date date, final int fragment
      *   (a millisecond cannot be split in minutes)</li>
      * </ul>
      *
-     * @param calendar the calendar to work with, not null.
-     * @param fragment the {@link Calendar} field part of calendar to calculate.
-     * @return number of minutes within the fragment of date.
+     * @param calendar the calendar to work with, not null
+     * @param fragment the {@link Calendar} field part of calendar to calculate
+     * @return number of minutes within the fragment of date
      * @throws NullPointerException if the date is {@code null} or
-     * fragment is not supported.
+     * fragment is not supported
      * @since 2.4
      */
     public static long getFragmentInMinutes(final Calendar calendar, final int fragment) {
@@ -762,11 +762,11 @@ public static long getFragmentInMinutes(final Calendar calendar, final int fragm
      *   (a millisecond cannot be split in minutes)</li>
      * </ul>
      *
-     * @param date the date to work with, not null.
-     * @param fragment the {@link Calendar} field part of date to calculate.
-     * @return number of minutes within the fragment of date.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws IllegalArgumentException if the fragment is not supported.
+     * @param date the date to work with, not null
+     * @param fragment the {@link Calendar} field part of date to calculate
+     * @return number of minutes within the fragment of date
+     * @throws IllegalArgumentException if the fragment is not supported
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.4
      */
     public static long getFragmentInMinutes(final Date date, final int fragment) {
@@ -800,11 +800,11 @@ public static long getFragmentInMinutes(final Date date, final int fragment) {
      *   (a millisecond cannot be split in seconds)</li>
      * </ul>
      *
-     * @param calendar the calendar to work with, not null.
-     * @param fragment the {@link Calendar} field part of calendar to calculate.
-     * @return number of seconds within the fragment of date.
+     * @param calendar the calendar to work with, not null
+     * @param fragment the {@link Calendar} field part of calendar to calculate
+     * @return number of seconds within the fragment of date
      * @throws NullPointerException if the date is {@code null} or
-     * fragment is not supported.
+     * fragment is not supported
      * @since 2.4
      */
     public static long getFragmentInSeconds(final Calendar calendar, final int fragment) {
@@ -838,11 +838,11 @@ public static long getFragmentInSeconds(final Calendar calendar, final int fragm
      *   (a millisecond cannot be split in seconds)</li>
      * </ul>
      *
-     * @param date the date to work with, not null.
-     * @param fragment the {@link Calendar} field part of date to calculate.
-     * @return number of seconds within the fragment of date.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws IllegalArgumentException if the fragment is not supported.
+     * @param date the date to work with, not null
+     * @param fragment the {@link Calendar} field part of date to calculate
+     * @return number of seconds within the fragment of date
+     * @throws IllegalArgumentException if the fragment is not supported
+     * @throws NullPointerException if the date is {@code null}
      * @since 2.4
      */
     public static long getFragmentInSeconds(final Date date, final int fragment) {
@@ -856,10 +856,10 @@ public static long getFragmentInSeconds(final Date date, final int fragment) {
      * 28 Mar 2002 13:45 and 12 Mar 2002 13:45 would return false.
      * </p>
      *
-     * @param cal1  the first calendar, not altered, not null.
-     * @param cal2  the second calendar, not altered, not null.
-     * @return true if they represent the same day.
-     * @throws NullPointerException if either calendar is {@code null}.
+     * @param cal1  the first calendar, not altered, not null
+     * @param cal2  the second calendar, not altered, not null
+     * @return true if they represent the same day
+     * @throws NullPointerException if either calendar is {@code null}
      * @since 2.1
      */
     public static boolean isSameDay(final Calendar cal1, final Calendar cal2) {
@@ -877,10 +877,10 @@ public static boolean isSameDay(final Calendar cal1, final Calendar cal2) {
      * 28 Mar 2002 13:45 and 12 Mar 2002 13:45 would return false.
      * </p>
      *
-     * @param date1  the first date, not altered, not null.
-     * @param date2  the second date, not altered, not null.
-     * @return true if they represent the same day.
-     * @throws NullPointerException if either date is {@code null}.
+     * @param date1  the first date, not altered, not null
+     * @param date2  the second date, not altered, not null
+     * @return true if they represent the same day
+     * @throws NullPointerException if either date is {@code null}
      * @since 2.1
      */
     public static boolean isSameDay(final Date date1, final Date date2) {
@@ -892,10 +892,10 @@ public static boolean isSameDay(final Date date1, final Date date2) {
      *
      * <p>This method compares the long millisecond time of the two objects.</p>
      *
-     * @param cal1  the first calendar, not altered, not null.
-     * @param cal2  the second calendar, not altered, not null.
-     * @return true if they represent the same millisecond instant.
-     * @throws NullPointerException if either date is {@code null}.
+     * @param cal1  the first calendar, not altered, not null
+     * @param cal2  the second calendar, not altered, not null
+     * @return true if they represent the same millisecond instant
+     * @throws NullPointerException if either date is {@code null}
      * @since 2.1
      */
     public static boolean isSameInstant(final Calendar cal1, final Calendar cal2) {
@@ -909,10 +909,10 @@ public static boolean isSameInstant(final Calendar cal1, final Calendar cal2) {
      *
      * <p>This method compares the long millisecond time of the two objects.</p>
      *
-     * @param date1  the first date, not altered, not null.
-     * @param date2  the second date, not altered, not null.
-     * @return true if they represent the same millisecond instant.
-     * @throws NullPointerException if either date is {@code null}.
+     * @param date1  the first date, not altered, not null
+     * @param date2  the second date, not altered, not null
+     * @return true if they represent the same millisecond instant
+     * @throws NullPointerException if either date is {@code null}
      * @since 2.1
      */
     public static boolean isSameInstant(final Date date1, final Date date2) {
@@ -927,10 +927,10 @@ public static boolean isSameInstant(final Date date1, final Date date2) {
      * <p>This method compares the values of the fields of the two objects.
      * In addition, both calendars must be the same of the same type.</p>
      *
-     * @param cal1  the first calendar, not altered, not null.
-     * @param cal2  the second calendar, not altered, not null.
-     * @return true if they represent the same millisecond instant.
-     * @throws NullPointerException if either date is {@code null}.
+     * @param cal1  the first calendar, not altered, not null
+     * @param cal2  the second calendar, not altered, not null
+     * @return true if they represent the same millisecond instant
+     * @throws NullPointerException if either date is {@code null}
      * @since 2.1
      */
     public static boolean isSameLocalTime(final Calendar cal1, final Calendar cal2) {
@@ -958,7 +958,7 @@ public static boolean isSameLocalTime(final Calendar cal1, final Calendar cal2)
      * <p>This method provides an iterator that returns Calendar objects.
      * The days are progressed using {@link Calendar#add(int, int)}.</p>
      *
-     * @param calendar  the date to work with, not null.
+     * @param calendar  the date to work with, not null
      * @param rangeStyle  the style constant to use. Must be one of
      * {@link DateUtils#RANGE_MONTH_SUNDAY},
      * {@link DateUtils#RANGE_MONTH_MONDAY},
@@ -966,9 +966,9 @@ public static boolean isSameLocalTime(final Calendar cal1, final Calendar cal2)
      * {@link DateUtils#RANGE_WEEK_MONDAY},
      * {@link DateUtils#RANGE_WEEK_RELATIVE},
      * {@link DateUtils#RANGE_WEEK_CENTER}.
-     * @return the date iterator, not null.
-     * @throws NullPointerException if calendar is {@code null}.
-     * @throws IllegalArgumentException if the rangeStyle is invalid.
+     * @return the date iterator, not null
+     * @throws IllegalArgumentException if the rangeStyle is invalid
+     * @throws NullPointerException if calendar is {@code null}
      */
     public static Iterator<Calendar> iterator(final Calendar calendar, final int rangeStyle) {
         Objects.requireNonNull(calendar, "calendar");
@@ -1054,7 +1054,7 @@ public static Iterator<Calendar> iterator(final Calendar calendar, final int ran
      * <p>This method provides an iterator that returns Calendar objects.
      * The days are progressed using {@link Calendar#add(int, int)}.</p>
      *
-     * @param focus  the date to work with, not null.
+     * @param focus  the date to work with, not null
      * @param rangeStyle  the style constant to use. Must be one of
      * {@link DateUtils#RANGE_MONTH_SUNDAY},
      * {@link DateUtils#RANGE_MONTH_MONDAY},
@@ -1062,9 +1062,9 @@ public static Iterator<Calendar> iterator(final Calendar calendar, final int ran
      * {@link DateUtils#RANGE_WEEK_MONDAY},
      * {@link DateUtils#RANGE_WEEK_RELATIVE},
      * {@link DateUtils#RANGE_WEEK_CENTER}.
-     * @return the date iterator, not null, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws IllegalArgumentException if the rangeStyle is invalid.
+     * @return the date iterator, not null, not null
+     * @throws IllegalArgumentException if the rangeStyle is invalid
+     * @throws NullPointerException if the date is {@code null}
      */
     public static Iterator<Calendar> iterator(final Date focus, final int rangeStyle) {
         return iterator(toCalendar(focus), rangeStyle);
@@ -1079,12 +1079,12 @@ public static Iterator<Calendar> iterator(final Date focus, final int rangeStyle
      * that starts with Sunday, June 30, 2002 and ends with Saturday, August 3,
      * 2002, returning a Calendar instance for each intermediate day.</p>
      *
-     * @param calendar  the date to work with, either {@link Date} or {@link Calendar}, not null.
+     * @param calendar  the date to work with, either {@link Date} or {@link Calendar}, not null
      * @param rangeStyle  the style constant to use. Must be one of the range
      * styles listed for the {@link #iterator(Calendar, int)} method.
-     * @return the date iterator, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}.
+     * @return the date iterator, not null
+     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}
+     * @throws NullPointerException if the date is {@code null}
      */
     public static Iterator<?> iterator(final Object calendar, final int rangeStyle) {
         Objects.requireNonNull(calendar, "calendar");
@@ -1100,11 +1100,11 @@ public static Iterator<?> iterator(final Object calendar, final int rangeStyle)
     /**
      * Internal calculation method.
      *
-     * @param val  the calendar, not null.
-     * @param field  the field constant.
-     * @param modType  type to truncate, round or ceiling.
-     * @return the given calendar.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param val  the calendar, not null
+     * @param field  the field constant
+     * @param modType  type to truncate, round or ceiling
+     * @return the given calendar
+     * @throws ArithmeticException if the year is over 280 million
      */
     private static Calendar modify(final Calendar val, final int field, final ModifyType modType) {
         if (val.get(Calendar.YEAR) > 280000000) {
@@ -1254,13 +1254,13 @@ private static Calendar modify(final Calendar val, final int field, final Modify
      * If no parse patterns match, a ParseException is thrown.</p>
      * The parser will be lenient toward the parsed date.
      *
-     * @param str  the date to parse, not null.
+     * @param str  the date to parse, not null
      * @param locale the locale whose date format symbols should be used. If {@code null},
      * the system locale is used (as per {@link #parseDate(String, String...)}).
-     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null.
-     * @return the parsed date.
-     * @throws NullPointerException if the date string or pattern array is null.
-     * @throws ParseException if none of the date patterns were suitable (or there were none).
+     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null
+     * @return the parsed date
+     * @throws NullPointerException if the date string or pattern array is null
+     * @throws ParseException if none of the date patterns were suitable (or there were none)
      * @since 3.2
      */
     public static Date parseDate(final String str, final Locale locale, final String... parsePatterns) throws ParseException {
@@ -1275,11 +1275,11 @@ public static Date parseDate(final String str, final Locale locale, final String
      * If no parse patterns match, a ParseException is thrown.</p>
      * The parser will be lenient toward the parsed date.
      *
-     * @param str  the date to parse, not null.
-     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null.
-     * @return the parsed date.
-     * @throws NullPointerException if the date string or pattern array is null.
-     * @throws ParseException if none of the date patterns were suitable (or there were none).
+     * @param str  the date to parse, not null
+     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null
+     * @return the parsed date
+     * @throws NullPointerException if the date string or pattern array is null
+     * @throws ParseException if none of the date patterns were suitable (or there were none)
      */
     public static Date parseDate(final String str, final String... parsePatterns) throws ParseException {
         return parseDate(str, null, parsePatterns);
@@ -1294,13 +1294,13 @@ public static Date parseDate(final String str, final String... parsePatterns) th
      * If no parse patterns match, a ParseException is thrown.</p>
      * The parser parses strictly - it does not allow for dates such as "February 942, 1996".
      *
-     * @param str  the date to parse, not null.
+     * @param str  the date to parse, not null
      * @param locale the locale whose date format symbols should be used. If {@code null},
      * the system locale is used (as per {@link #parseDateStrictly(String, String...)}).
-     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null.
-     * @return the parsed date.
-     * @throws NullPointerException if the date string or pattern array is null.
-     * @throws ParseException if none of the date patterns were suitable.
+     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null
+     * @return the parsed date
+     * @throws NullPointerException if the date string or pattern array is null
+     * @throws ParseException if none of the date patterns were suitable
      * @since 3.2
      */
     public static Date parseDateStrictly(final String str, final Locale locale, final String... parsePatterns) throws ParseException {
@@ -1315,11 +1315,11 @@ public static Date parseDateStrictly(final String str, final Locale locale, fina
      * If no parse patterns match, a ParseException is thrown.</p>
      * The parser parses strictly - it does not allow for dates such as "February 942, 1996".
      *
-     * @param str  the date to parse, not null.
-     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null.
-     * @return the parsed date.
-     * @throws NullPointerException if the date string or pattern array is null.
-     * @throws ParseException if none of the date patterns were suitable.
+     * @param str  the date to parse, not null
+     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null
+     * @return the parsed date
+     * @throws NullPointerException if the date string or pattern array is null
+     * @throws ParseException if none of the date patterns were suitable
      * @since 2.5
      */
     public static Date parseDateStrictly(final String str, final String... parsePatterns) throws ParseException {
@@ -1333,14 +1333,14 @@ public static Date parseDateStrictly(final String str, final String... parsePatt
      * A parse is only deemed successful if it parses the whole of the input string.
      * If no parse patterns match, a ParseException is thrown.</p>
      *
-     * @param dateStr  the date to parse, not null.
+     * @param dateStr  the date to parse, not null
      * @param locale the locale to use when interpreting the pattern, can be null in which
-     * case the default system locale is used.
-     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null.
-     * @param lenient Specify whether or not date/time parsing is to be lenient.
-     * @return the parsed date.
-     * @throws NullPointerException if the date string or pattern array is null.
-     * @throws ParseException if none of the date patterns were suitable.
+     * case the default system locale is used
+     * @param parsePatterns  the date format patterns to use, see SimpleDateFormat, not null
+     * @param lenient specify whether or not date/time parsing is to be lenient
+     * @return the parsed date
+     * @throws NullPointerException if the date string or pattern array is null
+     * @throws ParseException if none of the date patterns were suitable
      * @see java.util.Calendar#isLenient()
      */
     private static Date parseDateWithLeniency(final String dateStr, final Locale locale, final String[] parsePatterns,
@@ -1390,11 +1390,11 @@ private static Date parseDateWithLeniency(final String dateStr, final Locale loc
      * <li>March 30, 2003 02:40 rounds to March 30, 2003 04:00</li>
      * </ul>
      *
-     * @param calendar  the date to work with, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different rounded date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param calendar  the date to work with, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different rounded date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws NullPointerException if the date is {@code null}
      */
     public static Calendar round(final Calendar calendar, final int field) {
         Objects.requireNonNull(calendar, "calendar");
@@ -1422,11 +1422,11 @@ public static Calendar round(final Calendar calendar, final int field) {
      * <li>March 30, 2003 02:40 rounds to March 30, 2003 04:00</li>
      * </ul>
      *
-     * @param date  the date to work with, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different rounded date, not null.
-     * @throws NullPointerException if the date is null.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param date  the date to work with, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different rounded date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws NullPointerException if the date is null
      */
     public static Date round(final Date date, final int field) {
         return modify(toCalendar(date), field, ModifyType.ROUND).getTime();
@@ -1453,12 +1453,12 @@ public static Date round(final Date date, final int field) {
      * <li>March 30, 2003 02:40 rounds to March 30, 2003 04:00</li>
      * </ul>
      *
-     * @param date  the date to work with, either {@link Date} or {@link Calendar}, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different rounded date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param date  the date to work with, either {@link Date} or {@link Calendar}, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different rounded date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}
+     * @throws NullPointerException if the date is {@code null}
      */
     public static Date round(final Object date, final int field) {
         Objects.requireNonNull(date, "date");
@@ -1476,11 +1476,11 @@ public static Date round(final Object date, final int field) {
      * This does not use a lenient calendar.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param calendarField  the {@link Calendar} field to set the amount to.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param calendarField  the {@link Calendar} field to set the amount to
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     private static Date set(final Date date, final int calendarField, final int amount) {
@@ -1497,12 +1497,12 @@ private static Date set(final Date date, final int calendarField, final int amou
      * Sets the day of month field to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
      * @throws IllegalArgumentException if {@code amount} is not in the range
-     *  {@code 1 <= amount <= 31}.
+     *  {@code 1 <= amount <= 31}
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     public static Date setDays(final Date date, final int amount) {
@@ -1514,12 +1514,12 @@ public static Date setDays(final Date date, final int amount) {
      * from  0-23.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
      * @throws IllegalArgumentException if {@code amount} is not in the range
-     *  {@code 0 <= amount <= 23}.
+     *  {@code 0 <= amount <= 23}
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     public static Date setHours(final Date date, final int amount) {
@@ -1530,12 +1530,12 @@ public static Date setHours(final Date date, final int amount) {
      * Sets the milliseconds field to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
      * @throws IllegalArgumentException if {@code amount} is not in the range
-     *  {@code 0 <= amount <= 999}.
+     *  {@code 0 <= amount <= 999}
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     public static Date setMilliseconds(final Date date, final int amount) {
@@ -1546,12 +1546,12 @@ public static Date setMilliseconds(final Date date, final int amount) {
      * Sets the minute field to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
      * @throws IllegalArgumentException if {@code amount} is not in the range
-     *  {@code 0 <= amount <= 59}.
+     *  {@code 0 <= amount <= 59}
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     public static Date setMinutes(final Date date, final int amount) {
@@ -1562,12 +1562,12 @@ public static Date setMinutes(final Date date, final int amount) {
      * Sets the months field to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
      * @throws IllegalArgumentException if {@code amount} is not in the range
-     *  {@code 0 <= amount <= 11}.
+     *  {@code 0 <= amount <= 11}
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     public static Date setMonths(final Date date, final int amount) {
@@ -1578,12 +1578,12 @@ public static Date setMonths(final Date date, final int amount) {
      * Sets the seconds field to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
      * @throws IllegalArgumentException if {@code amount} is not in the range
-     *  {@code 0 <= amount <= 59}.
+     *  {@code 0 <= amount <= 59}
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     public static Date setSeconds(final Date date, final int amount) {
@@ -1594,10 +1594,10 @@ public static Date setSeconds(final Date date, final int amount) {
      * Sets the years field to a date returning a new object.
      * The original {@link Date} is unchanged.
      *
-     * @param date  the date, not null.
-     * @param amount the amount to set.
-     * @return a new {@link Date} set with the specified value.
-     * @throws NullPointerException if the date is null.
+     * @param date  the date, not null
+     * @param amount the amount to set
+     * @return a new {@link Date} set with the specified value
+     * @throws NullPointerException if the date is null
      * @since 2.4
      */
     public static Date setYears(final Date date, final int amount) {
@@ -1607,9 +1607,9 @@ public static Date setYears(final Date date, final int amount) {
     /**
      * Converts a {@link Date} into a {@link Calendar}.
      *
-     * @param date the date to convert to a Calendar.
-     * @return the created Calendar.
-     * @throws NullPointerException if null is passed in.
+     * @param date the date to convert to a Calendar
+     * @return the created Calendar
+     * @throws NullPointerException if null is passed in
      * @since 3.0
      */
     public static Calendar toCalendar(final Date date) {
@@ -1621,10 +1621,10 @@ public static Calendar toCalendar(final Date date) {
     /**
      * Converts a {@link Date} of a given {@link TimeZone} into a {@link Calendar}.
      *
-     * @param date the date to convert to a Calendar.
-     * @param tz the time zone of the {@code date}.
-     * @return the created Calendar.
-     * @throws NullPointerException if {@code date} or {@code tz} is null.
+     * @param date the date to convert to a Calendar
+     * @param tz the time zone of the {@code date}
+     * @return the created Calendar
+     * @throws NullPointerException if {@code date} or {@code tz} is null
      */
     public static Calendar toCalendar(final Date date, final TimeZone tz) {
         final Calendar c = Calendar.getInstance(tz);
@@ -1635,8 +1635,8 @@ public static Calendar toCalendar(final Date date, final TimeZone tz) {
     /**
      * Converts a {@link Date} to a {@link LocalDateTime}.
      *
-     * @param date the Date to convert, not null.
-     * @return a new LocalDateTime.
+     * @param date the Date to convert, not null
+     * @return a new LocalDateTime
      * @since 3.19.0
      */
     public static LocalDateTime toLocalDateTime(final Date date) {
@@ -1646,9 +1646,9 @@ public static LocalDateTime toLocalDateTime(final Date date) {
     /**
      * Converts a {@link Date} to a {@link LocalDateTime}.
      *
-     * @param date     the Date to convert to a LocalDateTime, not null.
-     * @param timeZone the time zone, null maps to the default time zone.
-     * @return a new LocalDateTime.
+     * @param date     the Date to convert to a LocalDateTime, not null
+     * @param timeZone the time zone, null maps to the default time zone
+     * @return a new LocalDateTime
      * @since 3.19.0
      */
     public static LocalDateTime toLocalDateTime(final Date date, final TimeZone timeZone) {
@@ -1658,8 +1658,8 @@ public static LocalDateTime toLocalDateTime(final Date date, final TimeZone time
     /**
      * Converts a {@link Date} to a {@link OffsetDateTime}.
      *
-     * @param date the Date to convert, not null.
-     * @return a new OffsetDateTime.
+     * @param date the Date to convert, not null
+     * @return a new OffsetDateTime
      * @since 3.19.0
      */
     public static OffsetDateTime toOffsetDateTime(final Date date) {
@@ -1669,9 +1669,9 @@ public static OffsetDateTime toOffsetDateTime(final Date date) {
     /**
      * Converts a {@link Date} to a {@link OffsetDateTime}.
      *
-     * @param date     the Date to convert to a OffsetDateTime, not null.
-     * @param timeZone the time zone, null maps to the default time zone.
-     * @return a new OffsetDateTime.
+     * @param date     the Date to convert to a OffsetDateTime, not null
+     * @param timeZone the time zone, null maps to the default time zone
+     * @return a new OffsetDateTime
      * @since 3.19.0
      */
     public static OffsetDateTime toOffsetDateTime(final Date date, final TimeZone timeZone) {
@@ -1681,8 +1681,8 @@ public static OffsetDateTime toOffsetDateTime(final Date date, final TimeZone ti
     /**
      * Converts a {@link Date} to a {@link ZonedDateTime}.
      *
-     * @param date the Date to convert, not null.
-     * @return a new ZonedDateTime.
+     * @param date the Date to convert, not null
+     * @return a new ZonedDateTime
      * @since 3.19.0
      */
     public static ZonedDateTime toZonedDateTime(final Date date) {
@@ -1692,9 +1692,9 @@ public static ZonedDateTime toZonedDateTime(final Date date) {
     /**
      * Converts a {@link Date} to a {@link ZonedDateTime}.
      *
-     * @param date     the Date to convert to a ZonedDateTime, not null.
-     * @param timeZone the time zone, null maps to the default time zone.
-     * @return a new ZonedDateTime.
+     * @param date     the Date to convert to a ZonedDateTime, not null
+     * @param timeZone the time zone, null maps to the default time zone
+     * @return a new ZonedDateTime
      * @since 3.19.0
      */
     public static ZonedDateTime toZonedDateTime(final Date date, final TimeZone timeZone) {
@@ -1714,11 +1714,11 @@ private static ZoneId toZoneId(final TimeZone timeZone) {
      * 2002 13:00:00.000.  If this was passed with MONTH, it would
      * return 1 Mar 2002 0:00:00.000.</p>
      *
-     * @param date  the date to work with, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different truncated date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param date  the date to work with, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different truncated date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws NullPointerException if the date is {@code null}
      */
     public static Calendar truncate(final Calendar date, final int field) {
         Objects.requireNonNull(date, "date");
@@ -1734,11 +1734,11 @@ public static Calendar truncate(final Calendar date, final int field) {
      * 2002 13:00:00.000.  If this was passed with MONTH, it would
      * return 1 Mar 2002 0:00:00.000.</p>
      *
-     * @param date  the date to work with, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different truncated date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param date  the date to work with, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different truncated date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws NullPointerException if the date is {@code null}
      */
     public static Date truncate(final Date date, final int field) {
         return modify(toCalendar(date), field, ModifyType.TRUNCATE).getTime();
@@ -1753,12 +1753,12 @@ public static Date truncate(final Date date, final int field) {
      * 2002 13:00:00.000.  If this was passed with MONTH, it would
      * return 1 Mar 2002 0:00:00.000.</p>
      *
-     * @param date  the date to work with, either {@link Date} or {@link Calendar}, not null.
-     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}.
-     * @return the different truncated date, not null.
-     * @throws NullPointerException if the date is {@code null}.
-     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}.
-     * @throws ArithmeticException if the year is over 280 million.
+     * @param date  the date to work with, either {@link Date} or {@link Calendar}, not null
+     * @param field  the field from {@link Calendar} or {@code SEMI_MONTH}
+     * @return the different truncated date, not null
+     * @throws ArithmeticException if the year is over 280 million
+     * @throws ClassCastException if the object type is not a {@link Date} or {@link Calendar}
+     * @throws NullPointerException if the date is {@code null}
      */
     public static Date truncate(final Object date, final int field) {
         Objects.requireNonNull(date, "date");
@@ -1775,12 +1775,12 @@ public static Date truncate(final Object date, final int field) {
      * Determines how two calendars compare up to no more than the specified
      * most significant field.
      *
-     * @param cal1 the first calendar, not {@code null}.
-     * @param cal2 the second calendar, not {@code null}.
-     * @param field the field from {@link Calendar}.
+     * @param cal1 the first calendar, not {@code null}
+     * @param cal2 the second calendar, not {@code null}
+     * @param field the field from {@link Calendar}
      * @return a negative integer, zero, or a positive integer as the first
-     * calendar is less than, equal to, or greater than the second.
-     * @throws NullPointerException if any argument is {@code null}.
+     * calendar is less than, equal to, or greater than the second
+     * @throws NullPointerException if any argument is {@code null}
      * @see #truncate(Calendar, int)
      * @see #truncatedCompareTo(Date, Date, int)
      * @since 3.0
@@ -1795,12 +1795,12 @@ public static int truncatedCompareTo(final Calendar cal1, final Calendar cal2, f
      * Determines how two dates compare up to no more than the specified
      * most significant field.
      *
-     * @param date1 the first date, not {@code null}.
-     * @param date2 the second date, not {@code null}.
-     * @param field the field from {@link Calendar}.
+     * @param date1 the first date, not {@code null}
+     * @param date2 the second date, not {@code null}
+     * @param field the field from {@link Calendar}
      * @return a negative integer, zero, or a positive integer as the first
-     * date is less than, equal to, or greater than the second.
-     * @throws NullPointerException if any argument is {@code null}.
+     * date is less than, equal to, or greater than the second
+     * @throws NullPointerException if any argument is {@code null}
      * @see #truncate(Calendar, int)
      * @see #truncatedCompareTo(Date, Date, int)
      * @since 3.0
@@ -1815,11 +1815,11 @@ public static int truncatedCompareTo(final Date date1, final Date date2, final i
      * Determines if two calendars are equal up to no more than the specified
      * most significant field.
      *
-     * @param cal1 the first calendar, not {@code null}.
-     * @param cal2 the second calendar, not {@code null}.
-     * @param field the field from {@link Calendar}.
-     * @return {@code true} if equal; otherwise {@code false}.
-     * @throws NullPointerException if any argument is {@code null}.
+     * @param cal1 the first calendar, not {@code null}
+     * @param cal2 the second calendar, not {@code null}
+     * @param field the field from {@link Calendar}
+     * @return {@code true} if equal; otherwise {@code false}
+     * @throws NullPointerException if any argument is {@code null}
      * @see #truncate(Calendar, int)
      * @see #truncatedEquals(Date, Date, int)
      * @since 3.0
@@ -1832,11 +1832,11 @@ public static boolean truncatedEquals(final Calendar cal1, final Calendar cal2,
      * Determines if two dates are equal up to no more than the specified
      * most significant field.
      *
-     * @param date1 the first date, not {@code null}.
-     * @param date2 the second date, not {@code null}.
-     * @param field the field from {@link Calendar}.
-     * @return {@code true} if equal; otherwise {@code false}.
-     * @throws NullPointerException if any argument is {@code null}.
+     * @param date1 the first date, not {@code null}
+     * @param date2 the second date, not {@code null}
+     * @param field the field from {@link Calendar}
+     * @return {@code true} if equal; otherwise {@code false}
+     * @throws NullPointerException if any argument is {@code null}
      * @see #truncate(Date, int)
      * @see #truncatedEquals(Calendar, Calendar, int)
      * @since 3.0
@@ -1846,7 +1846,7 @@ public static boolean truncatedEquals(final Date date1, final Date date2, final
     }
 
     /**
-     * @param date Date to validate.
+     * @param date date to validate
      * @throws NullPointerException if {@code date == null}
      */
     private static void validateDateNotNull(final Date date) {
diff --git a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
index c89ecc7863d..091a6b9d759 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
@@ -100,7 +100,7 @@ static final class Token {
         private static final Token[] EMPTY_ARRAY = {};
 
         /**
-         * Helper method to determine if a set of tokens contain a value
+         * Helper method to determine if a set of tokens contain a value.
          *
          * @param tokens set to look in
          * @param value to look for
@@ -117,7 +117,7 @@ static boolean containsTokenWithValue(final Token[] tokens, final Object value)
         /**
          * Wraps a token around a value. A value would be something like a 'Y'.
          *
-         * @param value value to wrap, non-null.
+         * @param value value to wrap, non-null
          * @param optional whether the token is optional
          * @param optionalIndex the index of the optional token within the pattern
          */
@@ -132,7 +132,7 @@ static boolean containsTokenWithValue(final Token[] tokens, final Object value)
         /**
          * Supports equality of this Token to another Token.
          *
-         * @param obj2 Object to consider equality of
+         * @param obj2 object to consider equality of
          * @return boolean {@code true} if equal
          */
         @Override
@@ -157,7 +157,7 @@ public boolean equals(final Object obj2) {
         }
 
         /**
-         * Gets the current number of values represented
+         * Gets the current number of values represented.
          *
          * @return int number of values represented
          */
@@ -168,7 +168,7 @@ int getCount() {
         /**
          * Gets the particular value this token represents.
          *
-         * @return Object value, non-null.
+         * @return object value, non-null
          */
         Object getValue() {
             return value;
@@ -179,7 +179,7 @@ Object getValue() {
          * hash code for the token's value. Thus 'TT' and 'TTTT'
          * will have the same hash code.
          *
-         * @return The hash code for the token
+         * @return the hash code for the token
          */
         @Override
         public int hashCode() {
@@ -187,7 +187,7 @@ public int hashCode() {
         }
 
         /**
-         * Adds another one of the value
+         * Adds another one of the value.
          */
         void increment() {
             count++;
@@ -196,7 +196,7 @@ void increment() {
         /**
          * Represents this token as a String.
          *
-         * @return String representation of the token
+         * @return string representation of the token
          */
         @Override
         public String toString() {
@@ -683,7 +683,7 @@ public static String formatPeriodISO(final long startMillis, final long endMilli
     }
 
     /**
-     * Parses a classic date format string into Tokens
+     * Parses a classic date format string into Tokens.
      *
      * @param format  the format to parse, not null
      * @return array of Token[]
diff --git a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
index 547680609cb..7d9e6fe7cc0 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
@@ -48,10 +48,10 @@ public class DurationUtils {
     /**
      * Accepts the function with the duration as a long milliseconds and int nanoseconds.
      *
-     * @param <T> The function exception.
-     * @param consumer Accepting function.
-     * @param duration The duration to pick apart.
-     * @throws T See the function signature.
+     * @param <T> the function exception
+     * @param consumer accepting function
+     * @param duration the duration to pick apart
+     * @throws T see the function signature
      * @see StopWatch
      */
     @SuppressWarnings("boxing") // boxing unavoidable
@@ -65,10 +65,10 @@ public static <T extends Throwable> void accept(final FailableBiConsumer<Long, I
     /**
      * Gets a Duration of unit stored in the system property at the given key.
      *
-     * @param key  The property name.
-     * @param unit The unit that the duration is measured in, not null.
-     * @param def  The default value in the given unit.
-     * @return a Duration of seconds.
+     * @param key  the property name
+     * @param unit the unit that the duration is measured in, not null
+     * @param def  the default value in the given unit
+     * @return a Duration of seconds
      * @since 3.19.0
      */
     public static Duration get(final String key, final TemporalUnit unit, final long def) {
@@ -82,9 +82,9 @@ private static long getLong(final String key, final long def) {
     /**
      * Gets a Duration of milliseconds stored in the system property at the given key.
      *
-     * @param key The property name.
-     * @param def The default value in milliseconds.
-     * @return a Duration of milliseconds.
+     * @param key the property name
+     * @param def the default value in milliseconds
+     * @return a Duration of milliseconds
      * @since 3.19.0
      */
     public static Duration getMillis(final String key, final long def) {
@@ -101,8 +101,8 @@ public static Duration getMillis(final String key, final long def) {
      * Note that is this different from {@link Duration#getNano()} because a duration are seconds and nanoseconds.
      * </p>
      *
-     * @param duration The duration to query.
-     * @return nanoseconds between 0 and 999,999.
+     * @param duration the duration to query
+     * @return nanoseconds between 0 and 999,999
      * @deprecated Use {@link #getNanosOfMilli(Duration)}.
      */
     @Deprecated
@@ -120,8 +120,8 @@ public static int getNanosOfMiili(final Duration duration) {
      * Note that is this different from {@link Duration#getNano()} because a duration are seconds and nanoseconds.
      * </p>
      *
-     * @param duration The duration to query.
-     * @return nanoseconds between 0 and 999,999.
+     * @param duration the duration to query
+     * @return nanoseconds between 0 and 999,999
      * @since 3.13.0
      */
     public static int getNanosOfMilli(final Duration duration) {
@@ -131,9 +131,9 @@ public static int getNanosOfMilli(final Duration duration) {
     /**
      * Gets a Duration of seconds stored in the system property at the given key.
      *
-     * @param key The property name.
-     * @param def The default value in seconds.
-     * @return a Duration of seconds.
+     * @param key the property name
+     * @param def the default value in seconds
+     * @return a Duration of seconds
      * @since 3.19.0
      */
     public static Duration getSeconds(final String key, final long def) {
@@ -144,7 +144,7 @@ public static Duration getSeconds(final String key, final long def) {
      * Tests whether the given Duration is positive (duration &gt; 0).
      *
      * @param duration the value to test
-     * @return whether the given Duration is positive (duration &gt; 0).
+     * @return whether the given Duration is positive (duration &gt; 0)
      */
     public static boolean isPositive(final Duration duration) {
         return !duration.isNegative() && !duration.isZero();
@@ -159,10 +159,10 @@ private static <E extends Throwable> Instant now(final FailableConsumer<Instant,
     /**
      * Runs the lambda and returns the duration of its execution.
      *
-     * @param <E> The type of exception throw by the lambda.
-     * @param consumer What to execute.
-     * @return The Duration of execution.
-     * @throws E thrown by the lambda.
+     * @param <E> the type of exception throw by the lambda
+     * @param consumer what to execute
+     * @return the Duration of execution
+     * @throws E thrown by the lambda
      * @see StopWatch
      * @since 3.13.0
      */
@@ -173,10 +173,10 @@ public static <E extends Throwable> Duration of(final FailableConsumer<Instant,
     /**
      * Runs the lambda and returns the duration of its execution.
      *
-     * @param <E> The type of exception throw by the lambda.
-     * @param runnable What to execute.
-     * @return The Duration of execution.
-     * @throws E thrown by the lambda.
+     * @param <E> the type of exception throw by the lambda
+     * @param runnable what to execute
+     * @return the Duration of execution
+     * @throws E thrown by the lambda
      * @see StopWatch
      * @since 3.13.0
      */
@@ -187,8 +187,8 @@ public static <E extends Throwable> Duration of(final FailableRunnable<E> runnab
     /**
      * Computes the Duration between a start instant and now.
      *
-     * @param startInclusive the start instant, inclusive, not null.
-     * @return a {@link Duration}, not null.
+     * @param startInclusive the start instant, inclusive, not null
+     * @return a {@link Duration}, not null
      * @since 3.13.0
      */
     public static Duration since(final Temporal startInclusive) {
@@ -198,8 +198,8 @@ public static Duration since(final Temporal startInclusive) {
     /**
      * Converts a {@link TimeUnit} to a {@link ChronoUnit}.
      *
-     * @param timeUnit A non-null TimeUnit.
-     * @return The corresponding ChronoUnit.
+     * @param timeUnit a non-null TimeUnit
+     * @return the corresponding ChronoUnit
      */
     static ChronoUnit toChronoUnit(final TimeUnit timeUnit) {
         // TODO when using Java >= 9: Use TimeUnit.toChronoUnit().
@@ -228,7 +228,7 @@ static ChronoUnit toChronoUnit(final TimeUnit timeUnit) {
      *
      * @param amount   the amount of the duration, measured in terms of the unit, positive or negative
      * @param timeUnit the unit that the duration is measured in, must have an exact duration, not null
-     * @return a Duration.
+     * @return a Duration
      */
     public static Duration toDuration(final long amount, final TimeUnit timeUnit) {
         return Duration.of(amount, toChronoUnit(timeUnit));
@@ -246,8 +246,8 @@ public static Duration toDuration(final long amount, final TimeUnit timeUnit) {
      * {@link Integer#MIN_VALUE}.</li>
      * </ul>
      *
-     * @param duration The duration to convert, not null.
-     * @return int milliseconds.
+     * @param duration the duration to convert, not null
+     * @return int milliseconds
      */
     public static int toMillisInt(final Duration duration) {
         Objects.requireNonNull(duration, "duration");
@@ -258,8 +258,8 @@ public static int toMillisInt(final Duration duration) {
     /**
      * Returns the given non-null value or {@link Duration#ZERO} if null.
      *
-     * @param duration The duration to test.
-     * @return The given duration or {@link Duration#ZERO}.
+     * @param duration the duration to test
+     * @return the given duration or {@link Duration#ZERO}
      */
     public static Duration zeroIfNull(final Duration duration) {
         return ObjectUtils.getIfNull(duration, Duration.ZERO);
diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java b/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
index 5a1434e90dd..0206bb4ae41 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
@@ -123,9 +123,9 @@ static void clear() {
     /**
      * Gets a date formatter instance using the specified style in the default time zone and locale.
      *
-     * @param style date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @return a localized standard date formatter.
-     * @throws IllegalArgumentException if the Locale has no date pattern defined.
+     * @param style date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @return a localized standard date formatter
+     * @throws IllegalArgumentException if the Locale has no date pattern defined
      * @since 2.1
      */
     public static FastDateFormat getDateInstance(final int style) {
@@ -135,10 +135,10 @@ public static FastDateFormat getDateInstance(final int style) {
     /**
      * Gets a date formatter instance using the specified style and locale in the default time zone.
      *
-     * @param style  date style: {@link #FULL}, LO{@link #FULL},{@link #MEDIUM}, or {@link #SHORT}.
-     * @param locale optional locale, overrides system locale.
-     * @return a localized standard date formatter.
-     * @throws IllegalArgumentException if the Locale has no date pattern defined.
+     * @param style  date style: {@link #FULL}, LO{@link #FULL},{@link #MEDIUM}, or {@link #SHORT}
+     * @param locale optional locale, overrides system locale
+     * @return a localized standard date formatter
+     * @throws IllegalArgumentException if the Locale has no date pattern defined
      * @since 2.1
      */
     public static FastDateFormat getDateInstance(final int style, final Locale locale) {
@@ -148,10 +148,10 @@ public static FastDateFormat getDateInstance(final int style, final Locale local
     /**
      * Gets a date formatter instance using the specified style and time zone in the default locale.
      *
-     * @param style    date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeZone optional time zone, overrides time zone of formatted date.
-     * @return a localized standard date formatter.
-     * @throws IllegalArgumentException if the Locale has no date pattern defined.
+     * @param style    date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeZone optional time zone, overrides time zone of formatted date
+     * @return a localized standard date formatter
+     * @throws IllegalArgumentException if the Locale has no date pattern defined
      * @since 2.1
      */
     public static FastDateFormat getDateInstance(final int style, final TimeZone timeZone) {
@@ -161,11 +161,11 @@ public static FastDateFormat getDateInstance(final int style, final TimeZone tim
     /**
      * Gets a date formatter instance using the specified style, time zone and locale.
      *
-     * @param style    date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeZone optional time zone, overrides time zone of formatted date.
-     * @param locale   optional locale, overrides system locale.
-     * @return a localized standard date formatter.
-     * @throws IllegalArgumentException if the Locale has no date pattern defined.
+     * @param style    date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeZone optional time zone, overrides time zone of formatted date
+     * @param locale   optional locale, overrides system locale
+     * @return a localized standard date formatter
+     * @throws IllegalArgumentException if the Locale has no date pattern defined
      */
     public static FastDateFormat getDateInstance(final int style, final TimeZone timeZone, final Locale locale) {
         return CACHE.getDateInstance(style, timeZone, locale);
@@ -174,10 +174,10 @@ public static FastDateFormat getDateInstance(final int style, final TimeZone tim
     /**
      * Gets a date/time formatter instance using the specified style in the default time zone and locale.
      *
-     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      * @since 2.1
      */
     public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle) {
@@ -187,11 +187,11 @@ public static FastDateFormat getDateTimeInstance(final int dateStyle, final int
     /**
      * Gets a date/time formatter instance using the specified style and locale in the default time zone.
      *
-     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param locale    optional locale, overrides system locale.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param locale    optional locale, overrides system locale
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      * @since 2.1
      */
     public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle, final Locale locale) {
@@ -201,11 +201,11 @@ public static FastDateFormat getDateTimeInstance(final int dateStyle, final int
     /**
      * Gets a date/time formatter instance using the specified style and time zone in the default locale.
      *
-     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeZone  optional time zone, overrides time zone of formatted date.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeZone  optional time zone, overrides time zone of formatted date
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      * @since 2.1
      */
     public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle, final TimeZone timeZone) {
@@ -215,12 +215,12 @@ public static FastDateFormat getDateTimeInstance(final int dateStyle, final int
     /**
      * Gets a date/time formatter instance using the specified style, time zone and locale.
      *
-     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeZone  optional time zone, overrides time zone of formatted date.
-     * @param locale    optional locale, overrides system locale.
-     * @return a localized standard date/time formatter.
-     * @throws IllegalArgumentException if the Locale has no date/time pattern defined.
+     * @param dateStyle date style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeStyle time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeZone  optional time zone, overrides time zone of formatted date
+     * @param locale    optional locale, overrides system locale
+     * @return a localized standard date/time formatter
+     * @throws IllegalArgumentException if the Locale has no date/time pattern defined
      */
     public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle, final TimeZone timeZone, final Locale locale) {
         return CACHE.getDateTimeInstance(dateStyle, timeStyle, timeZone, locale);
@@ -229,7 +229,7 @@ public static FastDateFormat getDateTimeInstance(final int dateStyle, final int
     /**
      * Gets a formatter instance using the default pattern in the default locale.
      *
-     * @return a date/time formatter.
+     * @return a date/time formatter
      */
     public static FastDateFormat getInstance() {
         return CACHE.getInstance();
@@ -238,9 +238,9 @@ public static FastDateFormat getInstance() {
     /**
      * Gets a formatter instance using the specified pattern in the default locale and time zone.
      *
-     * @param pattern {@link java.text.SimpleDateFormat} compatible pattern.
-     * @return a pattern based date/time formatter.
-     * @throws IllegalArgumentException if pattern is invalid.
+     * @param pattern {@link java.text.SimpleDateFormat} compatible pattern
+     * @return a pattern based date/time formatter
+     * @throws IllegalArgumentException if pattern is invalid
      */
     public static FastDateFormat getInstance(final String pattern) {
         return CACHE.getInstance(pattern, null, null);
@@ -249,10 +249,10 @@ public static FastDateFormat getInstance(final String pattern) {
     /**
      * Gets a formatter instance using the specified pattern and locale using the default time zone.
      *
-     * @param pattern {@link java.text.SimpleDateFormat} compatible pattern.
-     * @param locale  optional locale, overrides system locale.
-     * @return a pattern based date/time formatter.
-     * @throws IllegalArgumentException if pattern is invalid.
+     * @param pattern {@link java.text.SimpleDateFormat} compatible pattern
+     * @param locale  optional locale, overrides system locale
+     * @return a pattern based date/time formatter
+     * @throws IllegalArgumentException if pattern is invalid
      */
     public static FastDateFormat getInstance(final String pattern, final Locale locale) {
         return CACHE.getInstance(pattern, null, locale);
@@ -261,10 +261,10 @@ public static FastDateFormat getInstance(final String pattern, final Locale loca
     /**
      * Gets a formatter instance using the specified pattern and time zone.
      *
-     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern.
-     * @param timeZone optional time zone, overrides time zone of formatted date.
-     * @return a pattern based date/time formatter.
-     * @throws IllegalArgumentException if pattern is invalid.
+     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern
+     * @param timeZone optional time zone, overrides time zone of formatted date
+     * @return a pattern based date/time formatter
+     * @throws IllegalArgumentException if pattern is invalid
      */
     public static FastDateFormat getInstance(final String pattern, final TimeZone timeZone) {
         return CACHE.getInstance(pattern, timeZone, null);
@@ -273,11 +273,11 @@ public static FastDateFormat getInstance(final String pattern, final TimeZone ti
     /**
      * Gets a formatter instance using the specified pattern, time zone and locale.
      *
-     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern.
-     * @param timeZone optional time zone, overrides time zone of formatted date.
-     * @param locale   optional locale, overrides system locale.
-     * @return a pattern based date/time formatter.
-     * @throws IllegalArgumentException if pattern is invalid or {@code null}.
+     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern
+     * @param timeZone optional time zone, overrides time zone of formatted date
+     * @param locale   optional locale, overrides system locale
+     * @return a pattern based date/time formatter
+     * @throws IllegalArgumentException if pattern is invalid or {@code null}
      */
     public static FastDateFormat getInstance(final String pattern, final TimeZone timeZone, final Locale locale) {
         return CACHE.getInstance(pattern, timeZone, locale);
@@ -286,9 +286,9 @@ public static FastDateFormat getInstance(final String pattern, final TimeZone ti
     /**
      * Gets a time formatter instance using the specified style in the default time zone and locale.
      *
-     * @param style time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @return a localized standard time formatter.
-     * @throws IllegalArgumentException if the Locale has no time pattern defined.
+     * @param style time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @return a localized standard time formatter
+     * @throws IllegalArgumentException if the Locale has no time pattern defined
      * @since 2.1
      */
     public static FastDateFormat getTimeInstance(final int style) {
@@ -298,10 +298,10 @@ public static FastDateFormat getTimeInstance(final int style) {
     /**
      * Gets a time formatter instance using the specified style and locale in the default time zone.
      *
-     * @param style  time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param locale optional locale, overrides system locale.
-     * @return a localized standard time formatter.
-     * @throws IllegalArgumentException if the Locale has no time pattern defined.
+     * @param style  time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param locale optional locale, overrides system locale
+     * @return a localized standard time formatter
+     * @throws IllegalArgumentException if the Locale has no time pattern defined
      * @since 2.1
      */
     public static FastDateFormat getTimeInstance(final int style, final Locale locale) {
@@ -311,10 +311,10 @@ public static FastDateFormat getTimeInstance(final int style, final Locale local
     /**
      * Gets a time formatter instance using the specified style and time zone in the default locale.
      *
-     * @param style    time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeZone optional time zone, overrides time zone of formatted time.
-     * @return a localized standard time formatter.
-     * @throws IllegalArgumentException if the Locale has no time pattern defined.
+     * @param style    time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeZone optional time zone, overrides time zone of formatted time
+     * @return a localized standard time formatter
+     * @throws IllegalArgumentException if the Locale has no time pattern defined
      * @since 2.1
      */
     public static FastDateFormat getTimeInstance(final int style, final TimeZone timeZone) {
@@ -324,11 +324,11 @@ public static FastDateFormat getTimeInstance(final int style, final TimeZone tim
     /**
      * Gets a time formatter instance using the specified style, time zone and locale.
      *
-     * @param style    time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}.
-     * @param timeZone optional time zone, overrides time zone of formatted time.
-     * @param locale   optional locale, overrides system locale.
-     * @return a localized standard time formatter.
-     * @throws IllegalArgumentException if the Locale has no time pattern defined.
+     * @param style    time style: {@link #FULL}, {@link #LONG}, {@link #MEDIUM}, or {@link #SHORT}
+     * @param timeZone optional time zone, overrides time zone of formatted time
+     * @param locale   optional locale, overrides system locale
+     * @return a localized standard time formatter
+     * @throws IllegalArgumentException if the Locale has no time pattern defined
      */
     public static FastDateFormat getTimeInstance(final int style, final TimeZone timeZone, final Locale locale) {
         return CACHE.getTimeInstance(style, timeZone, locale);
@@ -343,10 +343,10 @@ public static FastDateFormat getTimeInstance(final int style, final TimeZone tim
     /**
      * Constructs a new FastDateFormat.
      *
-     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern.
-     * @param timeZone non-null time zone to use.
-     * @param locale   non-null locale to use.
-     * @throws NullPointerException if pattern, timeZone, or locale is null.
+     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern
+     * @param timeZone non-null time zone to use
+     * @param locale   non-null locale to use
+     * @throws NullPointerException if pattern, timeZone, or locale is null
      */
     protected FastDateFormat(final String pattern, final TimeZone timeZone, final Locale locale) {
         this(pattern, timeZone, locale, null);
@@ -355,12 +355,12 @@ protected FastDateFormat(final String pattern, final TimeZone timeZone, final Lo
     /**
      * Constructs a new FastDateFormat.
      *
-     * @param pattern      {@link java.text.SimpleDateFormat} compatible pattern.
-     * @param timeZone     non-null time zone to use.
-     * @param locale       non-null locale to use.
-     * @param centuryStart The start of the 100-year period to use as the "default century" for 2 digit year parsing. If centuryStart is null, defaults to now -
+     * @param pattern      {@link java.text.SimpleDateFormat} compatible pattern
+     * @param timeZone     non-null time zone to use
+     * @param locale       non-null locale to use
+     * @param centuryStart the start of the 100-year period to use as the "default century" for 2 digit year parsing. If centuryStart is null, defaults to now -
      *                     80 years.
-     * @throws NullPointerException if pattern, timeZone, or locale is null.
+     * @throws NullPointerException if pattern, timeZone, or locale is null
      */
     protected FastDateFormat(final String pattern, final TimeZone timeZone, final Locale locale, final Date centuryStart) {
         printer = new FastDatePrinter(pattern, timeZone, locale);
@@ -370,9 +370,9 @@ protected FastDateFormat(final String pattern, final TimeZone timeZone, final Lo
     /**
      * Performs the formatting by applying the rules to the specified calendar.
      *
-     * @param calendar the calendar to format.
-     * @param buf      the buffer to format into.
-     * @return the specified string buffer.
+     * @param calendar the calendar to format
+     * @param buf      the buffer to format into
+     * @return the specified string buffer
      * @deprecated Use {@link #format(Calendar, Appendable)}
      */
     @Deprecated
@@ -383,8 +383,8 @@ protected StringBuffer applyRules(final Calendar calendar, final StringBuffer bu
     /**
      * Compares two objects for equality.
      *
-     * @param obj the object to compare to.
-     * @return {@code true} if equal.
+     * @param obj the object to compare to
+     * @return {@code true} if equal
      */
     @Override
     public boolean equals(final Object obj) {
@@ -399,8 +399,8 @@ public boolean equals(final Object obj) {
     /**
      * Formats a {@link Calendar} object.
      *
-     * @param calendar the calendar to format.
-     * @return the formatted string.
+     * @param calendar the calendar to format
+     * @return the formatted string
      */
     @Override
     public String format(final Calendar calendar) {
@@ -410,9 +410,9 @@ public String format(final Calendar calendar) {
     /**
      * Formats a {@link Calendar} object into the supplied {@link StringBuffer}.
      *
-     * @param calendar the calendar to format.
-     * @param buf      the buffer to format into.
-     * @return the specified string buffer.
+     * @param calendar the calendar to format
+     * @param buf      the buffer to format into
+     * @return the specified string buffer
      * @since 3.5
      */
     @Override
@@ -423,9 +423,9 @@ public <B extends Appendable> B format(final Calendar calendar, final B buf) {
     /**
      * Formats a {@link Calendar} object into the supplied {@link StringBuffer}.
      *
-     * @param calendar the calendar to format.
-     * @param buf      the buffer to format into.
-     * @return the specified string buffer.
+     * @param calendar the calendar to format
+     * @param buf      the buffer to format into
+     * @return the specified string buffer
      * @deprecated Use {{@link #format(Calendar, Appendable)}.
      */
     @Deprecated
@@ -437,8 +437,8 @@ public StringBuffer format(final Calendar calendar, final StringBuffer buf) {
     /**
      * Formats a {@link Date} object using a {@link GregorianCalendar}.
      *
-     * @param date the date to format.
-     * @return the formatted string.
+     * @param date the date to format
+     * @return the formatted string
      */
     @Override
     public String format(final Date date) {
@@ -448,9 +448,9 @@ public String format(final Date date) {
     /**
      * Formats a {@link Date} object into the supplied {@link StringBuffer} using a {@link GregorianCalendar}.
      *
-     * @param date the date to format.
-     * @param buf  the buffer to format into.
-     * @return the specified string buffer.
+     * @param date the date to format
+     * @param buf  the buffer to format into
+     * @return the specified string buffer
      * @since 3.5
      */
     @Override
@@ -461,9 +461,9 @@ public <B extends Appendable> B format(final Date date, final B buf) {
     /**
      * Formats a {@link Date} object into the supplied {@link StringBuffer} using a {@link GregorianCalendar}.
      *
-     * @param date the date to format.
-     * @param buf  the buffer to format into.
-     * @return the specified string buffer.
+     * @param date the date to format
+     * @param buf  the buffer to format into
+     * @return the specified string buffer
      * @deprecated Use {{@link #format(Date, Appendable)}.
      */
     @Deprecated
@@ -475,8 +475,8 @@ public StringBuffer format(final Date date, final StringBuffer buf) {
     /**
      * Formats a millisecond {@code long} value.
      *
-     * @param millis the millisecond value to format.
-     * @return the formatted string.
+     * @param millis the millisecond value to format
+     * @return the formatted string
      * @since 2.1
      */
     @Override
@@ -487,9 +487,9 @@ public String format(final long millis) {
     /**
      * Formats a millisecond {@code long} value into the supplied {@link StringBuffer}.
      *
-     * @param millis the millisecond value to format.
-     * @param buf    the buffer to format into.
-     * @return the specified string buffer.
+     * @param millis the millisecond value to format
+     * @param buf    the buffer to format into
+     * @return the specified string buffer
      * @since 3.5
      */
     @Override
@@ -500,9 +500,9 @@ public <B extends Appendable> B format(final long millis, final B buf) {
     /**
      * Formats a millisecond {@code long} value into the supplied {@link StringBuffer}.
      *
-     * @param millis the millisecond value to format.
-     * @param buf    the buffer to format into.
-     * @return the specified string buffer.
+     * @param millis the millisecond value to format
+     * @param buf    the buffer to format into
+     * @return the specified string buffer
      * @since 2.1
      * @deprecated Use {{@link #format(long, Appendable)}.
      */
@@ -516,10 +516,10 @@ public StringBuffer format(final long millis, final StringBuffer buf) {
      * Formats a {@link Date}, {@link Calendar} or {@link Long} (milliseconds) object. This method is an implementation of
      * {@link Format#format(Object, StringBuffer, FieldPosition)}
      *
-     * @param obj        the object to format.
-     * @param toAppendTo the buffer to append to.
-     * @param pos        the position, ignored.
-     * @return the given buffer.
+     * @param obj        the object to format
+     * @param toAppendTo the buffer to append to
+     * @param pos        the position, ignored
+     * @return the given buffer
      */
     @Override
     public StringBuffer format(final Object obj, final StringBuffer toAppendTo, final FieldPosition pos) {
@@ -529,7 +529,7 @@ public StringBuffer format(final Object obj, final StringBuffer toAppendTo, fina
     /**
      * Gets the locale used by this formatter.
      *
-     * @return the locale.
+     * @return the locale
      */
     @Override
     public Locale getLocale() {
@@ -543,7 +543,7 @@ public Locale getLocale() {
      * The actual formatted length will almost always be less than or equal to this amount.
      * </p>
      *
-     * @return the maximum formatted length.
+     * @return the maximum formatted length
      */
     public int getMaxLengthEstimate() {
         return printer.getMaxLengthEstimate();
@@ -552,7 +552,7 @@ public int getMaxLengthEstimate() {
     /**
      * Gets the pattern used by this formatter.
      *
-     * @return the pattern, {@link java.text.SimpleDateFormat} compatible.
+     * @return the pattern, {@link java.text.SimpleDateFormat} compatible
      */
     @Override
     public String getPattern() {
@@ -566,7 +566,7 @@ public String getPattern() {
      * This zone is always used for {@link Date} formatting.
      * </p>
      *
-     * @return the time zone.
+     * @return the time zone
      */
     @Override
     public TimeZone getTimeZone() {
@@ -576,7 +576,7 @@ public TimeZone getTimeZone() {
     /**
      * Returns a hash code compatible with equals.
      *
-     * @return a hash code compatible with equals.
+     * @return a hash code compatible with equals
      */
     @Override
     public int hashCode() {
@@ -626,7 +626,7 @@ public Object parseObject(final String source, final ParsePosition pos) {
     /**
      * Gets a debugging string version of this formatter.
      *
-     * @return a debug string.
+     * @return a debug string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
index 02da1a4a0e9..57c8bab0ddd 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
@@ -81,13 +81,13 @@
  * Timing tests indicate this class is as about as fast as SimpleDateFormat in single thread applications and about 25% faster in multi-thread applications.
  * </p>
  *
- * @since 3.2
  * @see FastDatePrinter
+ * @since 3.2
  */
 public class FastDateParser implements DateParser, Serializable {
 
     /**
-     * A strategy that handles a text field in the parsing pattern
+     * A strategy that handles a text field in the parsing pattern.
      */
     private static final class CaseInsensitiveTextStrategy extends PatternStrategy {
 
@@ -96,11 +96,11 @@ private static final class CaseInsensitiveTextStrategy extends PatternStrategy {
         private final Map<String, Integer> lKeyValues;
 
         /**
-         * Constructs a Strategy that parses a Text field
+         * Constructs a Strategy that parses a Text field.
          *
-         * @param field            The Calendar field
-         * @param definingCalendar The Calendar to use
-         * @param locale           The Locale to use
+         * @param field            the Calendar field
+         * @param definingCalendar the Calendar to use
+         * @param locale           the Locale to use
          */
         CaseInsensitiveTextStrategy(final int field, final Calendar definingCalendar, final Locale locale) {
             this.field = field;
@@ -143,16 +143,16 @@ public String toString() {
     }
 
     /**
-     * A strategy that copies the static or quoted field in the parsing pattern
+     * A strategy that copies the static or quoted field in the parsing pattern.
      */
     private static final class CopyQuotedStrategy extends Strategy {
 
         private final String formatField;
 
         /**
-         * Constructs a Strategy that ensures the formatField has literal text
+         * Constructs a Strategy that ensures the formatField has literal text.
          *
-         * @param formatField The literal text to match
+         * @param formatField the literal text to match
          */
         CopyQuotedStrategy(final String formatField) {
             this.formatField = formatField;
@@ -206,7 +206,7 @@ private static final class ISO8601TimeZoneStrategy extends PatternStrategy {
         /**
          * Factory method for ISO8601TimeZoneStrategies.
          *
-         * @param tokenLen a token indicating the length of the TimeZone String to be formatted.
+         * @param tokenLen a token indicating the length of the TimeZone String to be formatted
          * @return a ISO8601TimeZoneStrategy that can format TimeZone String of length {@code tokenLen}. If no such strategy exists, an IllegalArgumentException
          *         will be thrown.
          */
@@ -224,9 +224,9 @@ static Strategy getStrategy(final int tokenLen) {
         }
 
         /**
-         * Constructs a Strategy that parses a TimeZone
+         * Constructs a Strategy that parses a TimeZone.
          *
-         * @param pattern The Pattern
+         * @param pattern the Pattern
          */
         ISO8601TimeZoneStrategy(final String pattern) {
             createPattern(pattern);
@@ -242,16 +242,16 @@ void setCalendar(final FastDateParser parser, final Calendar calendar, final Str
     }
 
     /**
-     * A strategy that handles a number field in the parsing pattern
+     * A strategy that handles a number field in the parsing pattern.
      */
     private static class NumberStrategy extends Strategy {
 
         private final int field;
 
         /**
-         * Constructs a Strategy that parses a Number field
+         * Constructs a Strategy that parses a Number field.
          *
-         * @param field The Calendar field
+         * @param field the Calendar field
          */
         NumberStrategy(final int field) {
             this.field = field;
@@ -266,11 +266,11 @@ boolean isNumber() {
         }
 
         /**
-         * Make any modifications to parsed integer
+         * Make any modifications to parsed integer.
          *
-         * @param parser The parser
-         * @param iValue The parsed integer
-         * @return The modified value
+         * @param parser the parser
+         * @param iValue the parsed integer
+         * @return the modified value
          */
         int modify(final FastDateParser parser, final int iValue) {
             return iValue;
@@ -328,7 +328,7 @@ public String toString() {
     }
 
     /**
-     * A strategy to parse a single field from the parsing pattern
+     * A strategy to parse a single field from the parsing pattern.
      */
     private abstract static class PatternStrategy extends Strategy {
 
@@ -379,7 +379,7 @@ public String toString() {
     }
 
     /**
-     * A strategy to parse a single field from the parsing pattern
+     * A strategy to parse a single field from the parsing pattern.
      */
     private abstract static class Strategy {
 
@@ -396,7 +396,7 @@ boolean isNumber() {
     }
 
     /**
-     * Holds strategy and field width
+     * Holds strategy and field width.
      */
     private static final class StrategyAndWidth {
 
@@ -424,7 +424,7 @@ public String toString() {
     }
 
     /**
-     * Parse format into Strategies
+     * Parse format into Strategies.
      */
     private final class StrategyParser {
         private final Calendar definingCalendar;
@@ -481,7 +481,7 @@ private StrategyAndWidth literal() {
     }
 
     /**
-     * A strategy that handles a time zone field in the parsing pattern
+     * A strategy that handles a time zone field in the parsing pattern.
      */
     static class TimeZoneStrategy extends PatternStrategy {
 
@@ -518,8 +518,8 @@ public String toString() {
          * This method is package private only for testing.
          * </p>
          *
-         * @param tzId the ID to test.
-         * @return Whether to skip the given time zone ID.
+         * @param tzId the ID to test
+         * @return whether to skip the given time zone ID
          */
         static boolean skipTimeZone(final String tzId) {
             return tzId.equalsIgnoreCase(TimeZones.GMT_ID);
@@ -536,7 +536,7 @@ static boolean skipTimeZone(final String tzId) {
         /**
          * Constructs a Strategy that parses a TimeZone.
          *
-         * @param locale The Locale.
+         * @param locale the Locale
          */
         TimeZoneStrategy(final Locale locale) {
             this.locale = LocaleUtils.toLocale(locale);
@@ -644,7 +644,7 @@ public String toString() {
     static final Locale JAPANESE_IMPERIAL = new Locale("ja", "JP", "JP");
 
     /**
-     * comparator used to sort regex alternatives. Alternatives should be ordered longer first, and shorter last. ('february' before 'feb'). All entries must be
+     * Comparator used to sort regex alternatives. Alternatives should be ordered longer first, and shorter last. ('february' before 'feb'). All entries must be
      * lower-case by locale.
      */
     private static final Comparator<String> LONGER_FIRST_LOWERCASE = Comparator.reverseOrder();
@@ -716,13 +716,13 @@ int modify(final FastDateParser parser, final int iValue) {
     private static final Strategy MILLISECOND_STRATEGY = new NumberStrategy(Calendar.MILLISECOND);
 
     /**
-     * Gets the short and long values displayed for a field
+     * Gets the short and long values displayed for a field.
      *
-     * @param calendar The calendar to obtain the short and long values
-     * @param locale   The locale of display names
-     * @param field    The field of interest
-     * @param regex    The regular expression to build
-     * @return The map of string display names to field values
+     * @param calendar the calendar to obtain the short and long values
+     * @param locale   the locale of display names
+     * @param field    the field of interest
+     * @param regex    the regular expression to build
+     * @return the map of string display names to field values
      */
     private static Map<String, Integer> appendDisplayNames(final Calendar calendar, final Locale locale, final int field, final StringBuilder regex) {
         Objects.requireNonNull(calendar, "calendar");
@@ -748,9 +748,9 @@ static void clear() {
     }
 
     /**
-     * Gets a cache of Strategies for a particular field
+     * Gets a cache of Strategies for a particular field.
      *
-     * @param field The Calendar field
+     * @param field the Calendar field
      * @return a cache of Locale to Strategy
      */
     private static ConcurrentMap<Locale, Strategy> getCache(final int field) {
@@ -832,8 +832,8 @@ protected FastDateParser(final String pattern, final TimeZone timeZone, final Lo
      *
      * @param pattern      non-null {@link java.text.SimpleDateFormat} compatible pattern
      * @param timeZone     non-null time zone to use
-     * @param locale       locale, null maps to the default Locale.
-     * @param centuryStart The start of the century for 2 digit year parsing
+     * @param locale       locale, null maps to the default Locale
+     * @param centuryStart the start of the century for 2 digit year parsing
      * @since 3.5
      */
     protected FastDateParser(final String pattern, final TimeZone timeZone, final Locale locale, final Date centuryStart) {
@@ -858,10 +858,10 @@ protected FastDateParser(final String pattern, final TimeZone timeZone, final Lo
     }
 
     /**
-     * Adjusts dates to be within appropriate century
+     * Adjusts dates to be within appropriate century.
      *
-     * @param twoDigitYear The year to adjust
-     * @return A value between centuryStart(inclusive) to centuryStart+100(exclusive)
+     * @param twoDigitYear the year to adjust
+     * @return a value between centuryStart(inclusive) to centuryStart+100(exclusive)
      */
     private int adjustYear(final int twoDigitYear) {
         final int trial = century + twoDigitYear;
@@ -894,10 +894,10 @@ public Locale getLocale() {
     }
 
     /**
-     * Constructs a Strategy that parses a Text field
+     * Constructs a Strategy that parses a Text field.
      *
-     * @param field            The Calendar field
-     * @param definingCalendar The calendar to obtain the short and long values
+     * @param field            the Calendar field
+     * @param definingCalendar the calendar to obtain the short and long values
      * @return a TextStrategy for the field and Locale
      */
     private Strategy getLocaleSpecificStrategy(final int field, final Calendar definingCalendar) {
@@ -916,12 +916,12 @@ public String getPattern() {
     }
 
     /**
-     * Gets a Strategy given a field from a SimpleDateFormat pattern
+     * Gets a Strategy given a field from a SimpleDateFormat pattern.
      *
-     * @param f                A sub-sequence of the SimpleDateFormat pattern
+     * @param f                a sub-sequence of the SimpleDateFormat pattern
      * @param width            formatting width
-     * @param definingCalendar The calendar to obtain the short and long values
-     * @return The Strategy that will handle parsing for the field
+     * @param definingCalendar the calendar to obtain the short and long values
+     * @return the Strategy that will handle parsing for the field
      */
     private Strategy getStrategy(final char f, final int width, final Calendar definingCalendar) {
         switch (f) {
@@ -1059,11 +1059,11 @@ public Date parse(final String source, final ParsePosition pos) {
      * indicate how much of the source text was consumed. Not all source text needs to be consumed. Upon parse failure, ParsePosition error index is updated to
      * the offset of the source text which does not match the supplied format.
      *
-     * @param source   The text to parse.
-     * @param pos      On input, the position in the source to start parsing, on output, updated position.
-     * @param calendar The calendar into which to set parsed fields.
+     * @param source   the text to parse
+     * @param pos      on input, the position in the source to start parsing, on output, updated position
+     * @param calendar the calendar into which to set parsed fields
      * @return true, if source has been parsed (pos parsePosition is updated); otherwise false (and pos errorIndex is updated)
-     * @throws IllegalArgumentException when Calendar has been set to be not lenient, and a parsed field is out of range.
+     * @throws IllegalArgumentException when Calendar has been set to be not lenient, and a parsed field is out of range
      */
     @Override
     public boolean parse(final String source, final ParsePosition pos, final Calendar calendar) {
@@ -1101,9 +1101,9 @@ public Object parseObject(final String source, final ParsePosition pos) {
     /**
      * Creates the object after serialization. This implementation reinitializes the transient properties.
      *
-     * @param in ObjectInputStream from which the object is being deserialized.
-     * @throws IOException            if there is an IO issue.
-     * @throws ClassNotFoundException if a class cannot be found.
+     * @param in ObjectInputStream from which the object is being deserialized
+     * @throws ClassNotFoundException if a class cannot be found
+     * @throws IOException            if there is an IO issue
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
@@ -1124,7 +1124,7 @@ public String toString() {
     /**
      * Converts all state of this instance to a String handy for debugging.
      *
-     * @return a string.
+     * @return a string
      * @since 3.12.0
      */
     public String toStringAll() {
diff --git a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
index 6063e8aafb2..32216ade22a 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
@@ -78,8 +78,8 @@
  * 'YYY' will be formatted as '2003', while it was '03' in former Java
  * versions. FastDatePrinter implements the behavior of Java 7.</p>
  *
- * @since 3.2
  * @see FastDateParser
+ * @since 3.2
  */
 public class FastDatePrinter implements DatePrinter, Serializable {
     // A lot of the speed in this class comes from caching, but some comes
@@ -170,7 +170,7 @@ private static final class Iso8601_Rule implements Rule {
         /**
          * Factory method for Iso8601_Rules.
          *
-         * @param tokenLen a token indicating the length of the TimeZone String to be formatted.
+         * @param tokenLen a token indicating the length of the TimeZone String to be formatted
          * @return an Iso8601_Rule that can format TimeZone String of length {@code tokenLen}. If no such
          *          rule exists, an IllegalArgumentException will be thrown.
          */
@@ -192,7 +192,7 @@ static Iso8601_Rule getRule(final int tokenLen) {
         /**
          * Constructs an instance of {@code Iso8601_Rule} with the specified properties.
          *
-         * @param length The number of characters in output (unless Z is output).
+         * @param length the number of characters in output (unless Z is output)
          */
         Iso8601_Rule(final int length) {
             this.length = length;
@@ -248,9 +248,9 @@ private interface NumberRule extends Rule {
         /**
          * Appends the specified value to the output buffer based on the rule implementation.
          *
-         * @param buffer the output buffer.
-         * @param value the value to be appended.
-         * @throws IOException if an I/O error occurs.
+         * @param buffer the output buffer
+         * @param value the value to be appended
+         * @throws IOException if an I/O error occurs
          */
         void appendTo(Appendable buffer, int value) throws IOException;
     }
@@ -266,8 +266,8 @@ private static final class PaddedNumberField implements NumberRule {
         /**
          * Constructs an instance of {@link PaddedNumberField}.
          *
-         * @param field the field.
-         * @param size size of the output field.
+         * @param field the field
+         * @param size size of the output field
          */
         PaddedNumberField(final int field, final int size) {
             if (size < 3) {
@@ -312,16 +312,16 @@ private interface Rule {
         /**
          * Appends the value of the specified calendar to the output buffer based on the rule implementation.
          *
-         * @param buf the output buffer.
-         * @param calendar calendar to be appended.
-         * @throws IOException if an I/O error occurs.
+         * @param buf the output buffer
+         * @param calendar calendar to be appended
+         * @throws IOException if an I/O error occurs
          */
         void appendTo(Appendable buf, Calendar calendar) throws IOException;
 
         /**
          * Returns the estimated length of the result.
          *
-         * @return the estimated length of the result.
+         * @return the estimated length of the result
          */
         int estimateLength();
     }
@@ -336,7 +336,7 @@ private static final class StringLiteral implements Rule {
          * Constructs a new instance of {@link StringLiteral}
          * to hold the specified value.
          *
-         * @param value the string literal.
+         * @param value the string literal
          */
         StringLiteral(final String value) {
             this.value = value;
@@ -370,8 +370,8 @@ private static final class TextField implements Rule {
          * Constructs an instance of {@link TextField}
          * with the specified field and values.
          *
-         * @param field the field.
-         * @param values the field values.
+         * @param field the field
+         * @param values the field values
          */
         TextField(final int field, final String[] values) {
             this.field = field;
@@ -413,10 +413,10 @@ private static final class TimeZoneDisplayKey {
         /**
          * Constructs an instance of {@link TimeZoneDisplayKey} with the specified properties.
          *
-         * @param timeZone the time zone.
-         * @param daylight adjust the style for daylight saving time if {@code true}.
-         * @param style the time zone style.
-         * @param locale the time zone locale.
+         * @param timeZone the time zone
+         * @param daylight adjust the style for daylight saving time if {@code true}
+         * @param style the time zone style
+         * @param locale the time zone locale
          */
         TimeZoneDisplayKey(final TimeZone timeZone,
                            final boolean daylight, final int style, final Locale locale) {
@@ -468,9 +468,9 @@ private static final class TimeZoneNameRule implements Rule {
         /**
          * Constructs an instance of {@link TimeZoneNameRule} with the specified properties.
          *
-         * @param timeZone the time zone.
-         * @param locale the locale.
-         * @param style the style.
+         * @param timeZone the time zone
+         * @param locale the locale
+         * @param style the style
          */
         TimeZoneNameRule(final TimeZone timeZone, final Locale locale, final int style) {
             this.locale = LocaleUtils.toLocale(locale);
@@ -514,7 +514,7 @@ private static final class TimeZoneNumberRule implements Rule {
         /**
          * Constructs an instance of {@link TimeZoneNumberRule} with the specified properties.
          *
-         * @param colon add colon between HH and MM in the output if {@code true}.
+         * @param colon add colon between HH and MM in the output if {@code true}
          */
         TimeZoneNumberRule(final boolean colon) {
             this.colon = colon;
@@ -565,7 +565,7 @@ private static final class TwelveHourField implements NumberRule {
          * Constructs an instance of {@link TwelveHourField} with the specified
          * {@link NumberRule}.
          *
-         * @param rule the rule.
+         * @param rule the rule
          */
         TwelveHourField(final NumberRule rule) {
             this.rule = rule;
@@ -610,7 +610,7 @@ private static final class TwentyFourHourField implements NumberRule {
          * Constructs an instance of {@link TwentyFourHourField} with the specified
          * {@link NumberRule}.
          *
-         * @param rule the rule.
+         * @param rule the rule
          */
         TwentyFourHourField(final NumberRule rule) {
             this.rule = rule;
@@ -813,7 +813,7 @@ private static final class UnpaddedNumberField implements NumberRule {
         /**
          * Constructs an instance of {@link UnpaddedNumberField} with the specified field.
          *
-         * @param field the field.
+         * @param field the field
          */
         UnpaddedNumberField(final int field) {
             this.field = field;
@@ -913,9 +913,9 @@ public int estimateLength() {
     /**
      * Appends two digits to the given buffer.
      *
-     * @param buffer the buffer to append to.
-     * @param value the value to append digits from.
-     * @throws IOException If an I/O error occurs.
+     * @param buffer the buffer to append to
+     * @param value the value to append digits from
+     * @throws IOException if an I/O error occurs
      */
     private static void appendDigits(final Appendable buffer, final int value) throws IOException {
         buffer.append((char) (value / 10 + '0'));
@@ -925,10 +925,10 @@ private static void appendDigits(final Appendable buffer, final int value) throw
     /**
      * Appends all digits to the given buffer.
      *
-     * @param buffer the buffer to append to.
-     * @param value the value to append digits from.
-     * @param minFieldWidth Minimum field width.
-     * @throws IOException If an I/O error occurs.
+     * @param buffer the buffer to append to
+     * @param value the value to append digits from
+     * @param minFieldWidth minimum field width
+     * @throws IOException if an I/O error occurs
      */
     private static void appendFullDigits(final Appendable buffer, int value, int minFieldWidth) throws IOException {
         // specialized paths for 1 to 4 digits -> avoid the memory allocation from the temporary work array
@@ -1006,11 +1006,11 @@ static void clear() {
     /**
      * Gets the time zone display name, using a cache for performance.
      *
-     * @param tz  the zone to query.
-     * @param daylight  true if daylight savings.
-     * @param style  the style to use {@link TimeZone#LONG} or {@link TimeZone#SHORT}.
-     * @param locale  the locale to use.
-     * @return the textual name of the time zone.
+     * @param tz  the zone to query
+     * @param daylight  true if daylight savings
+     * @param style  the style to use {@link TimeZone#LONG} or {@link TimeZone#SHORT}
+     * @param locale  the locale to use
+     * @return the textual name of the time zone
      */
     static String getTimeZoneDisplay(final TimeZone tz, final boolean daylight, final int style, final Locale locale) {
         final TimeZoneDisplayKey key = new TimeZoneDisplayKey(tz, daylight, style, locale);
@@ -1048,10 +1048,10 @@ static String getTimeZoneDisplay(final TimeZone tz, final boolean daylight, fina
      * Use {@link FastDateFormat#getInstance(String, TimeZone, Locale)}  or another variation of the
      * factory methods of {@link FastDateFormat} to get a cached FastDatePrinter instance.
      *
-     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern.
-     * @param timeZone  non-null time zone to use.
-     * @param locale  non-null locale to use.
-     * @throws NullPointerException if pattern, timeZone, or locale is null.
+     * @param pattern  {@link java.text.SimpleDateFormat} compatible pattern
+     * @param timeZone  non-null time zone to use
+     * @param locale  non-null locale to use
+     * @throws NullPointerException if pattern, timeZone, or locale is null
      */
     protected FastDatePrinter(final String pattern, final TimeZone timeZone, final Locale locale) {
         this.pattern = pattern;
@@ -1064,10 +1064,10 @@ protected FastDatePrinter(final String pattern, final TimeZone timeZone, final L
      * Performs the formatting by applying the rules to the
      * specified calendar.
      *
-     * @param calendar  the calendar to format.
-     * @param buf  the buffer to format into.
-     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer.
-     * @return the specified string buffer.
+     * @param calendar  the calendar to format
+     * @param buf  the buffer to format into
+     * @param <B> the Appendable class type, usually StringBuilder or StringBuffer
+     * @return the specified string buffer
      */
     private <B extends Appendable> B applyRules(final Calendar calendar, final B buf) {
         try {
@@ -1084,9 +1084,9 @@ private <B extends Appendable> B applyRules(final Calendar calendar, final B buf
      * Performs the formatting by applying the rules to the
      * specified calendar.
      *
-     * @param calendar the calendar to format.
-     * @param buf the buffer to format into.
-     * @return the specified string buffer.
+     * @param calendar the calendar to format
+     * @param buf the buffer to format into
+     * @return the specified string buffer
      * @deprecated Use {@link #format(Calendar)} or {@link #format(Calendar, Appendable)}
      */
     @Deprecated
@@ -1097,8 +1097,8 @@ protected StringBuffer applyRules(final Calendar calendar, final StringBuffer bu
     /**
      * Creates a String representation of the given Calendar by applying the rules of this printer to it.
      *
-     * @param c the Calendar to apply the rules to.
-     * @return a String representation of the given Calendar.
+     * @param c the Calendar to apply the rules to
+     * @return a String representation of the given Calendar
      */
     private String applyRulesToString(final Calendar c) {
         return applyRules(c, new StringBuilder(maxLengthEstimate)).toString();
@@ -1107,8 +1107,8 @@ private String applyRulesToString(final Calendar c) {
     /**
      * Compares two objects for equality.
      *
-     * @param obj  the object to compare to.
-     * @return {@code true} if equal.
+     * @param obj  the object to compare to
+     * @return {@code true} if equal
      */
     @Override
     public boolean equals(final Object obj) {
@@ -1216,8 +1216,8 @@ public StringBuffer format(final long millis, final StringBuffer buf) {
      * Formats a {@link Date}, {@link Calendar} or
      * {@link Long} (milliseconds) object.
      *
-     * @param obj  the object to format.
-     * @return The formatted value.
+     * @param obj  the object to format
+     * @return the formatted value
      * @since 3.5
      */
     String format(final Object obj) {
@@ -1237,10 +1237,10 @@ String format(final Object obj) {
      * Formats a {@link Date}, {@link Calendar} or
      * {@link Long} (milliseconds) object.
      *
-     * @param obj  the object to format.
-     * @param toAppendTo  the buffer to append to.
-     * @param pos  the position; ignored.
-     * @return the buffer passed in.
+     * @param obj  the object to format
+     * @param toAppendTo  the buffer to append to
+     * @param pos  the position; ignored
+     * @return the buffer passed in
      * @deprecated Use {{@link #format(Date)}, {{@link #format(Calendar)}, {{@link #format(long)}.
      */
     @Deprecated
@@ -1273,7 +1273,7 @@ public Locale getLocale() {
      * <p>The actual formatted length will almost always be less than or
      * equal to this amount.</p>
      *
-     * @return the maximum formatted length.
+     * @return the maximum formatted length
      */
     public int getMaxLengthEstimate() {
         return maxLengthEstimate;
@@ -1298,7 +1298,7 @@ public TimeZone getTimeZone() {
     /**
      * Returns a hash code compatible with equals.
      *
-     * @return a hash code compatible with equals.
+     * @return a hash code compatible with equals
      */
     @Override
     public int hashCode() {
@@ -1323,7 +1323,7 @@ private void init() {
     /**
      * Creates a new Calendar instance.
      *
-     * @return a new Calendar instance.
+     * @return a new Calendar instance
      */
     private Calendar newCalendar() {
         return Calendar.getInstance(timeZone, locale);
@@ -1332,8 +1332,8 @@ private Calendar newCalendar() {
     /**
      * Returns a list of Rules given a pattern.
      *
-     * @return a {@link List} of Rule objects.
-     * @throws IllegalArgumentException if pattern is invalid.
+     * @return a {@link List} of Rule objects
+     * @throws IllegalArgumentException if pattern is invalid
      */
     protected List<Rule> parsePattern() {
         final DateFormatSymbols symbols = new DateFormatSymbols(locale);
@@ -1480,9 +1480,9 @@ protected List<Rule> parsePattern() {
     /**
      * Performs the parsing of tokens.
      *
-     * @param pattern  the pattern.
-     * @param indexRef  index references.
-     * @return parsed token.
+     * @param pattern  the pattern
+     * @param indexRef  index references
+     * @return parsed token
      */
     protected String parseToken(final String pattern, final int[] indexRef) {
         final StringBuilder buf = new StringBuilder();
@@ -1534,9 +1534,9 @@ protected String parseToken(final String pattern, final int[] indexRef) {
      * Create the object after serialization. This implementation reinitializes the
      * transient properties.
      *
-     * @param in ObjectInputStream from which the object is being deserialized.
-     * @throws IOException if there is an IO issue.
-     * @throws ClassNotFoundException if a class cannot be found.
+     * @param in ObjectInputStream from which the object is being deserialized
+     * @throws ClassNotFoundException if a class cannot be found
+     * @throws IOException if there is an IO issue
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
@@ -1546,9 +1546,9 @@ private void readObject(final ObjectInputStream in) throws IOException, ClassNot
     /**
      * Gets an appropriate rule for the padding required.
      *
-     * @param field  the field to get a rule for.
-     * @param padding  the padding required.
-     * @return a new rule with the correct padding.
+     * @param field  the field to get a rule for
+     * @param padding  the padding required
+     * @return a new rule with the correct padding
      */
     protected NumberRule selectNumberRule(final int field, final int padding) {
         switch (padding) {
@@ -1564,7 +1564,7 @@ protected NumberRule selectNumberRule(final int field, final int padding) {
     /**
      * Gets a debugging string version of this formatter.
      *
-     * @return a debugging string.
+     * @return a debugging string
      */
     @Override
     public String toString() {
diff --git a/src/main/java/org/apache/commons/lang3/time/FastTimeZone.java b/src/main/java/org/apache/commons/lang3/time/FastTimeZone.java
index 63e85c3fb26..66063d6716f 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastTimeZone.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastTimeZone.java
@@ -34,7 +34,7 @@ public class FastTimeZone {
     /**
      * Gets the GMT TimeZone.
      *
-     * @return A TimeZone with a raw offset of zero.
+     * @return a TimeZone with a raw offset of zero
      */
     public static TimeZone getGmtTimeZone() {
         return GREENWICH;
@@ -44,8 +44,8 @@ public static TimeZone getGmtTimeZone() {
      * Gets a TimeZone with GMT offsets.  A GMT offset must be either 'Z', or 'UTC', or match
      * <em>(GMT)? hh?(:?mm?)?</em>, where h and m are digits representing hours and minutes.
      *
-     * @param pattern The GMT offset
-     * @return A TimeZone with offset from GMT or null, if pattern does not match.
+     * @param pattern the GMT offset
+     * @return a TimeZone with offset from GMT or null, if pattern does not match
      */
     public static TimeZone getGmtTimeZone(final String pattern) {
         if ("Z".equals(pattern) || "UTC".equals(pattern)) {
@@ -70,8 +70,8 @@ public static TimeZone getGmtTimeZone(final String pattern) {
      * followed by sign, hours digit(s), optional colon(':'), and optional minutes digits.
      * i.e. <em>[GMT] (+|-) Hours [[:] Minutes]</em>
      *
-     * @param id A GMT custom id (or Olson id
-     * @return A time zone
+     * @param id a GMT custom id (or Olson id
+     * @return a time zone
      */
     public static TimeZone getTimeZone(final String id) {
         final TimeZone tz = getGmtTimeZone(id);
diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
index 72b07206997..157cf41df72 100644
--- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java
+++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
@@ -83,8 +83,8 @@ public static final class Split extends ImmutablePair<String, Duration> {
         /**
          * Constructs a Split object with label and duration.
          *
-         * @param label Label for this split.
-         * @param duration Duration for this split.
+         * @param label label for this split
+         * @param duration duration for this split
          */
         public Split(String label, Duration duration) {
             super(label, duration);
@@ -93,7 +93,7 @@ public Split(String label, Duration duration) {
         /**
          * Gets the duration of this split.
          *
-         * @return The duration of this split..
+         * @return the duration of this split.
          */
         public Duration getDuration() {
             return getRight();
@@ -102,7 +102,7 @@ public Duration getDuration() {
         /**
          * Gets the label of this split.
          *
-         * @return The label of this split.
+         * @return the label of this split
          */
         public String getLabel() {
             return getLeft();
@@ -111,7 +111,7 @@ public String getLabel() {
         /**
          * Converts this instance to a string.
          *
-         * @return this instance to a string.
+         * @return this instance to a string
          */
         @Override
         public String toString() {
@@ -202,21 +202,21 @@ boolean isSuspended() {
         /**
          * Tests whether this StopWatch is started. A suspended StopWatch is also started.
          *
-         * @return boolean If this StopWatch is started.
+         * @return boolean If this StopWatch is started
          */
         abstract boolean isStarted();
 
         /**
          * Tests whether this StopWatch is stopped. A StopWatch which is not yet started and explicitly stopped is considered stopped.
          *
-         * @return boolean If this StopWatch is stopped.
+         * @return boolean If this StopWatch is stopped
          */
         abstract boolean isStopped();
 
         /**
          * Tests whether this StopWatch is suspended.
          *
-         * @return boolean If this StopWatch is suspended.
+         * @return boolean If this StopWatch is suspended
          */
         abstract boolean isSuspended();
     }
@@ -226,7 +226,7 @@ boolean isSuspended() {
     /**
      * Creates a StopWatch.
      *
-     * @return StopWatch a StopWatch.
+     * @return StopWatch a StopWatch
      * @since 3.10
      */
     public static StopWatch create() {
@@ -236,7 +236,7 @@ public static StopWatch create() {
     /**
      * Creates and starts a StopWatch.
      *
-     * @return StopWatch a started StopWatch.
+     * @return StopWatch a started StopWatch
      * @since 3.5
      */
     public static StopWatch createStarted() {
@@ -313,7 +313,7 @@ public StopWatch() {
     /**
      * Constructs a new instance.
      *
-     * @param message A message for string presentation.
+     * @param message a message for string presentation
      * @since 3.10
      */
     public StopWatch(final String message) {
@@ -323,7 +323,7 @@ public StopWatch(final String message) {
     /**
      * Formats the split time with {@link DurationFormatUtils#formatDurationHMS}.
      *
-     * @return the split time formatted by {@link DurationFormatUtils#formatDurationHMS}.
+     * @return the split time formatted by {@link DurationFormatUtils#formatDurationHMS}
      * @since 3.10
      */
     public String formatSplitTime() {
@@ -333,7 +333,7 @@ public String formatSplitTime() {
     /**
      * Formats the time formatted with {@link DurationFormatUtils#formatDurationHMS}.
      *
-     * @return the time formatted by {@link DurationFormatUtils#formatDurationHMS}.
+     * @return the time formatted by {@link DurationFormatUtils#formatDurationHMS}
      * @since 3.10
      */
     public String formatTime() {
@@ -343,9 +343,9 @@ public String formatTime() {
     /**
      * Delegates to {@link Supplier#get()} while recording the duration of the call.
      *
-     * @param <T>      the type of results supplied by this supplier.
-     * @param supplier The supplier to {@link Supplier#get()}.
-     * @return a result from the given Supplier.
+     * @param <T>      the type of results supplied by this supplier
+     * @param supplier the supplier to {@link Supplier#get()}
+     * @return a result from the given Supplier
      * @since 3.18.0
      */
     public <T> T get(final Supplier<T> supplier) {
@@ -364,7 +364,7 @@ public <T> T get(final Supplier<T> supplier) {
      * This is either the Duration between the start and the moment this method is called, or the Duration between start and stop.
      * </p>
      *
-     * @return the Duration.
+     * @return the Duration
      * @since 3.16.0
      */
     public Duration getDuration() {
@@ -374,7 +374,7 @@ public Duration getDuration() {
     /**
      * Gets the message for string presentation.
      *
-     * @return the message for string presentation.
+     * @return the message for string presentation
      * @since 3.10
      */
     public String getMessage() {
@@ -388,7 +388,7 @@ public String getMessage() {
      * This is either the time between the start and the moment this method is called, or the amount of time between start and stop.
      * </p>
      *
-     * @return the <em>elapsed</em> time in nanoseconds.
+     * @return the <em>elapsed</em> time in nanoseconds
      * @see System#nanoTime()
      * @since 3.0
      */
@@ -414,8 +414,8 @@ public long getNanoTime() {
      * This is the Duration between start and latest split.
      * </p>
      *
-     * @return the split Duration.
-     * @throws IllegalStateException if this StopWatch has not yet been split.
+     * @return the split Duration
+     * @throws IllegalStateException if this StopWatch has not yet been split
      * @since 3.16.0
      */
     public Duration getSplitDuration() {
@@ -429,8 +429,8 @@ public Duration getSplitDuration() {
      * This is the time between start and latest split.
      * </p>
      *
-     * @return the split time in nanoseconds.
-     * @throws IllegalStateException if this StopWatch has not yet been split.
+     * @return the split time in nanoseconds
+     * @throws IllegalStateException if this StopWatch has not yet been split
      * @since 3.0
      */
     public long getSplitNanoTime() {
@@ -443,7 +443,7 @@ public long getSplitNanoTime() {
     /**
      * Gets the split list.
      *
-     * @return the list of splits.
+     * @return the list of splits
      * @since 3.20.0
      */
     public List<Split> getSplits() {
@@ -457,8 +457,8 @@ public List<Split> getSplits() {
      * This is the time between start and latest split.
      * </p>
      *
-     * @return the split time in milliseconds.
-     * @throws IllegalStateException if this StopWatch has not yet been split.
+     * @return the split time in milliseconds
+     * @throws IllegalStateException if this StopWatch has not yet been split
      * @since 2.1
      * @deprecated Use {@link #getSplitDuration()}.
      */
@@ -470,8 +470,8 @@ public long getSplitTime() {
     /**
      * Gets the Instant this StopWatch was started, between the current time and midnight, January 1, 1970 UTC.
      *
-     * @return the Instant this StopWatch was started, between the current time and midnight, January 1, 1970 UTC.
-     * @throws IllegalStateException if this StopWatch has not been started.
+     * @return the Instant this StopWatch was started, between the current time and midnight, January 1, 1970 UTC
+     * @throws IllegalStateException if this StopWatch has not been started
      * @since 3.16.0
      */
     public Instant getStartInstant() {
@@ -484,8 +484,8 @@ public Instant getStartInstant() {
     /**
      * Gets the time this StopWatch was started in milliseconds, between the current time and midnight, January 1, 1970 UTC.
      *
-     * @return the time this StopWatch was started in milliseconds, between the current time and midnight, January 1, 1970 UTC.
-     * @throws IllegalStateException if this StopWatch has not been started.
+     * @return the time this StopWatch was started in milliseconds, between the current time and midnight, January 1, 1970 UTC
+     * @throws IllegalStateException if this StopWatch has not been started
      * @since 2.4
      * @deprecated Use {@link #getStartInstant()}.
      */
@@ -497,8 +497,8 @@ public long getStartTime() {
     /**
      * Gets the Instant this StopWatch was stopped, between the current time and midnight, January 1, 1970 UTC.
      *
-     * @return the Instant this StopWatch was stopped in milliseconds, between the current time and midnight, January 1, 1970 UTC.
-     * @throws IllegalStateException if this StopWatch has not been started.
+     * @return the Instant this StopWatch was stopped in milliseconds, between the current time and midnight, January 1, 1970 UTC
+     * @throws IllegalStateException if this StopWatch has not been started
      * @since 3.16.0
      */
     public Instant getStopInstant() {
@@ -511,8 +511,8 @@ public Instant getStopInstant() {
     /**
      * Gets the time this StopWatch was stopped in milliseconds, between the current time and midnight, January 1, 1970 UTC.
      *
-     * @return the time this StopWatch was stopped in milliseconds, between the current time and midnight, January 1, 1970 UTC.
-     * @throws IllegalStateException if this StopWatch has not been started.
+     * @return the time this StopWatch was stopped in milliseconds, between the current time and midnight, January 1, 1970 UTC
+     * @throws IllegalStateException if this StopWatch has not been started
      * @since 3.12.0
      * @deprecated Use {@link #getStopInstant()}.
      */
@@ -525,11 +525,11 @@ public long getStopTime() {
     /**
      * Delegates to {@link FailableSupplier#get()} while recording the duration of the call.
      *
-     * @param <T>      the type of results supplied by this supplier.
-     * @param <E>      The kind of thrown exception or error.
-     * @param supplier The supplier to {@link Supplier#get()}.
-     * @return a result from the given Supplier.
-     * @throws Throwable if the supplier fails.
+     * @param <T>      the type of results supplied by this supplier
+     * @param <E>      the kind of thrown exception or error
+     * @param supplier the supplier to {@link Supplier#get()}
+     * @return a result from the given Supplier
+     * @throws Throwable if the supplier fails
      * @since 3.18.0
      */
     public <T, E extends Throwable> T getT(final FailableSupplier<T, E> supplier) throws Throwable {
@@ -548,7 +548,7 @@ public <T, E extends Throwable> T getT(final FailableSupplier<T, E> supplier) th
      * This is either the time between the start and the moment this method is called, or the amount of time between start and stop.
      * </p>
      *
-     * @return the time in milliseconds.
+     * @return the time in milliseconds
      * @see #getDuration()
      */
     public long getTime() {
@@ -564,8 +564,8 @@ public long getTime() {
      * is 59 minutes, then the result returned will be {@code 0}.
      * </p>
      *
-     * @param timeUnit the unit of time, not null.
-     * @return the time in the specified TimeUnit, rounded down.
+     * @param timeUnit the unit of time, not null
+     * @return the time in the specified TimeUnit, rounded down
      * @since 3.5
      */
     public long getTime(final TimeUnit timeUnit) {
@@ -575,7 +575,7 @@ public long getTime(final TimeUnit timeUnit) {
     /**
      * Tests whether this StopWatch is started. A suspended StopWatch is also started watch.
      *
-     * @return boolean If this StopWatch is started.
+     * @return boolean If this StopWatch is started
      * @since 3.2
      */
     public boolean isStarted() {
@@ -585,7 +585,7 @@ public boolean isStarted() {
     /**
      * Tests whether StopWatch is stopped. this StopWatch which's not yet started and explicitly stopped StopWatch is considered as stopped.
      *
-     * @return boolean If this StopWatch is stopped.
+     * @return boolean If this StopWatch is stopped
      * @since 3.2
      */
     public boolean isStopped() {
@@ -595,7 +595,7 @@ public boolean isStopped() {
     /**
      * Tests whether this StopWatch is suspended.
      *
-     * @return boolean If this StopWatch is suspended.
+     * @return boolean If this StopWatch is suspended
      * @since 3.2
      */
     public boolean isSuspended() {
@@ -605,8 +605,8 @@ public boolean isSuspended() {
     /**
      * Converts nanoseconds to milliseconds.
      *
-     * @param nanos nanoseconds to convert.
-     * @return milliseconds conversion result.
+     * @param nanos nanoseconds to convert
+     * @return milliseconds conversion result
      */
     private long nanosToMillis(final long nanos) {
         return nanos / NANO_2_MILLIS;
@@ -632,7 +632,7 @@ public void reset() {
      * This method resumes the watch after it was suspended. The watch will not include time between the suspend and resume calls in the total time.
      * </p>
      *
-     * @throws IllegalStateException if this StopWatch has not been suspended.
+     * @throws IllegalStateException if this StopWatch has not been suspended
      */
     public void resume() {
         if (runningState != State.SUSPENDED) {
@@ -645,7 +645,7 @@ public void resume() {
     /**
      * Delegates to {@link Runnable#run()} while recording the duration of the call.
      *
-     * @param runnable The runnable to {@link Runnable#run()}.
+     * @param runnable the runnable to {@link Runnable#run()}
      * @since 3.18.0
      */
     public void run(final Runnable runnable) {
@@ -660,9 +660,9 @@ public void run(final Runnable runnable) {
     /**
      * Delegates to {@link FailableRunnable#run()} while recording the duration of the call.
      *
-     * @param <E>      The kind of {@link Throwable}.
-     * @param runnable The runnable to {@link FailableRunnable#run()}.
-     * @throws Throwable Thrown by {@link FailableRunnable#run()}.
+     * @param <E>      the kind of {@link Throwable}
+     * @param runnable the runnable to {@link FailableRunnable#run()}
+     * @throws Throwable thrown by {@link FailableRunnable#run()}
      * @since 3.18.0
      */
     public <E extends Throwable> void runT(final FailableRunnable<E> runnable) throws Throwable {
@@ -682,7 +682,7 @@ public <E extends Throwable> void runT(final FailableRunnable<E> runnable) throw
      * timing from the original start point.
      * </p>
      *
-     * @throws IllegalStateException if this StopWatch is not running.
+     * @throws IllegalStateException if this StopWatch is not running
      */
     public void split() {
         if (runningState != State.RUNNING) {
@@ -701,8 +701,8 @@ public void split() {
      * timing from the original start point.
      * </p>
      *
-     * @param label A message for string presentation.
-     * @throws IllegalStateException if the StopWatch is not running.
+     * @param label a message for string presentation
+     * @throws IllegalStateException if the StopWatch is not running
      * @since 3.20.0
      */
     public void split(final String label) {
@@ -721,7 +721,7 @@ public void split(final String label) {
      * This method starts a new timing session, clearing any previous values.
      * </p>
      *
-     * @throws IllegalStateException if this StopWatch is already running.
+     * @throws IllegalStateException if this StopWatch is already running
      */
     public void start() {
         if (runningState == State.STOPPED) {
@@ -754,7 +754,7 @@ private void startResume() {
      * This method ends a new timing session, allowing the time to be retrieved.
      * </p>
      *
-     * @throws IllegalStateException if this StopWatch is not running.
+     * @throws IllegalStateException if this StopWatch is not running
      */
     public void stop() {
         if (runningState != State.RUNNING && runningState != State.SUSPENDED) {
@@ -774,7 +774,7 @@ public void stop() {
      * This method suspends the watch until it is resumed. The watch will not include time between the suspend and resume calls in the total time.
      * </p>
      *
-     * @throws IllegalStateException if this StopWatch is not currently running.
+     * @throws IllegalStateException if this StopWatch is not currently running
      */
     public void suspend() {
         if (runningState != State.RUNNING) {
@@ -792,9 +792,9 @@ public void suspend() {
      * The format used is ISO 8601-like, [<em>message</em> ]<em>hours</em>:<em>minutes</em>:<em>seconds</em>.<em>milliseconds</em>.
      * </p>
      *
-     * @return the split time as a String.
+     * @return the split time as a String
      * @since 2.1
-     * @since 3.10 Returns the prefix {@code "message "} if the message is set.
+     * @since 3.10 Returns the prefix {@code "message "} if the message is set
      */
     public String toSplitString() {
         final String msgStr = Objects.toString(message, StringUtils.EMPTY);
@@ -809,8 +809,8 @@ public String toSplitString() {
      * The format used is ISO 8601-like, [<em>message</em> ]<em>hours</em>:<em>minutes</em>:<em>seconds</em>.<em>milliseconds</em>.
      * </p>
      *
-     * @return the time as a String.
-     * @since 3.10 Returns the prefix {@code "message "} if the message is set.
+     * @return the time as a String
+     * @since 3.10 Returns the prefix {@code "message "} if the message is set
      */
     @Override
     public String toString() {
@@ -826,7 +826,7 @@ public String toString() {
      * This method clears the stop time. The start time is unaffected, enabling timing from the original start point to continue.
      * </p>
      *
-     * @throws IllegalStateException if this StopWatch has not been split.
+     * @throws IllegalStateException if this StopWatch has not been split
      */
     public void unsplit() {
         if (splitState != SplitState.SPLIT) {
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 953006e5e55..4b58de227d0 100644
--- a/src/main/java/org/apache/commons/lang3/time/TimeZones.java
+++ b/src/main/java/org/apache/commons/lang3/time/TimeZones.java
@@ -52,6 +52,7 @@ public class TimeZones {
      * <p>
      * Make a defensive copy, just in case.
      * </p>
+     *
      * @see TimeZone#getAvailableIDs()
      */
     static final String[] SORTED_AVAILABLE_IDS = ArraySorter.sort(TimeZone.getAvailableIDs().clone());
@@ -69,8 +70,8 @@ public class TimeZones {
      * You can disable mapping from {@link ZoneId#SHORT_IDS} by setting the system property {@code "TimeZones.mapShortIDs=false"}.
      * </p>
      *
-     * @param id Same as {@link TimeZone#getTimeZone(String)}.
-     * @return Same as {@link TimeZone#getTimeZone(String)}.
+     * @param id same as {@link TimeZone#getTimeZone(String)}
+     * @return same as {@link TimeZone#getTimeZone(String)}
      * @since 3.20.0
      */
     public static TimeZone getTimeZone(final String id) {
@@ -84,8 +85,8 @@ private static boolean mapShortIDs() {
     /**
      * Returns the given TimeZone if non-{@code null}, otherwise {@link TimeZone#getDefault()}.
      *
-     * @param timeZone a locale or {@code null}.
-     * @return the given locale if non-{@code null}, otherwise {@link TimeZone#getDefault()}.
+     * @param timeZone a locale or {@code null}
+     * @return the given locale if non-{@code null}, otherwise {@link TimeZone#getDefault()}
      * @since 3.13.0
      */
     public static TimeZone toTimeZone(final TimeZone timeZone) {
diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
index 7451b7197bb..019c611244d 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
@@ -51,7 +51,7 @@ public class ImmutablePair<L, R> extends Pair<L, R> {
     @SuppressWarnings("rawtypes")
     private static final ImmutablePair NULL = new ImmutablePair<>(null, null);
 
-    /** Serialization version */
+    /** Serialization version. */
     private static final long serialVersionUID = 4954918890077093841L;
 
     /**
@@ -59,7 +59,7 @@ public class ImmutablePair<L, R> extends Pair<L, R> {
      *
      * @param <L> the left element type
      * @param <R> the right element type
-     * @return the empty array singleton that can be assigned without compiler warning.
+     * @return the empty array singleton that can be assigned without compiler warning
      * @since 3.10
      */
     @SuppressWarnings("unchecked")
@@ -70,10 +70,10 @@ public static <L, R> ImmutablePair<L, R>[] emptyArray() {
     /**
      * Creates an immutable pair of two objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may be null.
-     * @return an immutable formed from the two parameters, not null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param left  the left element, may be null
+     * @return an immutable formed from the two parameters, not null
      * @since 3.11
      */
     public static <L, R> Pair<L, R> left(final L left) {
@@ -85,7 +85,7 @@ public static <L, R> Pair<L, R> left(final L left) {
      *
      * @param <L> the left element of this pair. Value is {@code null}.
      * @param <R> the right element of this pair. Value is {@code null}.
-     * @return an immutable pair of nulls.
+     * @return an immutable pair of nulls
      * @since 3.6
      */
     @SuppressWarnings("unchecked")
@@ -96,11 +96,11 @@ public static <L, R> ImmutablePair<L, R> nullPair() {
     /**
      * Creates an immutable pair of two objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may be null.
-     * @param right  the right element, may be null.
-     * @return an immutable formed from the two parameters, not null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param left  the left element, may be null
+     * @param right  the right element, may be null
+     * @return an immutable formed from the two parameters, not null
      */
     public static <L, R> ImmutablePair<L, R> of(final L left, final R right) {
         return left != null || right != null ? new ImmutablePair<>(left, right) : nullPair();
@@ -109,10 +109,10 @@ public static <L, R> ImmutablePair<L, R> of(final L left, final R right) {
     /**
      * Creates an immutable pair from a map entry.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param pair the existing map entry.
-     * @return an immutable formed from the map entry.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param pair the existing map entry
+     * @return an immutable formed from the map entry
      * @since 3.10
      */
     public static <L, R> ImmutablePair<L, R> of(final Map.Entry<L, R> pair) {
@@ -122,12 +122,12 @@ public static <L, R> ImmutablePair<L, R> of(final Map.Entry<L, R> pair) {
     /**
      * Creates an immutable pair of two non-null objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may not be null.
-     * @param right  the right element, may not  be null.
-     * @return an immutable formed from the two parameters, not null.
-     * @throws NullPointerException if any input is null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param left  the left element, may not be null
+     * @param right  the right element, may not  be null
+     * @return an immutable formed from the two parameters, not null
+     * @throws NullPointerException if any input is null
      * @since 3.13.0
      */
     public static <L, R> ImmutablePair<L, R> ofNonNull(final L left, final R right) {
@@ -137,20 +137,20 @@ public static <L, R> ImmutablePair<L, R> ofNonNull(final L left, final R right)
     /**
      * Creates an immutable pair of two objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param right  the right element, may be null.
-     * @return an immutable formed from the two parameters, not null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param right  the right element, may be null
+     * @return an immutable formed from the two parameters, not null
      * @since 3.11
      */
     public static <L, R> Pair<L, R> right(final R right) {
         return of(null, right);
     }
 
-    /** Left object */
+    /** Left object. */
     public final L left;
 
-    /** Right object */
+    /** Right object. */
     public final R right;
 
     /**
diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
index 6cdbef0f367..576684f5d3d 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
@@ -27,9 +27,9 @@
  *
  * <p>#ThreadSafe# if all three objects are thread-safe.</p>
  *
- * @param <L> the left element type.
- * @param <M> the middle element type.
- * @param <R> the right element type.
+ * @param <L> the left element type
+ * @param <M> the middle element type
+ * @param <R> the right element type
  * @since 3.2
  */
 public class ImmutableTriple<L, M, R> extends Triple<L, M, R> {
@@ -57,10 +57,10 @@ public class ImmutableTriple<L, M, R> extends Triple<L, M, R> {
     /**
      * Gets the empty array singleton that can be assigned without compiler warning.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @return the empty array singleton that can be assigned without compiler warning.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @return the empty array singleton that can be assigned without compiler warning
      * @since 3.10
      */
     @SuppressWarnings("unchecked")
@@ -74,7 +74,7 @@ public static <L, M, R> ImmutableTriple<L, M, R>[] emptyArray() {
      * @param <L> the left element of this triple. Value is {@code null}.
      * @param <M> the middle element of this triple. Value is {@code null}.
      * @param <R> the right element of this triple. Value is {@code null}.
-     * @return an immutable triple of nulls.
+     * @return an immutable triple of nulls
      * @since 3.6
      */
     @SuppressWarnings("unchecked")
@@ -85,13 +85,13 @@ public static <L, M, R> ImmutableTriple<L, M, R> nullTriple() {
     /**
      * Creates an immutable triple of three objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may be null.
-     * @param middle  the middle element, may be null.
-     * @param right  the right element, may be null.
-     * @return an immutable triple formed from the three parameters, not null.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @param left  the left element, may be null
+     * @param middle  the middle element, may be null
+     * @param right  the right element, may be null
+     * @return an immutable triple formed from the three parameters, not null
      */
     public static <L, M, R> ImmutableTriple<L, M, R> of(final L left, final M middle, final R right) {
         return left != null | middle != null || right != null ? new ImmutableTriple<>(left, middle, right) : nullTriple();
@@ -100,14 +100,14 @@ public static <L, M, R> ImmutableTriple<L, M, R> of(final L left, final M middle
     /**
      * Creates an immutable triple of three non-null objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may not be null.
-     * @param middle  the middle element, may not be null.
-     * @param right  the right element, may not be null.
-     * @return an immutable triple formed from the three parameters, not null.
-     * @throws NullPointerException if any input is null.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @param left  the left element, may not be null
+     * @param middle  the middle element, may not be null
+     * @param right  the right element, may not be null
+     * @return an immutable triple formed from the three parameters, not null
+     * @throws NullPointerException if any input is null
      * @since 3.13.0
      */
     public static <L, M, R> ImmutableTriple<L, M, R> ofNonNull(final L left, final M middle, final R right) {
@@ -127,9 +127,9 @@ public static <L, M, R> ImmutableTriple<L, M, R> ofNonNull(final L left, final M
     /**
      * Constructs a new triple instance.
      *
-     * @param left  the left value, may be null.
-     * @param middle the middle value, may be null.
-     * @param right  the right value, may be null.
+     * @param left  the left value, may be null
+     * @param middle the middle value, may be null
+     * @param right  the right value, may be null
      */
     public ImmutableTriple(final L left, final M middle, final R right) {
         this.left = left;
@@ -161,4 +161,3 @@ public R getRight() {
         return right;
     }
 }
-
diff --git a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
index 8f8050c1ee7..3818c059321 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
@@ -24,8 +24,8 @@
  *
  * <p>Not #ThreadSafe#</p>
  *
- * @param <L> the left element type.
- * @param <R> the right element type.
+ * @param <L> the left element type
+ * @param <R> the right element type
  * @since 3.0
  */
 public class MutablePair<L, R> extends Pair<L, R> {
@@ -40,15 +40,15 @@ public class MutablePair<L, R> extends Pair<L, R> {
      */
     public static final MutablePair<?, ?>[] EMPTY_ARRAY = {};
 
-    /** Serialization version */
+    /** Serialization version. */
     private static final long serialVersionUID = 4954918890077093841L;
 
     /**
      * Returns the empty array singleton that can be assigned without compiler warning.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @return the empty array singleton that can be assigned without compiler warning.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @return the empty array singleton that can be assigned without compiler warning
      * @since 3.10
      */
     @SuppressWarnings("unchecked")
@@ -59,11 +59,11 @@ public static <L, R> MutablePair<L, R>[] emptyArray() {
     /**
      * Creates a mutable pair of two objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may be null.
-     * @param right  the right element, may be null.
-     * @return a mutable pair formed from the two parameters, not null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param left  the left element, may be null
+     * @param right  the right element, may be null
+     * @return a mutable pair formed from the two parameters, not null
      */
     public static <L, R> MutablePair<L, R> of(final L left, final R right) {
         return new MutablePair<>(left, right);
@@ -72,10 +72,10 @@ public static <L, R> MutablePair<L, R> of(final L left, final R right) {
     /**
      * Creates a mutable pair from a map entry.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param pair the existing map entry.
-     * @return a mutable pair formed from the map entry.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param pair the existing map entry
+     * @return a mutable pair formed from the map entry
      */
     public static <L, R> MutablePair<L, R> of(final Map.Entry<L, R> pair) {
         final L left;
@@ -93,12 +93,12 @@ public static <L, R> MutablePair<L, R> of(final Map.Entry<L, R> pair) {
     /**
      * Creates a mutable pair of two non-null objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may not be null.
-     * @param right  the right element, may not be null.
-     * @return a mutable pair formed from the two parameters, not null.
-     * @throws NullPointerException if any input is null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param left  the left element, may not be null
+     * @param right  the right element, may not be null
+     * @return a mutable pair formed from the two parameters, not null
+     * @throws NullPointerException if any input is null
      * @since 3.13.0
      */
     public static <L, R> MutablePair<L, R> ofNonNull(final L left, final R right) {
@@ -110,9 +110,9 @@ public static <L, R> MutablePair<L, R> ofNonNull(final L left, final R right) {
      *
      * @param <L> the left element type
      * @param <R> the right element type
-     * @param pair the existing map entry.
+     * @param pair the existing map entry
      * @return a mutable pair formed from the map entry
-     * @throws NullPointerException if the pair is null.
+     * @throws NullPointerException if the pair is null
      * @since 3.20
      */
     public static <L, R> MutablePair<L, R> ofNonNull(final Map.Entry<L, R> pair) {
@@ -134,8 +134,8 @@ public MutablePair() {
     /**
      * Create a new pair instance.
      *
-     * @param left  the left value, may be null.
-     * @param right  the right value, may be null.
+     * @param left  the left value, may be null
+     * @param right  the right value, may be null
      */
     public MutablePair(final L left, final R right) {
         this.left = left;
@@ -161,7 +161,7 @@ public R getRight() {
     /**
      * Sets the left element of the pair.
      *
-     * @param left  the new value of the left element, may be null.
+     * @param left the new value of the left element, may be null
      */
     public void setLeft(final L left) {
         this.left = left;
@@ -170,7 +170,7 @@ public void setLeft(final L left) {
     /**
      * Sets the right element of the pair.
      *
-     * @param right  the new value of the right element, may be null.
+     * @param right the new value of the right element, may be null
      */
     public void setRight(final R right) {
         this.right = right;
@@ -180,8 +180,8 @@ public void setRight(final R right) {
      * Sets the {@code Map.Entry} value.
      * This sets the right element of the pair.
      *
-     * @param value  the right value to set, not null.
-     * @return the old value for the right element.
+     * @param value  the right value to set, not null
+     * @return the old value for the right element
      */
     @Override
     public R setValue(final R value) {
diff --git a/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java
index b960931dcbc..d9f88f48fbe 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java
@@ -23,9 +23,9 @@
  *
  * <p>Not #ThreadSafe#</p>
  *
- * @param <L> the left element type.
- * @param <M> the middle element type.
- * @param <R> the right element type.
+ * @param <L> the left element type
+ * @param <M> the middle element type
+ * @param <R> the right element type
  * @since 3.2
  */
 public class MutableTriple<L, M, R> extends Triple<L, M, R> {
@@ -40,16 +40,16 @@ public class MutableTriple<L, M, R> extends Triple<L, M, R> {
      */
     public static final MutableTriple<?, ?, ?>[] EMPTY_ARRAY = {};
 
-    /** Serialization version */
+    /** Serialization version. */
     private static final long serialVersionUID = 1L;
 
     /**
      * Returns the empty array singleton that can be assigned without compiler warning.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @return the empty array singleton that can be assigned without compiler warning.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @return the empty array singleton that can be assigned without compiler warning
      * @since 3.10
      */
     @SuppressWarnings("unchecked")
@@ -60,13 +60,13 @@ public static <L, M, R> MutableTriple<L, M, R>[] emptyArray() {
     /**
      * Obtains a mutable triple of three objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may be null.
-     * @param middle  the middle element, may be null.
-     * @param right  the right element, may be null.
-     * @return a mutable triple formed from the three parameters, not null.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @param left  the left element, may be null
+     * @param middle  the middle element, may be null
+     * @param right  the right element, may be null
+     * @return a mutable triple formed from the three parameters, not null
      */
     public static <L, M, R> MutableTriple<L, M, R> of(final L left, final M middle, final R right) {
         return new MutableTriple<>(left, middle, right);
@@ -75,14 +75,14 @@ public static <L, M, R> MutableTriple<L, M, R> of(final L left, final M middle,
     /**
      * Obtains a mutable triple of three non-null objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may not be null.
-     * @param middle  the middle element, may not be null.
-     * @param right  the right element, may not be null.
-     * @return a mutable triple formed from the three parameters, not null.
-     * @throws NullPointerException if any input is null.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @param left  the left element, may not be null
+     * @param middle  the middle element, may not be null
+     * @param right  the right element, may not be null
+     * @return a mutable triple formed from the three parameters, not null
+     * @throws NullPointerException if any input is null
      * @since 3.13.0
      */
     public static <L, M, R> MutableTriple<L, M, R> ofNonNull(final L left, final M middle, final R right) {
@@ -107,9 +107,9 @@ public MutableTriple() {
     /**
      * Create a new triple instance.
      *
-     * @param left  the left value, may be null.
-     * @param middle  the middle value, may be null.
-     * @param right  the right value, may be null.
+     * @param left  the left value, may be null
+     * @param middle  the middle value, may be null
+     * @param right  the right value, may be null
      */
     public MutableTriple(final L left, final M middle, final R right) {
         this.left = left;
@@ -144,7 +144,7 @@ public R getRight() {
     /**
      * Sets the left element of the triple.
      *
-     * @param left  the new value of the left element, may be null.
+     * @param left the new value of the left element, may be null
      */
     public void setLeft(final L left) {
         this.left = left;
@@ -153,7 +153,7 @@ public void setLeft(final L left) {
     /**
      * Sets the middle element of the triple.
      *
-     * @param middle  the new value of the middle element, may be null.
+     * @param middle the new value of the middle element, may be null
      */
     public void setMiddle(final M middle) {
         this.middle = middle;
@@ -162,10 +162,9 @@ public void setMiddle(final M middle) {
     /**
      * Sets the right element of the triple.
      *
-     * @param right  the new value of the right element, may be null.
+     * @param right the new value of the right element, may be null
      */
     public void setRight(final R right) {
         this.right = right;
     }
 }
-
diff --git a/src/main/java/org/apache/commons/lang3/tuple/Pair.java b/src/main/java/org/apache/commons/lang3/tuple/Pair.java
index aff5d9506ef..95ae5a3e45b 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/Pair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/Pair.java
@@ -35,13 +35,13 @@
  * However, there is no restriction on the type of the stored objects that may be stored.
  * If mutable objects are stored in the pair, then the pair itself effectively becomes mutable.</p>
  *
- * @param <L> the left element type.
- * @param <R> the right element type.
+ * @param <L> the left element type
+ * @param <R> the right element type
  * @since 3.0
  */
 public abstract class Pair<L, R> implements Map.Entry<L, R>, Comparable<Pair<L, R>>, Serializable {
 
-    /** Serialization version */
+    /** Serialization version. */
     private static final long serialVersionUID = 4954918890077093841L;
 
     /**
@@ -57,9 +57,9 @@ public abstract class Pair<L, R> implements Map.Entry<L, R>, Comparable<Pair<L,
     /**
      * Returns the empty array singleton that can be assigned without compiler warning.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @return the empty array singleton that can be assigned without compiler warning.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @return the empty array singleton that can be assigned without compiler warning
      * @since 3.10
      */
     @SuppressWarnings("unchecked")
@@ -70,11 +70,11 @@ public static <L, R> Pair<L, R>[] emptyArray() {
     /**
      * Creates an immutable pair of two objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may be null.
-     * @param right  the right element, may be null.
-     * @return an immutable pair formed from the two parameters, not null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param left  the left element, may be null
+     * @param right  the right element, may be null
+     * @return an immutable pair formed from the two parameters, not null
      */
     public static <L, R> Pair<L, R> of(final L left, final R right) {
         return ImmutablePair.of(left, right);
@@ -83,10 +83,10 @@ public static <L, R> Pair<L, R> of(final L left, final R right) {
     /**
      * Creates an immutable pair from a map entry.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param pair the map entry.
-     * @return an immutable pair formed from the map entry.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param pair the map entry
+     * @return an immutable pair formed from the map entry
      * @since 3.10
      */
     public static <L, R> Pair<L, R> of(final Map.Entry<L, R> pair) {
@@ -96,12 +96,12 @@ public static <L, R> Pair<L, R> of(final Map.Entry<L, R> pair) {
     /**
      * Creates an immutable pair of two non-null objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may not be null.
-     * @param right  the right element, may not  be null.
-     * @return an immutable pair formed from the two parameters, not null.
-     * @throws NullPointerException if any input is null.
+     * @param <L> the left element type
+     * @param <R> the right element type
+     * @param left  the left element, may not be null
+     * @param right  the right element, may not  be null
+     * @return an immutable pair formed from the two parameters, not null
+     * @throws NullPointerException if any input is null
      * @since 3.13.0
      */
     public static <L, R> Pair<L, R> ofNonNull(final L left, final R right) {
@@ -118,9 +118,9 @@ public Pair() {
     /**
      * Accepts this key and value as arguments to the given consumer.
      *
-     * @param <E> The kind of thrown exception or error.
-     * @param consumer the consumer to call.
-     * @throws E Thrown when the consumer fails.
+     * @param <E> the kind of thrown exception or error
+     * @param consumer the consumer to call
+     * @throws E thrown when the consumer fails
      * @since 3.13.0
      */
     public <E extends Throwable> void accept(final FailableBiConsumer<L, R, E> consumer) throws E {
@@ -130,11 +130,11 @@ public <E extends Throwable> void accept(final FailableBiConsumer<L, R, E> consu
     /**
      * Applies this key and value as arguments to the given function.
      *
-     * @param <V> The function return type.
-     * @param <E> The kind of thrown exception or error.
-     * @param function the consumer to call.
-     * @return the function's return value.
-     * @throws E Thrown when the consumer fails.
+     * @param <V> the function return type
+     * @param <E> the kind of thrown exception or error
+     * @param function the consumer to call
+     * @return the function's return value
+     * @throws E thrown when the consumer fails
      * @since 3.13.0
      */
     public <V, E extends Throwable> V apply(final FailableBiFunction<L, R, V, E> function) throws E {
@@ -145,8 +145,8 @@ public <V, E extends Throwable> V apply(final FailableBiFunction<L, R, V, E> fun
      * Compares the pair based on the left element followed by the right element.
      * The types must be {@link Comparable}.
      *
-     * @param other  the other pair, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other pair, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final Pair<L, R> other) {
@@ -161,8 +161,8 @@ public int compareTo(final Pair<L, R> other) {
     /**
      * Compares this pair to another based on the two elements.
      *
-     * @param obj  the object to compare to, null returns false.
-     * @return true if the elements of the pair are equal.
+     * @param obj  the object to compare to, null returns false
+     * @return true if the elements of the pair are equal
      */
     @Override
     public boolean equals(final Object obj) {
@@ -183,7 +183,7 @@ public boolean equals(final Object obj) {
      * <p>This method implements the {@code Map.Entry} interface returning the
      * left element as the key.</p>
      *
-     * @return the left element as the key, may be null.
+     * @return the left element as the key, may be null
      */
     @Override
     public final L getKey() {
@@ -195,7 +195,7 @@ public final L getKey() {
      *
      * <p>When treated as a key-value pair, this is the key.</p>
      *
-     * @return the left element, may be null.
+     * @return the left element, may be null
      */
     public abstract L getLeft();
 
@@ -204,7 +204,7 @@ public final L getKey() {
      *
      * <p>When treated as a key-value pair, this is the value.</p>
      *
-     * @return the right element, may be null.
+     * @return the right element, may be null
      */
     public abstract R getRight();
 
@@ -214,7 +214,7 @@ public final L getKey() {
      * <p>This method implements the {@code Map.Entry} interface returning the
      * right element as the value.</p>
      *
-     * @return the right element as the value, may be null.
+     * @return the right element as the value, may be null
      */
     @Override
     public R getValue() {
@@ -227,7 +227,7 @@ public R getValue() {
      * The hash code follows the definition in {@code Map.Entry}.
      * </p>
      *
-     * @return the hash code.
+     * @return the hash code
      */
     @Override
     public int hashCode() {
@@ -238,7 +238,7 @@ public int hashCode() {
     /**
      * Returns a String representation of this pair using the format {@code (left,right)}.
      *
-     * @return a string describing this object, not null.
+     * @return a string describing this object, not null
      */
     @Override
     public String toString() {
@@ -253,8 +253,8 @@ public String toString() {
      * the left element (key) and {@code %2$s} for the right element (value).
      * </p>
      *
-     * @param format the format string, optionally containing {@code %1$s} and {@code %2$s}, not null.
-     * @return the formatted string, not null.
+     * @param format the format string, optionally containing {@code %1$s} and {@code %2$s}, not null
+     * @return the formatted string, not null
      * @see String#format(String, Object...)
      */
     public String toString(final String format) {
diff --git a/src/main/java/org/apache/commons/lang3/tuple/Triple.java b/src/main/java/org/apache/commons/lang3/tuple/Triple.java
index 311f181c3fd..4d2e130bc71 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/Triple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/Triple.java
@@ -31,14 +31,14 @@
  * However, there is no restriction on the type of the stored objects that may be stored.
  * If mutable objects are stored in the triple, then the triple itself effectively becomes mutable.</p>
  *
- * @param <L> the left element type.
- * @param <M> the middle element type.
- * @param <R> the right element type.
+ * @param <L> the left element type
+ * @param <M> the middle element type
+ * @param <R> the right element type
  * @since 3.2
  */
 public abstract class Triple<L, M, R> implements Comparable<Triple<L, M, R>>, Serializable {
 
-    /** Serialization version */
+    /** Serialization version. */
     private static final long serialVersionUID = 1L;
 
     /**
@@ -54,10 +54,10 @@ public abstract class Triple<L, M, R> implements Comparable<Triple<L, M, R>>, Se
     /**
      * Returns the empty array singleton that can be assigned without compiler warning.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @return the empty array singleton that can be assigned without compiler warning.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @return the empty array singleton that can be assigned without compiler warning
      * @since 3.10
      */
     @SuppressWarnings("unchecked")
@@ -68,13 +68,13 @@ public static <L, M, R> Triple<L, M, R>[] emptyArray() {
     /**
      * Obtains an immutable triple of three objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may be null.
-     * @param middle the middle element, may be null.
-     * @param right  the right element, may be null.
-     * @return an immutable triple formed from the three parameters, not null.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @param left  the left element, may be null
+     * @param middle the middle element, may be null
+     * @param right  the right element, may be null
+     * @return an immutable triple formed from the three parameters, not null
      */
     public static <L, M, R> Triple<L, M, R> of(final L left, final M middle, final R right) {
         return ImmutableTriple.of(left, middle, right);
@@ -83,14 +83,14 @@ public static <L, M, R> Triple<L, M, R> of(final L left, final M middle, final R
     /**
      * Obtains an immutable triple of three non-null objects inferring the generic types.
      *
-     * @param <L> the left element type.
-     * @param <M> the middle element type.
-     * @param <R> the right element type.
-     * @param left  the left element, may not be null.
-     * @param middle  the middle element, may not be null.
-     * @param right  the right element, may not be null.
-     * @return an immutable triple formed from the three parameters, not null.
-     * @throws NullPointerException if any input is null.
+     * @param <L> the left element type
+     * @param <M> the middle element type
+     * @param <R> the right element type
+     * @param left  the left element, may not be null
+     * @param middle  the middle element, may not be null
+     * @param right  the right element, may not be null
+     * @return an immutable triple formed from the three parameters, not null
+     * @throws NullPointerException if any input is null
      * @since 3.13.0
      */
     public static <L, M, R> Triple<L, M, R> ofNonNull(final L left, final M middle, final R right) {
@@ -109,8 +109,8 @@ public Triple() {
      * finally the right element.
      * The types must be {@link Comparable}.
      *
-     * @param other  the other triple, not null.
-     * @return negative if this is less, zero if equal, positive if greater.
+     * @param other  the other triple, not null
+     * @return negative if this is less, zero if equal, positive if greater
      */
     @Override
     public int compareTo(final Triple<L, M, R> other) {
@@ -122,8 +122,8 @@ public int compareTo(final Triple<L, M, R> other) {
     /**
      * Compares this triple to another based on the three elements.
      *
-     * @param obj  the object to compare to, null returns false.
-     * @return true if the elements of the triple are equal.
+     * @param obj  the object to compare to, null returns false
+     * @return true if the elements of the triple are equal
      */
     @Override
     public boolean equals(final Object obj) {
@@ -142,21 +142,21 @@ public boolean equals(final Object obj) {
     /**
      * Gets the left element from this triple.
      *
-     * @return the left element, may be null.
+     * @return the left element, may be null
      */
     public abstract L getLeft();
 
     /**
      * Gets the middle element from this triple.
      *
-     * @return the middle element, may be null.
+     * @return the middle element, may be null
      */
     public abstract M getMiddle();
 
     /**
      * Gets the right element from this triple.
      *
-     * @return the right element, may be null.
+     * @return the right element, may be null
      */
     public abstract R getRight();
 
@@ -166,7 +166,7 @@ public boolean equals(final Object obj) {
      * The hash code is adapted from the definition in {@code Map.Entry}.
      * </p>
      *
-     * @return the hash code.
+     * @return the hash code
      */
     @Override
     public int hashCode() {
@@ -177,7 +177,7 @@ public int hashCode() {
     /**
      * Returns a String representation of this triple using the format {@code (left,middle,right)}.
      *
-     * @return a string describing this object, not null.
+     * @return a string describing this object, not null
      */
     @Override
     public String toString() {
@@ -192,12 +192,11 @@ public String toString() {
      * element, {@code %2$s} for the middle and {@code %3$s} for the right element.
      * The default format used by {@code toString()} is {@code (%1$s,%2$s,%3$s)}.</p>
      *
-     * @param format  the format string, optionally containing {@code %1$s}, {@code %2$s} and {@code %3$s}, not null.
-     * @return the formatted string, not null.
+     * @param format  the format string, optionally containing {@code %1$s}, {@code %2$s} and {@code %3$s}, not null
+     * @return the formatted string, not null
      */
     public String toString(final String format) {
         return String.format(format, getLeft(), getMiddle(), getRight());
     }
 
 }
-
diff --git a/src/main/java/org/apache/commons/lang3/util/FluentBitSet.java b/src/main/java/org/apache/commons/lang3/util/FluentBitSet.java
index 314cf0a6ed4..e78b0aa8c34 100644
--- a/src/main/java/org/apache/commons/lang3/util/FluentBitSet.java
+++ b/src/main/java/org/apache/commons/lang3/util/FluentBitSet.java
@@ -48,7 +48,7 @@ public FluentBitSet() {
     /**
      * Creates a new instance for the given bit set.
      *
-     * @param set The bit set to wrap.
+     * @param set the bit set to wrap
      */
     public FluentBitSet(final BitSet set) {
         this.bitSet = Objects.requireNonNull(set, "set");
@@ -58,8 +58,8 @@ public FluentBitSet(final BitSet set) {
      * Creates a bit set whose initial size is large enough to explicitly represent bits with indices in the range {@code 0}
      * through {@code nbits-1}. All bits are initially {@code false}.
      *
-     * @param nbits the initial size of the bit set.
-     * @throws NegativeArraySizeException if the specified initial size is negative.
+     * @param nbits the initial size of the bit set
+     * @throws NegativeArraySizeException if the specified initial size is negative
      */
     public FluentBitSet(final int nbits) {
         this(new BitSet(nbits));
@@ -70,8 +70,8 @@ public FluentBitSet(final int nbits) {
      * bit in it has the value {@code true} if and only if it both initially had the value {@code true} and the
      * corresponding bit in the bit set argument also had the value {@code true}.
      *
-     * @param set a bit set.
-     * @return {@code this} instance.
+     * @param set a bit set
+     * @return {@code this} instance
      */
     public FluentBitSet and(final BitSet set) {
         bitSet.and(set);
@@ -83,8 +83,8 @@ public FluentBitSet and(final BitSet set) {
      * bit in it has the value {@code true} if and only if it both initially had the value {@code true} and the
      * corresponding bit in the bit set argument also had the value {@code true}.
      *
-     * @param set a bit set.
-     * @return {@code this} instance.
+     * @param set a bit set
+     * @return {@code this} instance
      */
     public FluentBitSet and(final FluentBitSet set) {
         bitSet.and(set.bitSet);
@@ -94,8 +94,8 @@ public FluentBitSet and(final FluentBitSet set) {
     /**
      * Clears all of the bits in this {@link BitSet} whose corresponding bit is set in the specified {@link BitSet}.
      *
-     * @param set the {@link BitSet} with which to mask this {@link BitSet}.
-     * @return {@code this} instance.
+     * @param set the {@link BitSet} with which to mask this {@link BitSet}
+     * @return {@code this} instance
      */
     public FluentBitSet andNot(final BitSet set) {
         bitSet.andNot(set);
@@ -105,8 +105,8 @@ public FluentBitSet andNot(final BitSet set) {
     /**
      * Clears all of the bits in this {@link BitSet} whose corresponding bit is set in the specified {@link BitSet}.
      *
-     * @param set the {@link BitSet} with which to mask this {@link BitSet}.
-     * @return {@code this} instance.
+     * @param set the {@link BitSet} with which to mask this {@link BitSet}
+     * @return {@code this} instance
      */
     public FluentBitSet andNot(final FluentBitSet set) {
         this.bitSet.andNot(set.bitSet);
@@ -116,7 +116,7 @@ public FluentBitSet andNot(final FluentBitSet set) {
     /**
      * Gets the wrapped bit set.
      *
-     * @return the wrapped bit set.
+     * @return the wrapped bit set
      */
     public BitSet bitSet() {
         return bitSet;
@@ -125,7 +125,7 @@ public BitSet bitSet() {
     /**
      * Returns the number of bits set to {@code true} in this {@link BitSet}.
      *
-     * @return the number of bits set to {@code true} in this {@link BitSet}.
+     * @return the number of bits set to {@code true} in this {@link BitSet}
      */
     public int cardinality() {
         return bitSet.cardinality();
@@ -134,7 +134,7 @@ public int cardinality() {
     /**
      * Sets all of the bits in this BitSet to {@code false}.
      *
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public FluentBitSet clear() {
         bitSet.clear();
@@ -144,9 +144,9 @@ public FluentBitSet clear() {
     /**
      * Sets the bits specified by the indexes to {@code false}.
      *
-     * @param bitIndexArray the index of the bit to be cleared.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
-     * @return {@code this} instance.
+     * @param bitIndexArray the index of the bit to be cleared
+     * @return {@code this} instance
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public FluentBitSet clear(final int... bitIndexArray) {
         for (final int e : bitIndexArray) {
@@ -158,9 +158,9 @@ public FluentBitSet clear(final int... bitIndexArray) {
     /**
      * Sets the bit specified by the index to {@code false}.
      *
-     * @param bitIndex the index of the bit to be cleared.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
-     * @return {@code this} instance.
+     * @param bitIndex the index of the bit to be cleared
+     * @return {@code this} instance
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public FluentBitSet clear(final int bitIndex) {
         bitSet.clear(bitIndex);
@@ -171,11 +171,11 @@ public FluentBitSet clear(final int bitIndex) {
      * Sets the bits from the specified {@code fromIndex} (inclusive) to the specified {@code toIndex} (exclusive) to
      * {@code false}.
      *
-     * @param fromIndex index of the first bit to be cleared.
-     * @param toIndex index after the last bit to be cleared.
+     * @param fromIndex index of the first bit to be cleared
+     * @param toIndex index after the last bit to be cleared
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if {@code fromIndex} is negative, or {@code toIndex} is negative, or
-     *         {@code fromIndex} is larger than {@code toIndex}.
-     * @return {@code this} instance.
+     *         {@code fromIndex} is larger than {@code toIndex}
      */
     public FluentBitSet clear(final int fromIndex, final int toIndex) {
         bitSet.clear(fromIndex, toIndex);
@@ -209,9 +209,9 @@ public boolean equals(final Object obj) {
     /**
      * Sets the bit at the specified index to the complement of its current value.
      *
-     * @param bitIndex the index of the bit to flip.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
-     * @return {@code this} instance.
+     * @param bitIndex the index of the bit to flip
+     * @return {@code this} instance
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public FluentBitSet flip(final int bitIndex) {
         bitSet.flip(bitIndex);
@@ -222,11 +222,11 @@ public FluentBitSet flip(final int bitIndex) {
      * Sets each bit from the specified {@code fromIndex} (inclusive) to the specified {@code toIndex} (exclusive) to the
      * complement of its current value.
      *
-     * @param fromIndex index of the first bit to flip.
-     * @param toIndex index after the last bit to flip.
+     * @param fromIndex index of the first bit to flip
+     * @param toIndex index after the last bit to flip
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if {@code fromIndex} is negative, or {@code toIndex} is negative, or
-     *         {@code fromIndex} is larger than {@code toIndex}.
-     * @return {@code this} instance.
+     *         {@code fromIndex} is larger than {@code toIndex}
      */
     public FluentBitSet flip(final int fromIndex, final int toIndex) {
         bitSet.flip(fromIndex, toIndex);
@@ -237,9 +237,9 @@ public FluentBitSet flip(final int fromIndex, final int toIndex) {
      * Gets the value of the bit with the specified index. The value is {@code true} if the bit with the index
      * {@code bitIndex} is currently set in this {@link BitSet}; otherwise, the result is {@code false}.
      *
-     * @param bitIndex the bit index.
-     * @return the value of the bit with the specified index.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
+     * @param bitIndex the bit index
+     * @return the value of the bit with the specified index
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public boolean get(final int bitIndex) {
         return bitSet.get(bitIndex);
@@ -249,11 +249,11 @@ public boolean get(final int bitIndex) {
      * Gets a new {@link BitSet} composed of bits from this {@link BitSet} from {@code fromIndex} (inclusive) to
      * {@code toIndex} (exclusive).
      *
-     * @param fromIndex index of the first bit to include.
-     * @param toIndex index after the last bit to include.
-     * @return a new {@link BitSet} from a range of this {@link BitSet}.
+     * @param fromIndex index of the first bit to include
+     * @param toIndex index after the last bit to include
+     * @return a new {@link BitSet} from a range of this {@link BitSet}
      * @throws IndexOutOfBoundsException if {@code fromIndex} is negative, or {@code toIndex} is negative, or
-     *         {@code fromIndex} is larger than {@code toIndex}.
+     *         {@code fromIndex} is larger than {@code toIndex}
      */
     public FluentBitSet get(final int fromIndex, final int toIndex) {
         return new FluentBitSet(bitSet.get(fromIndex, toIndex));
@@ -268,8 +268,8 @@ public int hashCode() {
      * Returns true if the specified {@link BitSet} has any bits set to {@code true} that are also set to {@code true} in
      * this {@link BitSet}.
      *
-     * @param set {@link BitSet} to intersect with.
-     * @return boolean indicating whether this {@link BitSet} intersects the specified {@link BitSet}.
+     * @param set {@link BitSet} to intersect with
+     * @return boolean indicating whether this {@link BitSet} intersects the specified {@link BitSet}
      */
     public boolean intersects(final BitSet set) {
         return bitSet.intersects(set);
@@ -279,8 +279,8 @@ public boolean intersects(final BitSet set) {
      * Returns true if the specified {@link BitSet} has any bits set to {@code true} that are also set to {@code true} in
      * this {@link BitSet}.
      *
-     * @param set {@link BitSet} to intersect with.
-     * @return boolean indicating whether this {@link BitSet} intersects the specified {@link BitSet}.
+     * @param set {@link BitSet} to intersect with
+     * @return boolean indicating whether this {@link BitSet} intersects the specified {@link BitSet}
      */
     public boolean intersects(final FluentBitSet set) {
         return bitSet.intersects(set.bitSet);
@@ -289,7 +289,7 @@ public boolean intersects(final FluentBitSet set) {
     /**
      * Tests whether if this {@link BitSet} contains no bits that are set to {@code true}.
      *
-     * @return boolean indicating whether this {@link BitSet} is empty.
+     * @return boolean indicating whether this {@link BitSet} is empty
      */
     public boolean isEmpty() {
         return bitSet.isEmpty();
@@ -299,7 +299,7 @@ public boolean isEmpty() {
      * Returns the "logical size" of this {@link BitSet}: the index of the highest set bit in the {@link BitSet} plus one.
      * Returns zero if the {@link BitSet} contains no set bits.
      *
-     * @return the logical size of this {@link BitSet}.
+     * @return the logical size of this {@link BitSet}
      */
     public int length() {
         return bitSet.length();
@@ -308,9 +308,9 @@ public int length() {
     /**
      * Returns the index of the first bit that is set to {@code false} that occurs on or after the specified starting index.
      *
-     * @param fromIndex the index to start checking from (inclusive).
-     * @return the index of the next clear bit.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
+     * @param fromIndex the index to start checking from (inclusive)
+     * @return the index of the next clear bit
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public int nextClearBit(final int fromIndex) {
         return bitSet.nextClearBit(fromIndex);
@@ -333,9 +333,9 @@ public int nextClearBit(final int fromIndex) {
      * }}
      * </pre>
      *
-     * @param fromIndex the index to start checking from (inclusive).
-     * @return the index of the next set bit, or {@code -1} if there is no such bit.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
+     * @param fromIndex the index to start checking from (inclusive)
+     * @return the index of the next set bit, or {@code -1} if there is no such bit
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public int nextSetBit(final int fromIndex) {
         return bitSet.nextSetBit(fromIndex);
@@ -346,8 +346,8 @@ public int nextSetBit(final int fromIndex) {
      * has the value {@code true} if and only if it either already had the value {@code true} or the corresponding bit in
      * the bit set argument has the value {@code true}.
      *
-     * @param set a bit set.
-     * @return {@code this} instance.
+     * @param set a bit set
+     * @return {@code this} instance
      */
     public FluentBitSet or(final BitSet set) {
         bitSet.or(set);
@@ -359,8 +359,8 @@ public FluentBitSet or(final BitSet set) {
      * has the value {@code true} if and only if it either already had the value {@code true} or the corresponding bit in
      * the bit set argument has the value {@code true}.
      *
-     * @param set a bit set.
-     * @return {@code this} instance.
+     * @param set a bit set
+     * @return {@code this} instance
      */
     public FluentBitSet or(final FluentBitSet... set) {
         for (final FluentBitSet e : set) {
@@ -374,8 +374,8 @@ public FluentBitSet or(final FluentBitSet... set) {
      * has the value {@code true} if and only if it either already had the value {@code true} or the corresponding bit in
      * the bit set argument has the value {@code true}.
      *
-     * @param set a bit set.
-     * @return {@code this} instance.
+     * @param set a bit set
+     * @return {@code this} instance
      */
     public FluentBitSet or(final FluentBitSet set) {
         this.bitSet.or(set.bitSet);
@@ -386,9 +386,9 @@ public FluentBitSet or(final FluentBitSet set) {
      * Returns the index of the nearest bit that is set to {@code false} that occurs on or before the specified starting
      * index. If no such bit exists, or if {@code -1} is given as the starting index, then {@code -1} is returned.
      *
-     * @param fromIndex the index to start checking from (inclusive).
-     * @return the index of the previous clear bit, or {@code -1} if there is no such bit.
-     * @throws IndexOutOfBoundsException if the specified index is less than {@code -1}.
+     * @param fromIndex the index to start checking from (inclusive)
+     * @return the index of the previous clear bit, or {@code -1} if there is no such bit
+     * @throws IndexOutOfBoundsException if the specified index is less than {@code -1}
      */
     public int previousClearBit(final int fromIndex) {
         return bitSet.previousClearBit(fromIndex);
@@ -419,9 +419,9 @@ public int previousSetBit(final int fromIndex) {
     /**
      * Sets the bit at the specified indexes to {@code true}.
      *
-     * @param bitIndexArray a bit index array.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
-     * @return {@code this} instance.
+     * @param bitIndexArray a bit index array
+     * @return {@code this} instance
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public FluentBitSet set(final int... bitIndexArray) {
         for (final int e : bitIndexArray) {
@@ -434,8 +434,8 @@ public FluentBitSet set(final int... bitIndexArray) {
      * Sets the bit at the specified index to {@code true}.
      *
      * @param bitIndex a bit index
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if the specified index is negative
-     * @return {@code this} instance.
      */
     public FluentBitSet set(final int bitIndex) {
         bitSet.set(bitIndex);
@@ -445,10 +445,10 @@ public FluentBitSet set(final int bitIndex) {
     /**
      * Sets the bit at the specified index to the specified value.
      *
-     * @param bitIndex a bit index.
-     * @param value a boolean value to set.
-     * @throws IndexOutOfBoundsException if the specified index is negative.
-     * @return {@code this} instance.
+     * @param bitIndex a bit index
+     * @param value a boolean value to set
+     * @return {@code this} instance
+     * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public FluentBitSet set(final int bitIndex, final boolean value) {
         bitSet.set(bitIndex, value);
@@ -459,11 +459,11 @@ public FluentBitSet set(final int bitIndex, final boolean value) {
      * Sets the bits from the specified {@code fromIndex} (inclusive) to the specified {@code toIndex} (exclusive) to
      * {@code true}.
      *
-     * @param fromIndex index of the first bit to be set.
-     * @param toIndex index after the last bit to be set.
+     * @param fromIndex index of the first bit to be set
+     * @param toIndex index after the last bit to be set
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if {@code fromIndex} is negative, or {@code toIndex} is negative, or
-     *         {@code fromIndex} is larger than {@code toIndex}.
-     * @return {@code this} instance.
+     *         {@code fromIndex} is larger than {@code toIndex}
      */
     public FluentBitSet set(final int fromIndex, final int toIndex) {
         bitSet.set(fromIndex, toIndex);
@@ -474,12 +474,12 @@ public FluentBitSet set(final int fromIndex, final int toIndex) {
      * Sets the bits from the specified {@code fromIndex} (inclusive) to the specified {@code toIndex} (exclusive) to the
      * specified value.
      *
-     * @param fromIndex index of the first bit to be set.
-     * @param toIndex index after the last bit to be set.
-     * @param value value to set the selected bits to.
+     * @param fromIndex index of the first bit to be set
+     * @param toIndex index after the last bit to be set
+     * @param value value to set the selected bits to
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if {@code fromIndex} is negative, or {@code toIndex} is negative, or
-     *         {@code fromIndex} is larger than {@code toIndex}.
-     * @return {@code this} instance.
+     *         {@code fromIndex} is larger than {@code toIndex}
      */
     public FluentBitSet set(final int fromIndex, final int toIndex, final boolean value) {
         bitSet.set(fromIndex, toIndex, value);
@@ -492,9 +492,9 @@ public FluentBitSet set(final int fromIndex, final int toIndex, final boolean va
      *
      * @param fromIndex index of the first bit to be set
      * @param toIndex index of the last bit to be set
+     * @return {@code this} instance
      * @throws IndexOutOfBoundsException if {@code fromIndex} is negative, or {@code toIndex} is negative, or
      *         {@code fromIndex} is larger than {@code toIndex}
-     * @return {@code this} instance.
      */
     public FluentBitSet setInclusive(final int fromIndex, final int toIndex) {
         bitSet.set(fromIndex, toIndex + 1);
@@ -505,7 +505,7 @@ public FluentBitSet setInclusive(final int fromIndex, final int toIndex) {
      * Returns the number of bits of space actually in use by this {@link BitSet} to represent bit values. The maximum
      * element in the set is the size - 1st element.
      *
-     * @return the number of bits currently in this bit set.
+     * @return the number of bits currently in this bit set
      */
     public int size() {
         return bitSet.size();
@@ -521,7 +521,7 @@ public int size() {
      * terminal stream operation is undefined.
      * </p>
      *
-     * @return a stream of integers representing set indices.
+     * @return a stream of integers representing set indices
      * @since 1.8
      */
     public IntStream stream() {
@@ -582,7 +582,7 @@ public String toString() {
      * </ul>
      *
      * @param set a bit set
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public FluentBitSet xor(final BitSet set) {
         bitSet.xor(set);
@@ -600,7 +600,7 @@ public FluentBitSet xor(final BitSet set) {
      * </ul>
      *
      * @param set a bit set
-     * @return {@code this} instance.
+     * @return {@code this} instance
      */
     public FluentBitSet xor(final FluentBitSet set) {
         bitSet.xor(set.bitSet);
diff --git a/src/main/java/org/apache/commons/lang3/util/IterableStringTokenizer.java b/src/main/java/org/apache/commons/lang3/util/IterableStringTokenizer.java
index a73fafd208b..834c42ce714 100644
--- a/src/main/java/org/apache/commons/lang3/util/IterableStringTokenizer.java
+++ b/src/main/java/org/apache/commons/lang3/util/IterableStringTokenizer.java
@@ -37,8 +37,8 @@ public class IterableStringTokenizer extends StringTokenizer implements Iterable
     /**
      * Constructs a new instance like {@link StringTokenizer#StringTokenizer(String, String, boolean)}.
      *
-     * @param str a string to be parsed.
-     * @exception NullPointerException if str is {@code null}.
+     * @param str a string to be parsed
+     * @throws NullPointerException if str is {@code null}
      */
     public IterableStringTokenizer(final String str) {
         super(str);
@@ -47,9 +47,9 @@ public IterableStringTokenizer(final String str) {
     /**
      * Constructs a new instance like {@link StringTokenizer#StringTokenizer(String, String, boolean)}.
      *
-     * @param str   a string to be parsed.
-     * @param delim the delimiters.
-     * @exception NullPointerException if str is {@code null}.
+     * @param str   a string to be parsed
+     * @param delim the delimiters
+     * @throws NullPointerException if str is {@code null}
      */
     public IterableStringTokenizer(final String str, final String delim) {
         super(str, delim);
@@ -58,10 +58,10 @@ public IterableStringTokenizer(final String str, final String delim) {
     /**
      * Constructs a new instance like {@link StringTokenizer#StringTokenizer(String, String, boolean)}.
      *
-     * @param str          a string to be parsed.
-     * @param delim        the delimiters.
-     * @param returnDelims flag indicating whether to return the delimiters as tokens.
-     * @exception NullPointerException if str is {@code null}.
+     * @param str          a string to be parsed
+     * @param delim        the delimiters
+     * @param returnDelims flag indicating whether to return the delimiters as tokens
+     * @throws NullPointerException if str is {@code null}
      */
     public IterableStringTokenizer(final String str, final String delim, final boolean returnDelims) {
         super(str, delim, returnDelims);
@@ -86,7 +86,7 @@ public String next() {
     /**
      * Returns a new {@code String[]} containing the tokenizer elements.
      *
-     * @return a new {@code String[]}.
+     * @return a new {@code String[]}
      */
     public String[] toArray() {
         return toList().toArray(ArrayUtils.EMPTY_STRING_ARRAY);
@@ -95,7 +95,7 @@ public String[] toArray() {
     /**
      * Returns a new {@link List} containing the tokenizer elements.
      *
-     * @return a new {@link List}.
+     * @return a new {@link List}
      */
     public List<String> toList() {
         final List<String> list = new ArrayList<>();
@@ -106,7 +106,7 @@ public List<String> toList() {
     /**
      * Returns a sequential stream on this Iterable instance.
      *
-     * @return a sequential stream on this Iterable instance.
+     * @return a sequential stream on this Iterable instance
      */
     public Stream<String> toStream() {
         return StreamSupport.stream(spliterator(), false);