You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/12/10 19:35:14 UTC
[commons-io] branch master updated: Better names and messages.
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 29b35b4 Better names and messages.
29b35b4 is described below
commit 29b35b498264d29dbacb17349b30ea8ece3dbfac
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 10 14:35:10 2020 -0500
Better names and messages.
---
.../java/org/apache/commons/io/input/QueueInputStream.java | 12 ++++++------
.../java/org/apache/commons/io/output/QueueOutputStream.java | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/input/QueueInputStream.java b/src/main/java/org/apache/commons/io/input/QueueInputStream.java
index 34296ae..dc86414 100644
--- a/src/main/java/org/apache/commons/io/input/QueueInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/QueueInputStream.java
@@ -55,7 +55,7 @@ import java.util.concurrent.LinkedBlockingQueue;
*/
public class QueueInputStream extends InputStream {
- private final BlockingQueue<Integer> queue;
+ private final BlockingQueue<Integer> blockingQueue;
/**
* Constructs a new instance with no limit to its internal buffer size.
@@ -67,10 +67,10 @@ public class QueueInputStream extends InputStream {
/**
* Constructs a new instance with given buffer
*
- * @param queue backing queue for the stream
+ * @param blockingQueue backing queue for the stream
*/
- public QueueInputStream(final BlockingQueue<Integer> queue) {
- this.queue = Objects.requireNonNull(queue, "queue is required");
+ public QueueInputStream(final BlockingQueue<Integer> blockingQueue) {
+ this.blockingQueue = Objects.requireNonNull(blockingQueue, "blockingQueue");
}
/**
@@ -80,7 +80,7 @@ public class QueueInputStream extends InputStream {
* @return QueueOutputStream connected to this stream
*/
public QueueOutputStream newQueueOutputStream() {
- return new QueueOutputStream(queue);
+ return new QueueOutputStream(blockingQueue);
}
/**
@@ -90,7 +90,7 @@ public class QueueInputStream extends InputStream {
*/
@Override
public int read() {
- final Integer value = queue.poll();
+ final Integer value = blockingQueue.poll();
return value == null ? -1 : ((0xFF) & value);
}
diff --git a/src/main/java/org/apache/commons/io/output/QueueOutputStream.java b/src/main/java/org/apache/commons/io/output/QueueOutputStream.java
index 0304668..67e7c89 100644
--- a/src/main/java/org/apache/commons/io/output/QueueOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/QueueOutputStream.java
@@ -54,7 +54,7 @@ import java.util.concurrent.LinkedBlockingQueue;
*/
public class QueueOutputStream extends OutputStream {
- private final BlockingQueue<Integer> queue;
+ private final BlockingQueue<Integer> blockingQueue;
/**
* Constructs a new instance with no limit to internal buffer size.
@@ -66,10 +66,10 @@ public class QueueOutputStream extends OutputStream {
/**
* Constructs a new instance with given buffer.
*
- * @param queue backing queue for the stream
+ * @param blockingQueue backing queue for the stream
*/
- public QueueOutputStream(final BlockingQueue<Integer> queue) {
- this.queue = Objects.requireNonNull(queue, "queue is required");
+ public QueueOutputStream(final BlockingQueue<Integer> blockingQueue) {
+ this.blockingQueue = Objects.requireNonNull(blockingQueue, "blockingQueue");
}
/**
@@ -79,7 +79,7 @@ public class QueueOutputStream extends OutputStream {
* @return QueueInputStream connected to this stream
*/
public QueueInputStream newQueueInputStream() {
- return new QueueInputStream(queue);
+ return new QueueInputStream(blockingQueue);
}
/**
@@ -90,7 +90,7 @@ public class QueueOutputStream extends OutputStream {
@Override
public void write(final int b) throws InterruptedIOException {
try {
- queue.put(0xFF & b);
+ blockingQueue.put(0xFF & b);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
final InterruptedIOException interruptedIoException = new InterruptedIOException();