Skip to content

Commit 73a31d9

Browse files
author
Gary Gregory
committed
Provide an exception message.
1 parent d203ffc commit 73a31d9

8 files changed

Lines changed: 21 additions & 21 deletions

File tree

src/main/java/org/apache/commons/io/StandardLineSeparator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public enum StandardLineSeparator {
5050
* @param lineSeparator a non-null line separator.
5151
*/
5252
StandardLineSeparator(final String lineSeparator) {
53-
this.lineSeparator = Objects.requireNonNull(lineSeparator);
53+
this.lineSeparator = Objects.requireNonNull(lineSeparator, "lineSeparator");
5454
}
5555

5656
/**

src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public AndFileFilter() {
6060
* @param initialList the initial list.
6161
*/
6262
private AndFileFilter(final ArrayList<IOFileFilter> initialList) {
63-
this.fileFilters = Objects.requireNonNull(initialList);
63+
this.fileFilters = Objects.requireNonNull(initialList, "initialList");
6464
}
6565

6666
/**
@@ -104,7 +104,7 @@ public AndFileFilter(final IOFileFilter... fileFilters) {
104104
* @since 1.1
105105
*/
106106
public AndFileFilter(final List<IOFileFilter> fileFilters) {
107-
this(new ArrayList<>(Objects.requireNonNull(fileFilters)));
107+
this(new ArrayList<>(Objects.requireNonNull(fileFilters, "fileFilters")));
108108
}
109109

110110
/**

src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public OrFileFilter() {
5656
* @param initialList the initial list.
5757
*/
5858
private OrFileFilter(final ArrayList<IOFileFilter> initialList) {
59-
this.fileFilters = Objects.requireNonNull(initialList);
59+
this.fileFilters = Objects.requireNonNull(initialList, "initialList");
6060
}
6161

6262
/**
@@ -99,7 +99,7 @@ public OrFileFilter(final IOFileFilter filter1, final IOFileFilter filter2) {
9999
* @since 1.1
100100
*/
101101
public OrFileFilter(final List<IOFileFilter> fileFilters) {
102-
this(new ArrayList<>(Objects.requireNonNull(fileFilters)));
102+
this(new ArrayList<>(Objects.requireNonNull(fileFilters, "fileFilters")));
103103
}
104104

105105
/**

src/main/java/org/apache/commons/io/function/IOConsumer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public interface IOConsumer<T> {
4949
* @throws NullPointerException if {@code after} is null
5050
*/
5151
default IOConsumer<T> andThen(final IOConsumer<? super T> after) {
52-
Objects.requireNonNull(after);
52+
Objects.requireNonNull(after, "after");
5353
return (final T t) -> {
5454
accept(t);
5555
after.accept(t);

src/main/java/org/apache/commons/io/function/IOFunction.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public interface IOFunction<T, R> {
5959
* @see #andThen(IOFunction)
6060
*/
6161
default <V> IOFunction<V, R> compose(final IOFunction<? super V, ? extends T> before) {
62-
Objects.requireNonNull(before);
62+
Objects.requireNonNull(before, "before");
6363
return (final V v) -> apply(before.apply(v));
6464
}
6565

@@ -79,7 +79,7 @@ default <V> IOFunction<V, R> compose(final IOFunction<? super V, ? extends T> be
7979
* @see #andThen(IOFunction)
8080
*/
8181
default <V> IOFunction<V, R> compose(final Function<? super V, ? extends T> before) {
82-
Objects.requireNonNull(before);
82+
Objects.requireNonNull(before, "before");
8383
return (final V v) -> apply(before.apply(v));
8484
}
8585

@@ -97,7 +97,7 @@ default <V> IOFunction<V, R> compose(final Function<? super V, ? extends T> befo
9797
* @see #andThen(IOFunction)
9898
*/
9999
default IOSupplier<R> compose(final IOSupplier<? extends T> before) {
100-
Objects.requireNonNull(before);
100+
Objects.requireNonNull(before, "before");
101101
return () -> apply(before.get());
102102
}
103103

@@ -115,7 +115,7 @@ default IOSupplier<R> compose(final IOSupplier<? extends T> before) {
115115
* @see #andThen(IOFunction)
116116
*/
117117
default IOSupplier<R> compose(final Supplier<? extends T> before) {
118-
Objects.requireNonNull(before);
118+
Objects.requireNonNull(before, "before");
119119
return () -> apply(before.get());
120120
}
121121

@@ -135,7 +135,7 @@ default IOSupplier<R> compose(final Supplier<? extends T> before) {
135135
* @see #compose(IOFunction)
136136
*/
137137
default <V> IOFunction<T, V> andThen(final IOFunction<? super R, ? extends V> after) {
138-
Objects.requireNonNull(after);
138+
Objects.requireNonNull(after, "after");
139139
return (final T t) -> after.apply(apply(t));
140140
}
141141

@@ -155,7 +155,7 @@ default <V> IOFunction<T, V> andThen(final IOFunction<? super R, ? extends V> af
155155
* @see #compose(IOFunction)
156156
*/
157157
default <V> IOFunction<T, V> andThen(final Function<? super R, ? extends V> after) {
158-
Objects.requireNonNull(after);
158+
Objects.requireNonNull(after, "after");
159159
return (final T t) -> after.apply(apply(t));
160160
}
161161

@@ -173,7 +173,7 @@ default <V> IOFunction<T, V> andThen(final Function<? super R, ? extends V> afte
173173
* @see #compose(IOFunction)
174174
*/
175175
default IOConsumer<T> andThen(final IOConsumer<? super R> after) {
176-
Objects.requireNonNull(after);
176+
Objects.requireNonNull(after, "after");
177177
return (final T t) -> after.accept(apply(t));
178178
}
179179

@@ -191,7 +191,7 @@ default IOConsumer<T> andThen(final IOConsumer<? super R> after) {
191191
* @see #compose(IOFunction)
192192
*/
193193
default IOConsumer<T> andThen(final Consumer<? super R> after) {
194-
Objects.requireNonNull(after);
194+
Objects.requireNonNull(after, "after");
195195
return (final T t) -> after.accept(apply(t));
196196
}
197197

src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class UnsynchronizedByteArrayInputStream extends InputStream {
6565
* @param data the buffer
6666
*/
6767
public UnsynchronizedByteArrayInputStream(final byte[] data) {
68-
this.data = Objects.requireNonNull(data);
68+
this.data = Objects.requireNonNull(data, "data");
6969
this.offset = 0;
7070
this.eod = data.length;
7171
this.markedOffset = this.offset;
@@ -80,7 +80,7 @@ public UnsynchronizedByteArrayInputStream(final byte[] data) {
8080
* @throws IllegalArgumentException if the offset is less than zero
8181
*/
8282
public UnsynchronizedByteArrayInputStream(final byte[] data, final int offset) {
83-
Objects.requireNonNull(data);
83+
Objects.requireNonNull(data, "data");
8484
if (offset < 0) {
8585
throw new IllegalArgumentException("offset cannot be negative");
8686
}
@@ -107,7 +107,7 @@ public UnsynchronizedByteArrayInputStream(final byte[] data, final int offset, f
107107
if (length < 0) {
108108
throw new IllegalArgumentException("length cannot be negative");
109109
}
110-
this.data = Objects.requireNonNull(data);
110+
this.data = Objects.requireNonNull(data, "data");
111111
this.offset = min(offset, data.length > 0 ? data.length : offset);
112112
this.eod = min(this.offset + length, data.length);
113113
this.markedOffset = this.offset;
@@ -125,13 +125,13 @@ public int read() {
125125

126126
@Override
127127
public int read(final byte[] dest) {
128-
Objects.requireNonNull(dest);
128+
Objects.requireNonNull(dest, "dest");
129129
return read(dest, 0, dest.length);
130130
}
131131

132132
@Override
133133
public int read(final byte[] dest, final int off, final int len) {
134-
Objects.requireNonNull(dest);
134+
Objects.requireNonNull(dest, "dest");
135135
if (off < 0 || len < 0 || off + len > dest.length) {
136136
throw new IndexOutOfBoundsException();
137137
}

src/main/java/org/apache/commons/io/input/XmlStreamReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public String getDefaultEncoding() {
141141
* @throws IOException thrown if there is a problem reading the file.
142142
*/
143143
public XmlStreamReader(final File file) throws IOException {
144-
this(new FileInputStream(Objects.requireNonNull(file)));
144+
this(new FileInputStream(Objects.requireNonNull(file, "file")));
145145
}
146146

147147
/**

src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public byte read() {
8787
* exception.
8888
*/
8989
public void read(final byte[] targetBuffer, final int targetOffset, final int length) {
90-
Objects.requireNonNull(targetBuffer);
90+
Objects.requireNonNull(targetBuffer, "targetBuffer");
9191
if (targetOffset < 0 || targetOffset >= targetBuffer.length) {
9292
throw new IllegalArgumentException("Invalid offset: " + targetOffset);
9393
}

0 commit comments

Comments
 (0)