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

commit 9bf29a7683d44b6082ddceed2796afaf862886a3
Author: Gary Gregory <[email protected]>
AuthorDate: Thu May 18 17:06:01 2023 -0400

    Replace new StringInputStream  with existing CharSequenceInputStream
    
    Add CharSequenceInputStream.Builder
---
 src/changes/changes.xml                            |  5 +-
 .../commons/io/input/CharSequenceInputStream.java  | 61 +++++++++++++++
 .../apache/commons/io/input/StringInputStream.java | 88 ----------------------
 .../java/org/apache/commons/io/CopyUtilsTest.java  |  4 +-
 .../apache/commons/io/DemuxInputStreamTest.java    |  4 +-
 .../java/org/apache/commons/io/IOUtilsTest.java    |  4 +-
 .../commons/io/input/BOMInputStreamTest.java       |  2 +-
 .../io/input/CharSequenceInputStreamTest.java      | 17 ++++-
 .../commons/io/input/CountingInputStreamTest.java  |  4 +-
 .../commons/io/input/StringInputStreamTest.java    | 47 ------------
 .../io/input/UncheckedFilterInputStreamTest.java   |  4 +-
 .../io/input/WindowsLineEndingInputStreamTest.java |  2 +-
 .../commons/io/input/XmlStreamReaderTest.java      |  4 +-
 .../io/input/XmlStreamReaderUtilitiesTest.java     |  2 +-
 .../XmlStreamReaderUtilitiesCompatibilityTest.java |  4 +-
 15 files changed, 97 insertions(+), 155 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5024e279..02eb6b01 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -53,9 +53,10 @@ The <action> type attribute can be add,update,fix,remove.
         Regression in FileUtils.touch() - no longer creates parent directories.
       </action>
       <!-- ADD -->
-      <action issue="IO-793" dev="ggregory" type="add" due-to="Gary Gregory, K 
P">
-        Add StringInputStream. StringInputStream.java should be in main source 
folder.
+      <action dev="ggregory" type="fix" due-to="Gary Gregory">
+        Add CharSequenceInputStream.Builder.
       </action>
+      <!-- UPDATE -->
     </release>
     <release version="2.12.0" date="2023-05-13" description="Java 8 required.">
       <!-- FIX -->
