Skip to content

Commit e3dcc9d

Browse files
author
Gary Gregory
committed
Make ObservableInputStream.getObservers() public.
1 parent 59cf9ef commit e3dcc9d

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

src/changes/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ The <action> type attribute can be add,update,fix,remove.
160160
<action dev="ggregory" type="add" due-to="Gary Gregory">
161161
Add and use ObservableInputStream.ObservableInputStream(InputStream, Observer...).
162162
</action>
163+
<action dev="ggregory" type="add" due-to="Gary Gregory">
164+
Make ObservableInputStream.getObservers() public.
165+
</action>
163166
<!-- UPDATES -->
164167
<action dev="ggregory" type="update" due-to="Dependabot">
165168
Update junit-jupiter from 5.6.2 to 5.7.0 #153.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,9 @@ public void consume() throws IOException {
174174
* Gets all currently registered observers.
175175
*
176176
* @return a list of the currently registered observers
177+
* @since 2.9.0
177178
*/
178-
protected List<Observer> getObservers() {
179+
public List<Observer> getObservers() {
179180
return observers;
180181
}
181182

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.apache.commons.io.input;
1818

1919
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2120
import static org.junit.jupiter.api.Assertions.assertFalse;
21+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2222
import static org.junit.jupiter.api.Assertions.assertTrue;
2323

2424
import java.io.ByteArrayInputStream;
@@ -74,7 +74,7 @@ public void data(final byte[] pBuffer, final int pOffset, final int pLength) thr
7474
@Test
7575
public void testDataByteCalled_add() throws Exception {
7676
final byte[] buffer = MessageDigestCalculatingInputStreamTest
77-
.generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE);
77+
.generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE);
7878
final LastByteKeepingObserver lko = new LastByteKeepingObserver();
7979
try (final ObservableInputStream ois = new ObservableInputStream(new ByteArrayInputStream(buffer))) {
8080
assertEquals(-1, lko.lastByteSeen);
@@ -106,7 +106,7 @@ public void testDataByteCalled_add() throws Exception {
106106
@Test
107107
public void testDataByteCalled_ctor() throws Exception {
108108
final byte[] buffer = MessageDigestCalculatingInputStreamTest
109-
.generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE);
109+
.generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE);
110110
final LastByteKeepingObserver lko = new LastByteKeepingObserver();
111111
try (final ObservableInputStream ois = new ObservableInputStream(new ByteArrayInputStream(buffer), lko)) {
112112
assertEquals(-1, lko.lastByteSeen);
@@ -137,7 +137,7 @@ public void testDataByteCalled_ctor() throws Exception {
137137
@Test
138138
public void testDataBytesCalled() throws Exception {
139139
final byte[] buffer = MessageDigestCalculatingInputStreamTest
140-
.generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE);
140+
.generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE);
141141
final ByteArrayInputStream bais = new ByteArrayInputStream(buffer);
142142
final ObservableInputStream ois = new ObservableInputStream(bais);
143143
final LastBytesKeepingObserver lko = new LastBytesKeepingObserver();
@@ -171,11 +171,9 @@ public void testDataBytesCalled() throws Exception {
171171
}
172172

173173
@Test
174-
public void testTimestamped() {
175-
final byte[] buffer = MessageDigestCalculatingInputStreamTest
176-
.generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE);
177-
final ByteArrayInputStream bais = new ByteArrayInputStream(buffer);
178-
final ObservableInputStream ois = new ObservableInputStream(bais);
179-
174+
public void testGetObservers() {
175+
final LastBytesKeepingObserver observer = new LastBytesKeepingObserver();
176+
final ObservableInputStream ois = new ObservableInputStream(new NullInputStream(), observer);
177+
assertEquals(observer, ois.getObservers().get(0));
180178
}
181179
}

0 commit comments

Comments
 (0)