Cleanup of ByteBufferAccumulator (approach 2)

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/Content.java

@@ -889,52 +889,6 @@ default Throwable getFailure()
          */
         boolean isLast();
 
-        /**
-         * <p>Copies the bytes from this Chunk to the given byte array.</p>
-         *
-         * @param bytes the byte array to copy the bytes into
-         * @param offset the offset within the byte array
-         * @param length the maximum number of bytes to copy
-         * @return the number of bytes actually copied
-         */
-        default int get(byte[] bytes, int offset, int length)
-        {
-            ByteBuffer b = getByteBuffer();
-            if (b == null || !b.hasRemaining())
-                return 0;
-            length = Math.min(length, b.remaining());
-            b.get(bytes, offset, length);
-            return length;
-        }
-
-        /**
-         * <p>Skips, advancing the ByteBuffer position, the given number of bytes.</p>
-         *
-         * @param length the maximum number of bytes to skip
-         * @return the number of bytes actually skipped
-         */
-        default int skip(int length)
-        {
-            if (length == 0)
-                return 0;
-            ByteBuffer byteBuffer = getByteBuffer();
-            length = Math.min(byteBuffer.remaining(), length);
-            byteBuffer.position(byteBuffer.position() + length);
-            return length;
-        }
-
-        /**
-         * @return an immutable version of this Chunk
-         */
-        default Chunk asReadOnly()
-        {
-            if (getByteBuffer().isReadOnly())
-                return this;
-            if (canRetain())
-                return asChunk(getByteBuffer().asReadOnlyBuffer(), isLast(), this);
-            return from(getByteBuffer().asReadOnlyBuffer(), isLast());
-        }
-
         /**
          * <p>Implementations of this interface may process {@link Chunk}s being copied by the
          * {@link Content#copy(Source, Sink, Processor, Callback)} method, so that

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/RetainableByteBuffer.java

@@ -14,6 +14,7 @@
 package org.eclipse.jetty.io;
 
 import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -221,9 +222,10 @@ default void clear()
      * Copies the contents of the given byte buffer at the end of this buffer.
      * @param bytes the byte buffer to copy from.
      * @return true if all bytes of the given buffer were copied, false otherwise.
+     * @throws ReadOnlyBufferException if the buffer is read only
      * @see BufferUtil#append(ByteBuffer, ByteBuffer)
      */
