This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push: new 73a31d9 Provide an exception message. 73a31d9 is described below commit 73a31d9a2f0f194a2e115f33fbf6786ef056408d Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Tue Jan 12 12:35:18 2021 -0500 Provide an exception message. --- .../org/apache/commons/io/StandardLineSeparator.java | 2 +- .../org/apache/commons/io/filefilter/AndFileFilter.java | 4 ++-- .../org/apache/commons/io/filefilter/OrFileFilter.java | 4 ++-- .../java/org/apache/commons/io/function/IOConsumer.java | 2 +- .../java/org/apache/commons/io/function/IOFunction.java | 16 ++++++++-------- .../io/input/UnsynchronizedByteArrayInputStream.java | 10 +++++----- .../org/apache/commons/io/input/XmlStreamReader.java | 2 +- .../commons/io/input/buffer/CircularByteBuffer.java | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/apache/commons/io/StandardLineSeparator.java b/src/main/java/org/apache/commons/io/StandardLineSeparator.java index 9008dde..c0b4ff9 100644 --- a/src/main/java/org/apache/commons/io/StandardLineSeparator.java +++ b/src/main/java/org/apache/commons/io/StandardLineSeparator.java @@ -50,7 +50,7 @@ public enum StandardLineSeparator { * @param lineSeparator a non-null line separator. */ StandardLineSeparator(final String lineSeparator) { - this.lineSeparator = Objects.requireNonNull(lineSeparator); + this.lineSeparator = Objects.requireNonNull(lineSeparator, "lineSeparator"); } /** diff --git a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java index 25c66ea..deaa8e8 100644 --- a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java @@ -60,7 +60,7 @@ public class AndFileFilter * @param initialList the initial list. */ private AndFileFilter(final ArrayList<IOFileFilter> initialList) { - this.fileFilters = Objects.requireNonNull(initialList); + this.fileFilters = Objects.requireNonNull(initialList, "initialList"); } /** @@ -104,7 +104,7 @@ public class AndFileFilter * @since 1.1 */ public AndFileFilter(final List<IOFileFilter> fileFilters) { - this(new ArrayList<>(Objects.requireNonNull(fileFilters))); + this(new ArrayList<>(Objects.requireNonNull(fileFilters, "fileFilters"))); } /** diff --git a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java index 9f6e960..b26f048 100644 --- a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java @@ -56,7 +56,7 @@ public class OrFileFilter extends AbstractFileFilter implements ConditionalFileF * @param initialList the initial list. */ private OrFileFilter(final ArrayList<IOFileFilter> initialList) { - this.fileFilters = Objects.requireNonNull(initialList); + this.fileFilters = Objects.requireNonNull(initialList, "initialList"); } /** @@ -99,7 +99,7 @@ public class OrFileFilter extends AbstractFileFilter implements ConditionalFileF * @since 1.1 */ public OrFileFilter(final List<IOFileFilter> fileFilters) { - this(new ArrayList<>(Objects.requireNonNull(fileFilters))); + this(new ArrayList<>(Objects.requireNonNull(fileFilters, "fileFilters"))); } /** diff --git a/src/main/java/org/apache/commons/io/function/IOConsumer.java b/src/main/java/org/apache/commons/io/function/IOConsumer.java index 12d4ed9..c730f9f 100644 --- a/src/main/java/org/apache/commons/io/function/IOConsumer.java +++ b/src/main/java/org/apache/commons/io/function/IOConsumer.java @@ -49,7 +49,7 @@ public interface IOConsumer<T> { * @throws NullPointerException if {@code after} is null */ default IOConsumer<T> andThen(final IOConsumer<? super T> after) { - Objects.requireNonNull(after); + Objects.requireNonNull(after, "after"); return (final T t) -> { accept(t); after.accept(t); diff --git a/src/main/java/org/apache/commons/io/function/IOFunction.java b/src/main/java/org/apache/commons/io/function/IOFunction.java index 7089003..4129f57 100644 --- a/src/main/java/org/apache/commons/io/function/IOFunction.java +++ b/src/main/java/org/apache/commons/io/function/IOFunction.java @@ -59,7 +59,7 @@ public interface IOFunction<T, R> { * @see #andThen(IOFunction) */ default <V> IOFunction<V, R> compose(final IOFunction<? super V, ? extends T> before) { - Objects.requireNonNull(before); + Objects.requireNonNull(before, "before"); return (final V v) -> apply(before.apply(v)); } @@ -79,7 +79,7 @@ public interface IOFunction<T, R> { * @see #andThen(IOFunction) */ default <V> IOFunction<V, R> compose(final Function<? super V, ? extends T> before) { - Objects.requireNonNull(before); + Objects.requireNonNull(before, "before"); return (final V v) -> apply(before.apply(v)); } @@ -97,7 +97,7 @@ public interface IOFunction<T, R> { * @see #andThen(IOFunction) */ default IOSupplier<R> compose(final IOSupplier<? extends T> before) { - Objects.requireNonNull(before); + Objects.requireNonNull(before, "before"); return () -> apply(before.get()); } @@ -115,7 +115,7 @@ public interface IOFunction<T, R> { * @see #andThen(IOFunction) */ default IOSupplier<R> compose(final Supplier<? extends T> before) { - Objects.requireNonNull(before); + Objects.requireNonNull(before, "before"); return () -> apply(before.get()); } @@ -135,7 +135,7 @@ public interface IOFunction<T, R> { * @see #compose(IOFunction) */ default <V> IOFunction<T, V> andThen(final IOFunction<? super R, ? extends V> after) { - Objects.requireNonNull(after); + Objects.requireNonNull(after, "after"); return (final T t) -> after.apply(apply(t)); } @@ -155,7 +155,7 @@ public interface IOFunction<T, R> { * @see #compose(IOFunction) */ default <V> IOFunction<T, V> andThen(final Function<? super R, ? extends V> after) { - Objects.requireNonNull(after); + Objects.requireNonNull(after, "after"); return (final T t) -> after.apply(apply(t)); } @@ -173,7 +173,7 @@ public interface IOFunction<T, R> { * @see #compose(IOFunction) */ default IOConsumer<T> andThen(final IOConsumer<? super R> after) { - Objects.requireNonNull(after); + Objects.requireNonNull(after, "after"); return (final T t) -> after.accept(apply(t)); } @@ -191,7 +191,7 @@ public interface IOFunction<T, R> { * @see #compose(IOFunction) */ default IOConsumer<T> andThen(final Consumer<? super R> after) { - Objects.requireNonNull(after); + Objects.requireNonNull(after, "after"); return (final T t) -> after.accept(apply(t)); } diff --git a/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java b/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java index 638e9d3..86ab4be 100644 --- a/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java +++ b/src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java @@ -65,7 +65,7 @@ public class UnsynchronizedByteArrayInputStream extends InputStream { * @param data the buffer */ public UnsynchronizedByteArrayInputStream(final byte[] data) { - this.data = Objects.requireNonNull(data); + this.data = Objects.requireNonNull(data, "data"); this.offset = 0; this.eod = data.length; this.markedOffset = this.offset; @@ -80,7 +80,7 @@ public class UnsynchronizedByteArrayInputStream extends InputStream { * @throws IllegalArgumentException if the offset is less than zero */ public UnsynchronizedByteArrayInputStream(final byte[] data, final int offset) { - Objects.requireNonNull(data); + Objects.requireNonNull(data, "data"); if (offset < 0) { throw new IllegalArgumentException("offset cannot be negative"); } @@ -107,7 +107,7 @@ public class UnsynchronizedByteArrayInputStream extends InputStream { if (length < 0) { throw new IllegalArgumentException("length cannot be negative"); } - this.data = Objects.requireNonNull(data); + this.data = Objects.requireNonNull(data, "data"); this.offset = min(offset, data.length > 0 ? data.length : offset); this.eod = min(this.offset + length, data.length); this.markedOffset = this.offset; @@ -125,13 +125,13 @@ public class UnsynchronizedByteArrayInputStream extends InputStream { @Override public int read(final byte[] dest) { - Objects.requireNonNull(dest); + Objects.requireNonNull(dest, "dest"); return read(dest, 0, dest.length); } @Override public int read(final byte[] dest, final int off, final int len) { - Objects.requireNonNull(dest); + Objects.requireNonNull(dest, "dest"); if (off < 0 || len < 0 || off + len > dest.length) { throw new IndexOutOfBoundsException(); } diff --git a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java index f4144a8..5764962 100644 --- a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java +++ b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java @@ -141,7 +141,7 @@ public class XmlStreamReader extends Reader { * @throws IOException thrown if there is a problem reading the file. */ public XmlStreamReader(final File file) throws IOException { - this(new FileInputStream(Objects.requireNonNull(file))); + this(new FileInputStream(Objects.requireNonNull(file, "file"))); } /** diff --git a/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java b/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java index 3556569..729fb36 100644 --- a/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java +++ b/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java @@ -87,7 +87,7 @@ public class CircularByteBuffer { * exception. */ public void read(final byte[] targetBuffer, final int targetOffset, final int length) { - Objects.requireNonNull(targetBuffer); + Objects.requireNonNull(targetBuffer, "targetBuffer"); if (targetOffset < 0 || targetOffset >= targetBuffer.length) { throw new IllegalArgumentException("Invalid offset: " + targetOffset); }