Skip to content

Commit f0fba1b

Browse files
author
Gary Gregory
committed
Add NullInputStream.INSTANCE.
Add @SuppressWarnings("resource").
1 parent fbc646f commit f0fba1b

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

src/changes/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ The <action> type attribute can be add,update,fix,remove.
9696
<action dev="ggregory" type="add" due-to="Gary Gregory">
9797
Add NullWriter.INSTANCE and deprecate NULL_WRITER.
9898
</action>
99+
<action dev="ggregory" type="add" due-to="Gary Gregory">
100+
Add NullInputStream.INSTANCE.
101+
</action>
99102
<!-- UPDATE -->
100103
<action dev="ggregory" type="update" due-to="Dependabot">
101104
Bump Maven Javadoc plugin from 3.2.0 to 3.3.0.

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@
6767
*/
6868
public class NullInputStream extends InputStream {
6969

70+
/**
71+
* The singleton instance.
72+
*
73+
* @since 2.12.0
74+
*/
75+
public static final NullInputStream INSTANCE = new NullInputStream();
76+
7077
private final long size;
7178
private long position;
7279
private long mark = -1;

src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,15 +253,15 @@ public void testDataBytesCalled() throws Exception {
253253

254254
@Test
255255
public void testGetObservers0() throws IOException {
256-
try (final ObservableInputStream ois = new ObservableInputStream(new NullInputStream())) {
256+
try (final ObservableInputStream ois = new ObservableInputStream(NullInputStream.INSTANCE)) {
257257
assertTrue(ois.getObservers().isEmpty());
258258
}
259259
}
260260

261261
@Test
262262
public void testGetObservers1() throws IOException {
263263
final DataViewObserver observer0 = new DataViewObserver();
264-
try (final ObservableInputStream ois = new ObservableInputStream(new NullInputStream(), observer0)) {
264+
try (final ObservableInputStream ois = new ObservableInputStream(NullInputStream.INSTANCE, observer0)) {
265265
assertEquals(observer0, ois.getObservers().get(0));
266266
}
267267
}
@@ -270,7 +270,7 @@ public void testGetObservers1() throws IOException {
270270
public void testGetObserversOrder() throws IOException {
271271
final DataViewObserver observer0 = new DataViewObserver();
272272
final DataViewObserver observer1 = new DataViewObserver();
273-
try (final ObservableInputStream ois = new ObservableInputStream(new NullInputStream(), observer0, observer1)) {
273+
try (final ObservableInputStream ois = new ObservableInputStream(NullInputStream.INSTANCE, observer0, observer1)) {
274274
assertEquals(observer0, ois.getObservers().get(0));
275275
assertEquals(observer1, ois.getObservers().get(1));
276276
}

src/test/java/org/apache/commons/io/output/CloseShieldWriterTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class CloseShieldWriterTest {
3737

3838
private Writer shielded;
3939

40+
@SuppressWarnings("resource")
4041
@BeforeEach
4142
public void setUp() {
4243
original = spy(new StringBuilderWriter());

src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ public class ThrowOnCloseInputStream extends ProxyInputStream {
3030
/**
3131
* Default ctor.
3232
*/
33-
@SuppressWarnings("resource")
3433
public ThrowOnCloseInputStream() {
35-
super(new NullInputStream());
34+
super(NullInputStream.INSTANCE);
3635
}
3736

3837
/**

0 commit comments

Comments
 (0)