-    default boolean append(ByteBuffer bytes)
+    default boolean append(ByteBuffer bytes) throws ReadOnlyBufferException
     {
         BufferUtil.append(getByteBuffer(), bytes);
         return !bytes.hasRemaining();
@@ -233,13 +235,48 @@ default boolean append(ByteBuffer bytes)
      * Copies the contents of the given retainable byte buffer at the end of this buffer.
      * @param bytes the retainable byte buffer to copy from.
      * @return true if all bytes of the given buffer were copied, false otherwise.
+     * @throws ReadOnlyBufferException if the buffer is read only
      * @see BufferUtil#append(ByteBuffer, ByteBuffer)
      */
-    default boolean append(RetainableByteBuffer bytes)
+    default boolean append(RetainableByteBuffer bytes) throws ReadOnlyBufferException
     {
         return bytes.remaining() == 0 || append(bytes.getByteBuffer());
     }
 
+    /**
+     * <p>Copies the bytes from this Chunk to the given byte array.</p>
+     *
+     * @param bytes the byte array to copy the bytes into
+     * @param offset the offset within the byte array
+     * @param length the maximum number of bytes to copy
+     * @return the number of bytes actually copied
+     */
+    default int get(byte[] bytes, int offset, int length)
+    {
+        ByteBuffer b = getByteBuffer();
+        if (b == null || !b.hasRemaining())
+            return 0;
+        length = Math.min(length, b.remaining());
+        b.get(bytes, offset, length);
+        return length;
+    }
+
+    /**
+     * <p>Skips, advancing the ByteBuffer position, the given number of bytes.</p>
+     *
+     * @param length the maximum number of bytes to skip
+     * @return the number of bytes actually skipped
+     */
+    default int skip(int length)
+    {
+        if (length == 0)
+            return 0;
+        ByteBuffer byteBuffer = getByteBuffer();
+        length = Math.min(byteBuffer.remaining(), length);
+        byteBuffer.position(byteBuffer.position() + length);
+        return length;
+    }
+
     /**
      * Copies the contents of this retainable byte buffer at the end of the given byte buffer.
      * @param toInfillMode the destination buffer.

jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/ContentTest.java

@@ -14,43 +14,18 @@
 package org.eclipse.jetty.io;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.eclipse.jetty.util.BufferUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.sameInstance;
 
 public class ContentTest
 {
-    @Test
-    public void testAsReadOnly()
-    {
-        assertThat(Content.Chunk.EOF.asReadOnly(), sameInstance(Content.Chunk.EOF));
-        assertThat(Content.Chunk.EMPTY.asReadOnly(), sameInstance(Content.Chunk.EMPTY));
-
-        assertThat(Content.Chunk.from(BufferUtil.EMPTY_BUFFER, true).asReadOnly(), sameInstance(Content.Chunk.EOF));
-        assertThat(Content.Chunk.from(BufferUtil.EMPTY_BUFFER, false).asReadOnly(), sameInstance(Content.Chunk.EMPTY));
-
-        Content.Chunk failureChunk = Content.Chunk.from(new NumberFormatException());
-        assertThat(failureChunk.asReadOnly(), sameInstance(failureChunk));
-
-        Content.Chunk chunk = Content.Chunk.from(ByteBuffer.wrap(new byte[1]).asReadOnlyBuffer(), false);
-        assertThat(chunk.asReadOnly(), sameInstance(chunk));
-
-        Content.Chunk rwChunk = Content.Chunk.from(ByteBuffer.wrap("abc".getBytes(StandardCharsets.US_ASCII)), false);
-        Content.Chunk roChunk = rwChunk.asReadOnly();
-        assertThat(rwChunk, not(sameInstance(roChunk)));
-        assertThat(BufferUtil.toString(rwChunk.getByteBuffer(), StandardCharsets.US_ASCII), equalTo(BufferUtil.toString(roChunk.getByteBuffer(), StandardCharsets.US_ASCII)));
-    }
-
     @Test
     public void testFromEmptyByteBufferWithoutReleaser()
     {

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/EventsHandler.java

@@ -106,7 +106,7 @@ private void notifyOnRequestRead(Request wrapped, Content.Chunk chunk)
     {
         try
         {
-            onRequestRead(wrapped, chunk == null ? null : chunk.asReadOnly());
+            onRequestRead(wrapped, chunk);
         }
         catch (Throwable x)
         {

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java

@@ -21,6 +21,7 @@
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.ReadOnlyBufferException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileChannel.MapMode;
 import java.nio.channels.ReadableByteChannel;
@@ -431,8 +432,9 @@ public static boolean compact(ByteBuffer buffer)
      * @param from Buffer to take bytes from in flush mode, whose position is modified with the bytes taken.
      * @param to Buffer to put bytes to in fill mode.
      * @return number of bytes moved
+     * @throws ReadOnlyBufferException if the buffer is read only
      */
-    public static int put(ByteBuffer from, ByteBuffer to)
+    public static int put(ByteBuffer from, ByteBuffer to) throws ReadOnlyBufferException
     {
         int length = from.remaining();
         if (length == 0)
@@ -469,8 +471,9 @@ public static int put(ByteBuffer from, ByteBuffer to)
      * @param off offset into byte
      * @param len length to append
      * @throws BufferOverflowException if unable to append buffer due to space limits
+     * @throws ReadOnlyBufferException if the buffer is read only
      */
-    public static void append(ByteBuffer to, byte[] b, int off, int len) throws BufferOverflowException
+    public static void append(ByteBuffer to, byte[] b, int off, int len) throws BufferOverflowException, ReadOnlyBufferException
     {
         int pos = flipToFill(to);
         try
@@ -489,8 +492,9 @@ public static void append(ByteBuffer to, byte[] b, int off, int len) throws Buff
      * @param to Buffer is flush mode
      * @param b bytes to append
      * @throws BufferOverflowException if unable to append buffer due to space limits
+     * @throws ReadOnlyBufferException if the buffer is read only
      */
-    public static void append(ByteBuffer to, byte[] b) throws BufferOverflowException
+    public static void append(ByteBuffer to, byte[] b) throws BufferOverflowException, ReadOnlyBufferException
     {
         append(to, b, 0, b.length);
     }
@@ -501,8 +505,9 @@ public static void append(ByteBuffer to, byte[] b) throws BufferOverflowExceptio
      * @param to Buffer is flush mode
      * @param s String to append as UTF8
      * @throws BufferOverflowException if unable to append buffer due to space limits
+     * @throws ReadOnlyBufferException if the buffer is read only
      */
-    public static void append(ByteBuffer to, String s) throws BufferOverflowException
+    public static void append(ByteBuffer to, String s) throws BufferOverflowException, ReadOnlyBufferException
     {
         byte[] b = s.getBytes(StandardCharsets.UTF_8);
         append(to, b, 0, b.length);
@@ -514,8 +519,9 @@ public static void append(ByteBuffer to, String s) throws BufferOverflowExceptio
      * @param to Buffer is flush mode
      * @param b byte to append
      * @throws BufferOverflowException if unable to append buffer due to space limits
+     * @throws ReadOnlyBufferException if the buffer is read only
      */
-    public static void append(ByteBuffer to, byte b)
+    public static void append(ByteBuffer to, byte b) throws BufferOverflowException, ReadOnlyBufferException
     {
         int pos = flipToFill(to);
         try
@@ -534,8 +540,9 @@ public static void append(ByteBuffer to, byte b)
      * @param to Buffer in flush mode, whose position will be incremented by the number of bytes appended
      * @param b buffer to append to in flush mode, whose limit will be incremented by the number of bytes appended.
      * @return The number of bytes appended.
+     * @throws ReadOnlyBufferException if the buffer is read only
      */
-    public static int append(ByteBuffer to, ByteBuffer b)
+    public static int append(ByteBuffer to, ByteBuffer b) throws ReadOnlyBufferException
     {
         int pos = flipToFill(to);
         try