diff --git 
a/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java 
b/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
index 38686f69..1e503b31 100644
--- a/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
@@ -32,6 +32,7 @@ import java.util.Objects;
 
 import org.apache.commons.io.Charsets;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.build.AbstractStreamBuilder;
 
 /**
  * Implements an {@link InputStream} to read from String, StringBuffer, 
StringBuilder or CharBuffer.
@@ -43,6 +44,58 @@ import org.apache.commons.io.IOUtils;
  */
 public class CharSequenceInputStream extends InputStream {
 
+    /**
+     * Builds a new {@link CharSequenceInputStream} instance.
+     * <p>
+     * For example:
+     * </p>
+     *
+     * <pre>{@code
+     * CharSequenceInputStream s = CharSequenceInputStream.builder()
+     *   .setBufferSize(8192)
+     *   .setCharSequence("String")
+     *   .setCharsetEncoder(Charset.defaultCharset())
+     *   .get()}
+     * </pre>
+     * @since 2.13.0
+     */
+    public static class Builder extends 
AbstractStreamBuilder<CharSequenceInputStream, Builder> {
+
+        private CharSequence source;
+
+        /**
+         * Constructs a new instance.
+         *
+         * Uses the buffer size, CharSequence, and Charset aspects.
+         */
+        @Override
+        public CharSequenceInputStream get() {
+            return new CharSequenceInputStream(source, getCharset(), 
getBufferSize());
+        }
+
+        /**
+         * Sets the non-null CharSequence.
+         *
+         * @param source The source string, MUST not be null.
+         * @return this.
+         */
+        public Builder setCharSequence(final CharSequence source) {
+            this.source = Objects.requireNonNull(source, "source");
+            return this;
+        }
+
+    }
+
+    /**
+     * Constructs a new {@link Builder}.
+     *
+     * @return a new {@link Builder}.
+     * @since 2.12.0
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
     private static final int NO_MARK = -1;
 
     private final CharsetEncoder charsetEncoder;
@@ -58,7 +111,9 @@ public class CharSequenceInputStream extends InputStream {
      * @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.
+     * @deprecated Use {@link #builder()} and {@link Builder#get()}
      */
+    @Deprecated
     public CharSequenceInputStream(final CharSequence cs, final Charset 
charset) {
         this(cs, charset, IOUtils.DEFAULT_BUFFER_SIZE);
     }
@@ -70,7 +125,9 @@ public class CharSequenceInputStream extends InputStream {
      * @param charset the character set name to use, null maps to the default 
Charset.
      * @param bufferSize the buffer size to use.
      * @throws IllegalArgumentException if the buffer is not large enough to 
hold a complete character.
+     * @deprecated Use {@link #builder()} and {@link Builder#get()}
      */
+    @Deprecated
     public CharSequenceInputStream(final CharSequence cs, final Charset 
charset, final int bufferSize) {
         // @formatter:off
         this.charsetEncoder = Charsets.toCharset(charset).newEncoder()
@@ -91,7 +148,9 @@ public class CharSequenceInputStream extends InputStream {
      * @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.
+     * @deprecated Use {@link #builder()} and {@link Builder#get()}
      */
+    @Deprecated
     public CharSequenceInputStream(final CharSequence cs, final String 
charset) {
         this(cs, charset, IOUtils.DEFAULT_BUFFER_SIZE);
     }
@@ -103,7 +162,9 @@ public class CharSequenceInputStream extends InputStream {
      * @param charset the character set name to use, null maps to the default 
Charset.
      * @param bufferSize the buffer size to use.
      * @throws IllegalArgumentException if the buffer is not large enough to 
hold a complete character.
+     * @deprecated Use {@link #builder()} and {@link Builder#get()}
      */
+    @Deprecated
     public CharSequenceInputStream(final CharSequence cs, final String 
charset, final int bufferSize) {
         this(cs, Charsets.toCharset(charset), bufferSize);
     }
diff --git a/src/main/java/org/apache/commons/io/input/StringInputStream.java 
b/src/main/java/org/apache/commons/io/input/StringInputStream.java
deleted file mode 100644
index 2d172a8c..00000000
--- a/src/main/java/org/apache/commons/io/input/StringInputStream.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.commons.io.input;
-
-import java.io.InputStream;
-import java.io.StringReader;
-import java.nio.charset.Charset;
-import java.util.Objects;
-
-import org.apache.commons.io.build.AbstractStreamBuilder;
-
-/**
- * An {@link InputStream} on a String.
- * <p>
- * To build an instance, see {@link Builder}.
- * </p>
- * @since 2.13.0
- */
-public final class StringInputStream extends ReaderInputStream {
-
-    /**
-     * Builds a new {@link StringInputStream} instance.
-     * <p>
-     * For example:
-     * </p>
-     *
-     * <pre>{@code
-     * ReaderInputStream s = new StringInputStream.Builder()
-     *   .setString("String")
-     *   .setCharsetEncoder(Charset.defaultCharset())
-     *   .get()}
-     * </pre>
-     * <p>
-     */
-    public static class Builder extends 
AbstractStreamBuilder<StringInputStream, Builder> {
-
-        private String string;
-
-        /**
-         * Constructs a new instance.
-         *
-         * Only uses the String and Charset aspects of this builder.
-         */
-        @Override
-        public StringInputStream get() {
-            return new StringInputStream(string, getCharset());
-        }
-
-        /**
-         * Sets the non-null string.
-         *
-         * @param source The source string, MUST not be null.
-         * @return this.
-         */
-        public Builder setString(final String source) {
-            this.string = Objects.requireNonNull(source, "source");
-            return this;
-        }
-
-    }
-
-    /**
-     * Creates a new instance on a String for a Charset.
-     *
-     * @param source  The source string, MUST not be null.
-     * @param charset The source charset, null defaults to {@link 
Charset#defaultCharset()}.
-     */
-    @SuppressWarnings("deprecation")
-    private StringInputStream(final String source, final Charset charset) {
-        super(new StringReader(source), charset);
-    }
-
-}
diff --git a/src/test/java/org/apache/commons/io/CopyUtilsTest.java 
b/src/test/java/org/apache/commons/io/CopyUtilsTest.java
index 81b996a4..51d96b90 100644
--- a/src/test/java/org/apache/commons/io/CopyUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/CopyUtilsTest.java
@@ -27,7 +27,7 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.commons.io.input.StringInputStream;
+import org.apache.commons.io.input.CharSequenceInputStream;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.commons.io.test.TestUtils;
 import org.apache.commons.io.test.ThrowOnCloseInputStream;
@@ -101,7 +101,7 @@ public class CopyUtilsTest {
         final String inDataStr = "data";
         final String charsetName = StandardCharsets.UTF_8.name();
         final StringWriter writer = new StringWriter();
-        CopyUtils.copy(new 
StringInputStream.Builder().setString(inDataStr).setCharset(charsetName).get(), 
writer, charsetName);
+        CopyUtils.copy(new 
CharSequenceInputStream.Builder().setCharSequence(inDataStr).setCharset(charsetName).get(),
 writer, charsetName);
         assertEquals(inDataStr, writer.toString());
     }
 
diff --git a/src/test/java/org/apache/commons/io/DemuxInputStreamTest.java 
b/src/test/java/org/apache/commons/io/DemuxInputStreamTest.java
index ca0f3523..dd71814b 100644
--- a/src/test/java/org/apache/commons/io/DemuxInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/DemuxInputStreamTest.java
@@ -25,8 +25,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Random;
 
+import org.apache.commons.io.input.CharSequenceInputStream;
 import org.apache.commons.io.input.DemuxInputStream;
-import org.apache.commons.io.input.StringInputStream;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.commons.io.output.DemuxOutputStream;
 import org.apache.commons.io.test.TestUtils;
@@ -140,7 +140,7 @@ public class DemuxInputStreamTest {
     }
 
     private void startReader(final String name, final String data, final 
DemuxInputStream demux) {
-        final InputStream input = new 
StringInputStream.Builder().setString(data).get();
+        final InputStream input = 
CharSequenceInputStream.builder().setCharSequence(data).get();
         final ReaderThread thread = new ReaderThread(name, input, demux);
         threadMap.put(name, thread);
     }
diff --git a/src/test/java/org/apache/commons/io/IOUtilsTest.java 
b/src/test/java/org/apache/commons/io/IOUtilsTest.java
index 78391485..fbeb99ec 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsTest.java
@@ -64,10 +64,10 @@ import java.util.stream.Stream;
 
 import org.apache.commons.io.function.IOConsumer;
 import org.apache.commons.io.input.BrokenInputStream;
+import org.apache.commons.io.input.CharSequenceInputStream;
 import org.apache.commons.io.input.CircularInputStream;
 import org.apache.commons.io.input.NullInputStream;
 import org.apache.commons.io.input.NullReader;
-import org.apache.commons.io.input.StringInputStream;
 import org.apache.commons.io.output.AppendableWriter;
 import org.apache.commons.io.output.BrokenOutputStream;
 import org.apache.commons.io.output.CountingOutputStream;
@@ -966,7 +966,7 @@ public class IOUtilsTest {
 
     @Test
     public void testReadFully_InputStream_Offset() throws Exception {
-        final StringInputStream stream = new 
StringInputStream.Builder().setString("abcd1234").setCharset(StandardCharsets.UTF_8).get();
+        final InputStream stream = 
CharSequenceInputStream.builder().setCharSequence("abcd1234").setCharset(StandardCharsets.UTF_8).get();
         final byte[] buffer = "wx00000000".getBytes(StandardCharsets.UTF_8);
         IOUtils.readFully(stream, buffer, 2, 8);
         assertEquals("wxabcd1234", new String(buffer, 0, buffer.length, 
StandardCharsets.UTF_8));
diff --git a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java 
b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
index 94bd53f7..8eec3601 100644
--- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
@@ -154,7 +154,7 @@ public class BOMInputStreamTest {
 
     private boolean doesSaxSupportCharacterSet(final String charsetName) 
throws ParserConfigurationException, SAXException, IOException {
         final DocumentBuilder documentBuilder = 
DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        try (StringInputStream byteStream = new 
StringInputStream.Builder().setString("<?xml version=\"1.0\" encoding=\"" + 
charsetName + "\"?><Z/>")
+        try (InputStream byteStream = 
CharSequenceInputStream.builder().setCharSequence("<?xml version=\"1.0\" 
encoding=\"" + charsetName + "\"?><Z/>")
                 .setCharset(charsetName).get()) {
             final InputSource is = new InputSource(byteStream);
             is.setEncoding(charsetName);
diff --git 
a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java 
b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
index e7f47b32..c488b25a 100644
--- a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
@@ -184,6 +184,9 @@ public class CharSequenceInputStreamTest {
         try (InputStream stream = new CharSequenceInputStream(new 
String(inputChars), charset, 512)) {
             IOUtils.toCharArray(stream, charset);
         }
+        try (InputStream stream = 
CharSequenceInputStream.builder().setCharSequence(new 
String(inputChars)).setCharset(charset).setBufferSize(512).get()) {
+            IOUtils.toCharArray(stream, charset);
+        }
     }
 
     @Test
@@ -338,7 +341,11 @@ public class CharSequenceInputStreamTest {
 
     @Test
     public void testMarkSupported() throws Exception {
-        try (InputStream r = new CharSequenceInputStream("test", UTF_8)) {
+        try (@SuppressWarnings("deprecation")
+        InputStream r = new CharSequenceInputStream("test", UTF_8)) {
+            assertTrue(r.markSupported());
+        }
+        try (InputStream r = 
CharSequenceInputStream.builder().setCharSequence("test").setCharset(UTF_8).get())
 {
             assertTrue(r.markSupported());
         }
     }
@@ -349,6 +356,10 @@ public class CharSequenceInputStreamTest {
             IOUtils.toByteArray(in);
             assertEquals(Charset.defaultCharset(), 
in.getCharsetEncoder().charset());
         }
+        try (CharSequenceInputStream in = 
CharSequenceInputStream.builder().setCharSequence("test").setCharset((Charset) 
null).get()) {
+            IOUtils.toByteArray(in);
+            assertEquals(Charset.defaultCharset(), 
in.getCharsetEncoder().charset());
+        }
     }
 
     @Test
@@ -357,6 +368,10 @@ public class CharSequenceInputStreamTest {
             IOUtils.toByteArray(in);
             assertEquals(Charset.defaultCharset(), 
in.getCharsetEncoder().charset());
         }
+        try (CharSequenceInputStream in = 
CharSequenceInputStream.builder().setCharSequence("test").setCharset((String) 
null).get()) {
+            IOUtils.toByteArray(in);
+            assertEquals(Charset.defaultCharset(), 
in.getCharsetEncoder().charset());
+        }
     }
 
     private void testReadZero(final String csName) throws Exception {
diff --git 
a/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java 
b/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
index 23851f49..ba369a9a 100644
--- a/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
@@ -33,7 +33,7 @@ public class CountingInputStreamTest {
     @Test
     public void testCounting() throws Exception {
         final String text = "A piece of text";
-        try (CountingInputStream cis = new CountingInputStream(new 
StringInputStream.Builder().setString(text).get())) {
+        try (CountingInputStream cis = new 
CountingInputStream(CharSequenceInputStream.builder().setCharSequence(text).get()))
 {
 
             // have to declare this larger as we're going to read
             // off the end of the stream and input stream seems
@@ -149,7 +149,7 @@ public class CountingInputStreamTest {
     @Test
     public void testSkipping() throws IOException {
         final String text = "Hello World!";
-        try (CountingInputStream cis = new CountingInputStream(new 
StringInputStream.Builder().setString(text).get())) {
+        try (CountingInputStream cis = new 
CountingInputStream(CharSequenceInputStream.builder().setCharSequence(text).get()))
 {
 
             assertEquals(6, cis.skip(6));
             assertEquals(6, cis.getCount());
diff --git 
a/src/test/java/org/apache/commons/io/input/StringInputStreamTest.java 
b/src/test/java/org/apache/commons/io/input/StringInputStreamTest.java
deleted file mode 100644
index 3b5b36bb..00000000
--- a/src/test/java/org/apache/commons/io/input/StringInputStreamTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.commons.io.input;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.StringInputStream.Builder;
-import org.junit.jupiter.api.Test;
-
-/**
- * Tests {@link StringInputStream}.
- */
-public class StringInputStreamTest {
-
-    @Test
-    public void testStringConstructorString() throws IOException {
-        try (StringInputStream input = new Builder().setString("01").get()) {
-            assertEquals("01", IOUtils.toString(input, 
Charset.defaultCharset()));
-        }
-    }
-
-    @Test
-    public void testStringConstructorStringCharset() throws IOException {
-        try (StringInputStream input = new 
Builder().setString("01").setCharset(Charset.defaultCharset()).get()) {
-            assertEquals("01", IOUtils.toString(input, 
Charset.defaultCharset()));
-        }
-    }
-}
diff --git 
a/src/test/java/org/apache/commons/io/input/UncheckedFilterInputStreamTest.java 
b/src/test/java/org/apache/commons/io/input/UncheckedFilterInputStreamTest.java
index 85013db5..85182aeb 100644
--- 
a/src/test/java/org/apache/commons/io/input/UncheckedFilterInputStreamTest.java
+++ 
b/src/test/java/org/apache/commons/io/input/UncheckedFilterInputStreamTest.java
@@ -41,8 +41,8 @@ public class UncheckedFilterInputStreamTest {
     @SuppressWarnings("resource")
     @BeforeEach
     public void beforeEach() {
-        stringInputStream = 
UncheckedFilterInputStream.builder().setInputStream(new BufferedInputStream(new 
StringInputStream.Builder().setString("01").get()))
-                .get();
+        stringInputStream = UncheckedFilterInputStream.builder()
+                .setInputStream(new 
BufferedInputStream(CharSequenceInputStream.builder().setCharSequence("01").get())).get();
         exception = new IOException("test exception");
         brokenInputStream = 
UncheckedFilterInputStream.builder().setInputStream(new 
BrokenInputStream(exception)).get();
     }
diff --git 
a/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
 
b/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
index 53d2ab7c..81d17fa1 100644
--- 
a/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
+++ 
b/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
@@ -57,7 +57,7 @@ public class WindowsLineEndingInputStreamTest {
 
     private String roundtrip(final String msg, final boolean ensure) throws 
IOException {
         try (WindowsLineEndingInputStream lf = new 
WindowsLineEndingInputStream(
-                new 
StringInputStream.Builder().setString(msg).setCharset(StandardCharsets.UTF_8).get(),
 ensure)) {
+                
CharSequenceInputStream.builder().setCharSequence(msg).setCharset(StandardCharsets.UTF_8).get(),
 ensure)) {
             final byte[] buf = new byte[100];
             final int read = lf.read(buf);
             return new String(buf, 0, read, StandardCharsets.UTF_8);
diff --git a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java 
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
index b804a2ed..8af91b01 100644
--- a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
+++ b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
@@ -379,7 +379,7 @@ public class XmlStreamReaderTest {
     public void testHttpContent() throws Exception {
         final String encoding = UTF_8;
         final String xml = getXML("no-bom", XML3, encoding, encoding);
-        try (XmlStreamReader xmlReader = new XmlStreamReader(new 
StringInputStream.Builder().setString(xml).setCharset(encoding).get())) {
+        try (XmlStreamReader xmlReader = new 
XmlStreamReader(CharSequenceInputStream.builder().setCharSequence(xml).setCharset(encoding).get()))
 {
             assertEquals(xmlReader.getEncoding(), encoding, "Check encoding");
             assertEquals(xml, IOUtils.toString(xmlReader), "Check content");
         }
@@ -505,7 +505,7 @@ public class XmlStreamReaderTest {
     public void testRawContent() throws Exception {
         final String encoding = UTF_8;
         final String xml = getXML("no-bom", XML3, encoding, encoding);
-        try (XmlStreamReader xmlReader = new XmlStreamReader(new 
StringInputStream.Builder().setString(xml).setCharset(encoding).get())) {
+        try (XmlStreamReader xmlReader = new 
XmlStreamReader(CharSequenceInputStream.builder().setCharSequence(xml).setCharset(encoding).get()))
 {
             assertEquals(xmlReader.getEncoding(), encoding, "Check encoding");
             assertEquals(xml, IOUtils.toString(xmlReader), "Check content");
         }
diff --git 
a/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java 
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
index 0235dd77..5d80cabc 100644
--- 
a/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
+++ 
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
@@ -33,7 +33,7 @@ public class XmlStreamReaderUtilitiesTest {
     /** Mock {@link XmlStreamReader} implementation */
     private static class MockXmlStreamReader extends XmlStreamReader {
         MockXmlStreamReader(final String defaultEncoding) throws IOException {
-            super(new StringInputStream.Builder().setString("").get(), null, 
true, defaultEncoding);
+            super(CharSequenceInputStream.builder().setCharSequence("").get(), 
null, true, defaultEncoding);
         }
     }
     private static final String RAWMGS1 = "encoding mismatch";
diff --git 
a/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java
 
b/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java
index eeaf8d73..ee4310a8 100644
--- 
a/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java
+++ 
b/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReaderUtilitiesCompatibilityTest.java
@@ -18,7 +18,7 @@ package org.apache.commons.io.input.compatibility;
 
 import java.io.IOException;
 
-import org.apache.commons.io.input.StringInputStream;
+import org.apache.commons.io.input.CharSequenceInputStream;
 import org.apache.commons.io.input.XmlStreamReaderUtilitiesTest;
 
 /**
@@ -29,7 +29,7 @@ public class XmlStreamReaderUtilitiesCompatibilityTest 
extends XmlStreamReaderUt
     /** Mock {@link XmlStreamReader} implementation */
     private static class MockXmlStreamReader extends XmlStreamReader {
         MockXmlStreamReader(final String defaultEncoding) throws IOException {
-            super(new StringInputStream.Builder().setString("").get(), null, 
true, defaultEncoding);
+            super(CharSequenceInputStream.builder().setCharSequence("").get(), 
null, true, defaultEncoding);
         }
     }
     @Override

Reply via email to