Better internal API

Author: garydgregory

src/main/java/org/apache/commons/csv/CSVFormat.java

@@ -2292,7 +2292,8 @@ private void printWithEscapes(final Reader reader, final Appendable appendable)
         while (EOF != (c = bufferedReader.read())) {
             builder.append((char) c);
             Arrays.fill(lookAheadBuffer, (char) 0);
-            final String test = builder.toString() + new String(bufferedReader.peek(lookAheadBuffer));
+            bufferedReader.peek(lookAheadBuffer);
+            final String test = builder.toString() + new String(lookAheadBuffer);
             final boolean isDelimiterStart = isDelimiter((char) c, test, pos, delimArray, delimLength);
             final boolean isCr = c == Constants.CR;
             final boolean isLf = c == Constants.LF;

src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java

@@ -124,21 +124,19 @@ int peek() throws IOException {
     }
 
     /**
-     * Populates the buffer with the next {@code buf.length} characters in the
-     * current reader without consuming them. The next call to {@link #read()} will
-     * still return the next value. This doesn't affect the line number or the last
-     * character.
+     * Populates the buffer with the next {@code buf.length} characters in the current reader without consuming them. The next call to {@link #read()} will
+     * still return the next value. This doesn't affect the line number or the last character.
      *
      * @param buf the buffer to fill for the look ahead.
-     * @return the buffer itself
+     * @return The number of characters peeked, or -1 if the end of the stream has been reached.
      * @throws IOException If an I/O error occurs
      */
-    char[] peek(final char[] buf) throws IOException {
+    int peek(final char[] buf) throws IOException {
         final int n = buf.length;
         super.mark(n);
-        super.read(buf, 0, n);
+        final int c = super.read(buf, 0, n);
         super.reset();
-        return buf;
+        return c;
     }
 
     @Override