Bump default buffer size to IOUtils#DEFAULT_BUFFER_SIZE

- Bump default buffer size for CharSequenceInputStream to
IOUtils#DEFAULT_BUFFER_SIZE.
- Bump default buffer size for ChunkedOutputStream to
IOUtils#DEFAULT_BUFFER_SIZE.
- Bump default buffer size for ChunkedWriter to
IOUtils#DEFAULT_BUFFER_SIZE.
- Bump default buffer size for ReaderInputStream to
IOUtils#DEFAULT_BUFFER_SIZE.
- Bump default buffer size for WriterOutputStream to
IOUtils#DEFAULT_BUFFER_SIZE.

Author: garydgregory

src/changes/changes.xml

@@ -544,6 +544,21 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="kinow" type="update" due-to="Dependabot">
         Bump apache-rat-plugin from 0.14 to 0.15 #387.
       </action>
+      <action dev="ggregory" type="update" due-to="Gary Gregory">
+        Bump default buffer size for CharSequenceInputStream to IOUtils#DEFAULT_BUFFER_SIZE.
+      </action>
+      <action dev="ggregory" type="update" due-to="Gary Gregory">
+        Bump default buffer size for ChunkedOutputStream to IOUtils#DEFAULT_BUFFER_SIZE.
+      </action>
+      <action dev="ggregory" type="update" due-to="Gary Gregory">
+        Bump default buffer size for ChunkedWriter to IOUtils#DEFAULT_BUFFER_SIZE.
+      </action>
+      <action dev="ggregory" type="update" due-to="Gary Gregory">
+        Bump default buffer size for ReaderInputStream to IOUtils#DEFAULT_BUFFER_SIZE.
+      </action>
+      <action dev="ggregory" type="update" due-to="Gary Gregory">
+        Bump default buffer size for WriterOutputStream to IOUtils#DEFAULT_BUFFER_SIZE.
+      </action>
     </release>
     <release version="2.11.0" date="2021-07-09" description="Java 8 required.">
       <!-- FIX -->

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

