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 f0fba1b Add NullInputStream.INSTANCE.
f0fba1b is described below
commit f0fba1b4546894df3e7ef826cfd753900bdbf83c
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Jul 12 15:03:49 2021 -0400
Add NullInputStream.INSTANCE.
Add @SuppressWarnings("resource").
---
src/changes/changes.xml | 3 +++
src/main/java/org/apache/commons/io/input/NullInputStream.java | 7 +++++++
.../org/apache/commons/io/input/ObservableInputStreamTest.java | 6 +++---
.../java/org/apache/commons/io/output/CloseShieldWriterTest.java | 1 +
.../java/org/apache/commons/io/test/ThrowOnCloseInputStream.java | 3 +--
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 551e10f..fb993a6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -96,6 +96,9 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="add" due-to="Gary Gregory">
Add NullWriter.INSTANCE and deprecate NULL_WRITER.
</action>
+ <action dev="ggregory" type="add" due-to="Gary Gregory">
+ Add NullInputStream.INSTANCE.
+ </action>
<!-- UPDATE -->
<action dev="ggregory" type="update" due-to="Dependabot">
Bump Maven Javadoc plugin from 3.2.0 to 3.3.0.
diff --git a/src/main/java/org/apache/commons/io/input/NullInputStream.java
b/src/main/java/org/apache/commons/io/input/NullInputStream.java
index 80d7f4a..34363ec 100644
--- a/src/main/java/org/apache/commons/io/input/NullInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/NullInputStream.java
@@ -67,6 +67,13 @@ import java.io.InputStream;
*/
public class NullInputStream extends InputStream {
+ /**
+ * The singleton instance.
+ *
+ * @since 2.12.0
+ */
+ public static final NullInputStream INSTANCE = new NullInputStream();
+
private final long size;
private long position;
private long mark = -1;
diff --git
a/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
index f01618d..66b5cfb 100644
--- a/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java
@@ -253,7 +253,7 @@ public class ObservableInputStreamTest {
@Test
public void testGetObservers0() throws IOException {
- try (final ObservableInputStream ois = new ObservableInputStream(new
NullInputStream())) {
+ try (final ObservableInputStream ois = new
ObservableInputStream(NullInputStream.INSTANCE)) {
assertTrue(ois.getObservers().isEmpty());
}
}
@@ -261,7 +261,7 @@ public class ObservableInputStreamTest {
@Test
public void testGetObservers1() throws IOException {
final DataViewObserver observer0 = new DataViewObserver();
- try (final ObservableInputStream ois = new ObservableInputStream(new
NullInputStream(), observer0)) {
+ try (final ObservableInputStream ois = new
ObservableInputStream(NullInputStream.INSTANCE, observer0)) {
assertEquals(observer0, ois.getObservers().get(0));
}
}
@@ -270,7 +270,7 @@ public class ObservableInputStreamTest {
public void testGetObserversOrder() throws IOException {
final DataViewObserver observer0 = new DataViewObserver();
final DataViewObserver observer1 = new DataViewObserver();
- try (final ObservableInputStream ois = new ObservableInputStream(new
NullInputStream(), observer0, observer1)) {
+ try (final ObservableInputStream ois = new
ObservableInputStream(NullInputStream.INSTANCE, observer0, observer1)) {
assertEquals(observer0, ois.getObservers().get(0));
assertEquals(observer1, ois.getObservers().get(1));
}
diff --git
a/src/test/java/org/apache/commons/io/output/CloseShieldWriterTest.java
b/src/test/java/org/apache/commons/io/output/CloseShieldWriterTest.java
index a792868..b1069ef 100644
--- a/src/test/java/org/apache/commons/io/output/CloseShieldWriterTest.java
+++ b/src/test/java/org/apache/commons/io/output/CloseShieldWriterTest.java
@@ -37,6 +37,7 @@ public class CloseShieldWriterTest {
private Writer shielded;
+ @SuppressWarnings("resource")
@BeforeEach
public void setUp() {
original = spy(new StringBuilderWriter());
diff --git
a/src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java
b/src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java
index c8b9a5c..23fb058 100644
--- a/src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java
+++ b/src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java
@@ -30,9 +30,8 @@ public class ThrowOnCloseInputStream extends ProxyInputStream
{
/**
* Default ctor.
*/
- @SuppressWarnings("resource")
public ThrowOnCloseInputStream() {
- super(new NullInputStream());
+ super(NullInputStream.INSTANCE);
}
/**
