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 e3dcc9d Make ObservableInputStream.getObservers() public. e3dcc9d is described below commit e3dcc9d7a9927530cf75b2293fdfde9e92c1c750 Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Sat Jan 30 11:26:17 2021 -0500 Make ObservableInputStream.getObservers() public. --- src/changes/changes.xml | 3 +++ .../apache/commons/io/input/ObservableInputStream.java | 3 ++- .../commons/io/input/ObservableInputStreamTest.java | 18 ++++++++---------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 6bbaeee..39925ed 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -160,6 +160,9 @@ The <action> type attribute can be add,update,fix,remove. <action dev="ggregory" type="add" due-to="Gary Gregory"> Add and use ObservableInputStream.ObservableInputStream(InputStream, Observer...). </action> + <action dev="ggregory" type="add" due-to="Gary Gregory"> + Make ObservableInputStream.getObservers() public. + </action> <!-- UPDATES --> <action dev="ggregory" type="update" due-to="Dependabot"> Update junit-jupiter from 5.6.2 to 5.7.0 #153. diff --git a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java index 22edfdb..7392783 100644 --- a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java +++ b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java @@ -174,8 +174,9 @@ public class ObservableInputStream extends ProxyInputStream { * Gets all currently registered observers. * * @return a list of the currently registered observers + * @since 2.9.0 */ - protected List<Observer> getObservers() { + public List<Observer> getObservers() { return observers; } 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 e888528..91c30a4 100644 --- a/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java @@ -17,8 +17,8 @@ package org.apache.commons.io.input; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; @@ -74,7 +74,7 @@ public class ObservableInputStreamTest { @Test public void testDataByteCalled_add() throws Exception { final byte[] buffer = MessageDigestCalculatingInputStreamTest - .generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE); + .generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE); final LastByteKeepingObserver lko = new LastByteKeepingObserver(); try (final ObservableInputStream ois = new ObservableInputStream(new ByteArrayInputStream(buffer))) { assertEquals(-1, lko.lastByteSeen); @@ -106,7 +106,7 @@ public class ObservableInputStreamTest { @Test public void testDataByteCalled_ctor() throws Exception { final byte[] buffer = MessageDigestCalculatingInputStreamTest - .generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE); + .generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE); final LastByteKeepingObserver lko = new LastByteKeepingObserver(); try (final ObservableInputStream ois = new ObservableInputStream(new ByteArrayInputStream(buffer), lko)) { assertEquals(-1, lko.lastByteSeen); @@ -137,7 +137,7 @@ public class ObservableInputStreamTest { @Test public void testDataBytesCalled() throws Exception { final byte[] buffer = MessageDigestCalculatingInputStreamTest - .generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE); + .generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE); final ByteArrayInputStream bais = new ByteArrayInputStream(buffer); final ObservableInputStream ois = new ObservableInputStream(bais); final LastBytesKeepingObserver lko = new LastBytesKeepingObserver(); @@ -171,11 +171,9 @@ public class ObservableInputStreamTest { } @Test - public void testTimestamped() { - final byte[] buffer = MessageDigestCalculatingInputStreamTest - .generateRandomByteStream(IOUtils.DEFAULT_BUFFER_SIZE); - final ByteArrayInputStream bais = new ByteArrayInputStream(buffer); - final ObservableInputStream ois = new ObservableInputStream(bais); - + public void testGetObservers() { + final LastBytesKeepingObserver observer = new LastBytesKeepingObserver(); + final ObservableInputStream ois = new ObservableInputStream(new NullInputStream(), observer); + assertEquals(observer, ois.getObservers().get(0)); } }