@@ -31,6 +31,7 @@
 import java.util.Objects;
 
 import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
 
 /**
  * Implements an {@link InputStream} to read from String, StringBuffer, StringBuilder or CharBuffer.
@@ -42,8 +43,6 @@
  */
 public class CharSequenceInputStream extends InputStream {
 
-    private static final int BUFFER_SIZE = 2048;
-
     private static final int NO_MARK = -1;
 
     private final CharsetEncoder charsetEncoder;
@@ -54,14 +53,14 @@ public class CharSequenceInputStream extends InputStream {
     private int bBufMark; // position in bBuf
 
     /**
-     * Constructs a new instance with a buffer size of 2048.
+     * Constructs a new instance with a buffer size of {@link IOUtils#DEFAULT_BUFFER_SIZE}.
      *
      * @param cs the input character sequence.
      * @param charset the character set name to use.
      * @throws IllegalArgumentException if the buffer is not large enough to hold a complete character.
      */
     public CharSequenceInputStream(final CharSequence cs, final Charset charset) {
-        this(cs, charset, BUFFER_SIZE);
+        this(cs, charset, IOUtils.DEFAULT_BUFFER_SIZE);
     }
 
     /**
@@ -87,14 +86,14 @@ public CharSequenceInputStream(final CharSequence cs, final Charset charset, fin
     }
 
     /**
-     * Constructs a new instance with a buffer size of 2048.
+     * Constructs a new instance with a buffer size of {@link IOUtils#DEFAULT_BUFFER_SIZE}.
      *
      * @param cs the input character sequence.
      * @param charset the character set name to use.
      * @throws IllegalArgumentException if the buffer is not large enough to hold a complete character.
      */
     public CharSequenceInputStream(final CharSequence cs, final String charset) {
-        this(cs, charset, BUFFER_SIZE);
+        this(cs, charset, IOUtils.DEFAULT_BUFFER_SIZE);
     }
 
     /**

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

@@ -30,6 +30,7 @@
 import java.util.Objects;
 
 import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.charset.CharsetEncoders;
 
 /**
@@ -81,7 +82,6 @@
  * @since 2.0
  */
 public class ReaderInputStream extends InputStream {
-    private static final int DEFAULT_BUFFER_SIZE = 1024;
 
     static int checkMinBufferSize(final CharsetEncoder charsetEncoder, final int bufferSize) {
         final float minRequired = minBufferSize(charsetEncoder);
@@ -116,8 +116,8 @@ static float minBufferSize(final CharsetEncoder charsetEncoder) {
     private boolean endOfInput;
 
     /**
-     * Constructs a new {@link ReaderInputStream} that uses the default character encoding with a default input buffer size
-     * of {@value #DEFAULT_BUFFER_SIZE} characters.
+     * Constructs a new {@link ReaderInputStream} that uses the default character encoding with a default input buffer size of
+     * {@value IOUtils#DEFAULT_BUFFER_SIZE} characters.
      *
      * @param reader the target {@link Reader}
      * @deprecated 2.5 use {@link #ReaderInputStream(Reader, Charset)} instead
@@ -128,19 +128,17 @@ public ReaderInputStream(final Reader reader) {
     }
 
     /**
-     * Constructs a new {@link ReaderInputStream} with a default input buffer size of {@value #DEFAULT_BUFFER_SIZE}
-     * characters.
+     * Constructs a new {@link ReaderInputStream} with a default input buffer size of {@value IOUtils#DEFAULT_BUFFER_SIZE} characters.
      *
      * <p>
-     * The encoder created for the specified charset will use {@link CodingErrorAction#REPLACE} for malformed input
-     * and unmappable characters.
+     * The encoder created for the specified charset will use {@link CodingErrorAction#REPLACE} for malformed input and unmappable characters.
      * </p>
      *
-     * @param reader the target {@link Reader}
+     * @param reader  the target {@link Reader}
      * @param charset the charset encoding
      */
     public ReaderInputStream(final Reader reader, final Charset charset) {
-        this(reader, charset, DEFAULT_BUFFER_SIZE);
+        this(reader, charset, IOUtils.DEFAULT_BUFFER_SIZE);
     }
 
     /**
@@ -178,7 +176,7 @@ public ReaderInputStream(final Reader reader, final Charset charset, final int b
      * @since 2.1
      */
     public ReaderInputStream(final Reader reader, final CharsetEncoder charsetEncoder) {
-        this(reader, charsetEncoder, DEFAULT_BUFFER_SIZE);
+        this(reader, charsetEncoder, IOUtils.DEFAULT_BUFFER_SIZE);
     }
 
     /**
@@ -204,19 +202,17 @@ public ReaderInputStream(final Reader reader, final CharsetEncoder charsetEncode
     }
 
     /**
-     * Constructs a new {@link ReaderInputStream} with a default input buffer size of {@value #DEFAULT_BUFFER_SIZE}
-     * characters.
+     * Constructs a new {@link ReaderInputStream} with a default input buffer size of {@value IOUtils#DEFAULT_BUFFER_SIZE} characters.
      *
      * <p>
-     * The encoder created for the specified charset will use {@link CodingErrorAction#REPLACE} for malformed input
-     * and unmappable characters.
+     * The encoder created for the specified charset will use {@link CodingErrorAction#REPLACE} for malformed input and unmappable characters.
      * </p>
      *
-     * @param reader the target {@link Reader}
+     * @param reader      the target {@link Reader}
      * @param charsetName the name of the charset encoding
      */
     public ReaderInputStream(final Reader reader, final String charsetName) {
-        this(reader, charsetName, DEFAULT_BUFFER_SIZE);
+        this(reader, charsetName, IOUtils.DEFAULT_BUFFER_SIZE);
     }
 
     /**

src/main/java/org/apache/commons/io/input/buffer/PeekableInputStream.java

@@ -20,14 +20,16 @@
 import java.io.InputStream;
 import java.util.Objects;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * Implements a buffered input stream, which allows to peek into the buffers first bytes. This comes in handy when
  * manually implementing scanners, lexers, parsers, and the like.
  */
 public class PeekableInputStream extends CircularBufferInputStream {
 
     /**
-     * Creates a new instance, which filters the given input stream, and uses a reasonable default buffer size (8192).
+     * Creates a new instance, which filters the given input stream, and uses a reasonable default buffer size ({@link IOUtils#DEFAULT_BUFFER_SIZE}).
      *
      * @param inputStream The input stream, which is being buffered.
      */

src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java

@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * OutputStream which breaks larger output blocks into chunks.
  * Native code may need to copy the input array; if the write buffer
@@ -32,7 +34,7 @@ public class ChunkedOutputStream extends FilterOutputStream {
     /**
      * The default chunk size to use, i.e. {@value} bytes.
      */
-    private static final int DEFAULT_CHUNK_SIZE = 1024 * 4;
+    private static final int DEFAULT_CHUNK_SIZE = IOUtils.DEFAULT_BUFFER_SIZE;
 
     /**
      * The maximum chunk size to us when writing data arrays

src/main/java/org/apache/commons/io/output/ChunkedWriter.java

@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.io.Writer;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * Writer which breaks larger output blocks into chunks.
  * Native code may need to copy the input array; if the write buffer
@@ -32,7 +34,7 @@ public class ChunkedWriter extends FilterWriter {
     /**
      * The default chunk size to use, i.e. {@value} bytes.
      */
-    private static final int DEFAULT_CHUNK_SIZE = 1024 * 4;
+    private static final int DEFAULT_CHUNK_SIZE = IOUtils.DEFAULT_BUFFER_SIZE;
 
     /**
      * The maximum chunk size to us when writing data arrays

src/main/java/org/apache/commons/io/output/WriterOutputStream.java

@@ -28,6 +28,7 @@
 import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.charset.CharsetDecoders;
 
 /**
@@ -76,7 +77,7 @@
  * @since 2.0
  */
 public class WriterOutputStream extends OutputStream {
-    private static final int BUFFER_SIZE = 1024;
+    private static final int BUFFER_SIZE = IOUtils.DEFAULT_BUFFER_SIZE;
 
     /**
      * Check if the JDK in use properly supports the given charset.

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

@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -34,7 +35,7 @@ public void defaultConstructor() throws IOException {
         final AtomicInteger numWrites = new AtomicInteger();
         try (ByteArrayOutputStream baos = newByteArrayOutputStream(numWrites);
             final ChunkedOutputStream chunked = new ChunkedOutputStream(baos)) {
-            chunked.write(new byte[1024 * 4 + 1]);
+            chunked.write(new byte[IOUtils.DEFAULT_BUFFER_SIZE + 1]);
             assertEquals(2, numWrites.get());
         }
     }

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

@@ -23,9 +23,12 @@
 import java.io.OutputStreamWriter;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 
 public class ChunkedWriterTest {
+
+    @SuppressWarnings("resource") // closed by caller.
     private OutputStreamWriter getOutputStreamWriter(final AtomicInteger numWrites) {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         return new OutputStreamWriter(baos) {
@@ -60,7 +63,7 @@ public void write_two_chunks_default_constructor() throws Exception {
         final AtomicInteger numWrites = new AtomicInteger();
         try (OutputStreamWriter osw = getOutputStreamWriter(numWrites)) {
             try (ChunkedWriter chunked = new ChunkedWriter(osw)) {
-                chunked.write(new char[1024 * 4 + 1]);
+                chunked.write(new char[IOUtils.DEFAULT_BUFFER_SIZE + 1]);
                 chunked.flush();
                 assertEquals(2, numWrites.get());
             }