Make Content.Chunk a RetainableByteBuffer

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpReceiverOverHTTP.java

@@ -245,7 +245,7 @@ private boolean parseAndFill()
             while (true)
             {
                 if (LOG.isDebugEnabled())
-                    LOG.debug("Parsing {} in {}", BufferUtil.toDetailString(networkBuffer.getByteBuffer()), this);
+                    LOG.debug("Parsing {} in {}", networkBuffer, this);
                 // Always parse even empty buffers to advance the parser.
                 if (parse())
                 {
@@ -347,7 +347,7 @@ private boolean parse()
                 if (getHttpChannel().isTunnel(method, status))
                     return true;
 
-                if (!networkBuffer.hasRemaining())
+                if (networkBuffer.isEmpty())
                     return false;
 
                 if (!HttpStatus.isInformational(status))
@@ -359,7 +359,7 @@ private boolean parse()
                 return false;
             }
 
-            if (!networkBuffer.hasRemaining())
+            if (networkBuffer.isEmpty())
                 return false;
         }
     }

jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/util/MultiPartRequestContentTest.java

@@ -52,8 +52,10 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
+import static org.eclipse.jetty.io.Content.Source.asByteBuffer;
 import static org.eclipse.jetty.toolchain.test.StackUtils.supply;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.eclipse.jetty.util.BufferUtil.toBuffer;
+import static org.eclipse.jetty.util.BufferUtil.toHexString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -169,7 +171,7 @@ protected void process(MultiPartFormData.Parts parts) throws Exception
                 MultiPart.Part part = parts.iterator().next();
                 assertEquals(name, part.getName());
                 assertEquals("text/plain", part.getHeaders().get(HttpHeader.CONTENT_TYPE));
-                assertArrayEquals(data, Content.Source.asByteBuffer(part.getContentSource()).array());
+                assertEquals(toHexString(toBuffer(data)), toHexString(asByteBuffer(part.getContentSource())));
             }
         });
 
@@ -222,7 +224,7 @@ protected void process(MultiPartFormData.Parts parts) throws Exception
                 assertEquals(contentType, part.getHeaders().get(HttpHeader.CONTENT_TYPE));
                 assertEquals(fileName, part.getFileName());
                 assertEquals(data.length, part.getContentSource().getLength());
-                assertArrayEquals(data, Content.Source.asByteBuffer(part.getContentSource()).array());
+                assertEquals(toHexString(toBuffer(data)), toHexString(asByteBuffer(part.getContentSource())));
             }
         });
 
@@ -336,7 +338,7 @@ protected void process(MultiPartFormData.Parts parts) throws Exception
                 assertEquals("application/octet-stream", filePart.getHeaders().get(HttpHeader.CONTENT_TYPE));
                 assertEquals(tmpPath.getFileName().toString(), filePart.getFileName());
                 assertEquals(Files.size(tmpPath), filePart.getContentSource().getLength());
-                assertArrayEquals(data, Content.Source.asByteBuffer(filePart.getContentSource()).array());
+                assertEquals(toHexString(toBuffer(data)), toHexString(asByteBuffer(filePart.getContentSource())));
             }
         });
 
@@ -377,7 +379,7 @@ protected void process(MultiPartFormData.Parts parts) throws Exception
                 assertEquals("file", filePart.getName());
                 assertEquals("application/octet-stream", filePart.getHeaders().get(HttpHeader.CONTENT_TYPE));
                 assertEquals("fileName", filePart.getFileName());
-                assertArrayEquals(fileData, Content.Source.asByteBuffer(filePart.getContentSource()).array());
+                assertEquals(toHexString(toBuffer(fileData)), toHexString(asByteBuffer(filePart.getContentSource())));
             }
         });
 

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/GZIPContentDecoder.java

@@ -109,7 +109,7 @@ public RetainableByteBuffer decode(ByteBuffer compressed)
             RetainableByteBuffer result = acquire(length);
             for (RetainableByteBuffer buffer : _inflateds)
             {
-                BufferUtil.append(result.getByteBuffer(), buffer.getByteBuffer());
+                buffer.appendTo(result);
                 buffer.release();
             }
             _inflateds.clear();

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java

@@ -1114,7 +1114,7 @@ else if (type != HttpTokens.Type.SPACE && type != HttpTokens.Type.HTAB)
                     if (state == State.EPILOGUE)
                         notifyComplete();
                     else
-                        throw new EOFException("unexpected EOF");
+                        throw new EOFException("unexpected EOF in " + state);
                 }
             }
             catch (Throwable x)

jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/GZIPContentDecoderTest.java

@@ -53,7 +53,7 @@ public void before()
             public RetainableByteBuffer acquire(int size, boolean direct)
             {
                 counter.incrementAndGet();
-                return new RetainableByteBuffer.Wrapper(super.acquire(size, direct))
+                return new RetainableByteBuffer.Mutable.Wrapper(super.acquire(size, direct))
                 {
                     @Override
                     public boolean release()

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java

@@ -243,7 +243,7 @@ public void onHeaders(HeadersFrame frame)
     @Override
     public void onData(DataFrame frame)
     {
-        NetworkBuffer networkBuffer = producer.networkBuffer;
+        RetainableByteBuffer.Mutable networkBuffer = producer.networkBuffer;
         session.onData(new StreamData(frame, networkBuffer));
     }
 
@@ -311,15 +311,15 @@ public void onFlushed(long bytes) throws IOException
     protected class HTTP2Producer implements ExecutionStrategy.Producer
     {
         private final Callback fillableCallback = new FillableCallback();
-        private NetworkBuffer networkBuffer;
+        private RetainableByteBuffer.Mutable networkBuffer;
         private boolean shutdown;
         private boolean failed;
 
         private void setInputBuffer(ByteBuffer byteBuffer)
         {
             acquireNetworkBuffer();
-            // TODO handle buffer overflow?
-            networkBuffer.put(byteBuffer);
+            if (!networkBuffer.append(byteBuffer))
+                LOG.warn("overflow");
         }
 
         @Override
@@ -346,7 +346,7 @@ public Runnable produce()
                     {
                         while (networkBuffer.hasRemaining())
                         {
-                            session.getParser().parse(networkBuffer.getBuffer());
+                            session.getParser().parse(networkBuffer.getByteBuffer());
                             if (failed)
                                 return null;
                         }
@@ -364,7 +364,7 @@ public Runnable produce()
 
                     // Here we know that this.networkBuffer is not retained by
                     // application code: either it has been released, or it's a new one.
-                    int filled = fill(getEndPoint(), networkBuffer.getBuffer());
+                    int filled = fill(getEndPoint(), networkBuffer.getByteBuffer());
                     if (LOG.isDebugEnabled())
                         LOG.debug("Filled {} bytes in {}", filled, networkBuffer);
 
@@ -398,30 +398,30 @@ private void acquireNetworkBuffer()
         {
             if (networkBuffer == null)
             {
-                networkBuffer = new NetworkBuffer();
+                networkBuffer = bufferPool.acquire(bufferSize, isUseInputDirectByteBuffers()).asMutable();
                 if (LOG.isDebugEnabled())
                     LOG.debug("Acquired {}", networkBuffer);
             }
         }
 
         private void reacquireNetworkBuffer()
         {
-            NetworkBuffer currentBuffer = networkBuffer;
+            RetainableByteBuffer.Mutable currentBuffer = networkBuffer;
             if (currentBuffer == null)
                 throw new IllegalStateException();
 
             if (currentBuffer.hasRemaining())
                 throw new IllegalStateException();
 
             currentBuffer.release();
-            networkBuffer = new NetworkBuffer();
+            networkBuffer = bufferPool.acquire(bufferSize, isUseInputDirectByteBuffers()).asMutable();
             if (LOG.isDebugEnabled())
                 LOG.debug("Reacquired {}<-{}", currentBuffer, networkBuffer);
         }
 
         private void releaseNetworkBuffer()
         {
-            NetworkBuffer currentBuffer = networkBuffer;
+            RetainableByteBuffer.Mutable currentBuffer = networkBuffer;
             if (currentBuffer == null)
                 throw new IllegalStateException();
 
@@ -479,69 +479,21 @@ public boolean canRetain()
         }
 
         @Override
-        public void retain()
-        {
-            retainable.retain();
-        }
-
-        @Override
-        public boolean release()
-        {
-            return retainable.release();
-        }
-    }
-
-    private class NetworkBuffer implements Retainable
-    {
-        private final RetainableByteBuffer delegate;
-
-        private NetworkBuffer()
-        {
-            delegate = bufferPool.acquire(bufferSize, isUseInputDirectByteBuffers());
-        }
-
-        public ByteBuffer getBuffer()
-        {
-            return delegate.getByteBuffer();
-        }
-
         public boolean isRetained()
         {
-            return delegate.isRetained();
-        }
-
-        public boolean hasRemaining()
-        {
-            return delegate.hasRemaining();
-        }
-
-        @Override
-        public boolean canRetain()
-        {
-            return delegate.canRetain();
+            return retainable.isRetained();
         }
 
         @Override
         public void retain()
         {
-            delegate.retain();
+            retainable.retain();
         }
 
         @Override
         public boolean release()
         {
-            if (delegate.release())
-            {
-                if (LOG.isDebugEnabled())
-                    LOG.debug("Released retained {}", this);
-                return true;
-            }
-            return false;
-        }
-
-        private void put(ByteBuffer source)
-        {
-            BufferUtil.append(delegate.getByteBuffer(), source);
+            return retainable.release();
         }
     }
 }

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java

@@ -57,9 +57,9 @@
 import org.eclipse.jetty.http2.hpack.HpackException;
 import org.eclipse.jetty.http2.internal.HTTP2Flusher;
 import org.eclipse.jetty.http2.parser.Parser;
-import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.io.CyclicTimeouts;
 import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.io.WriteFlusher;
 import org.eclipse.jetty.util.AtomicBiInteger;
 import org.eclipse.jetty.util.Atomics;
@@ -1261,7 +1261,7 @@ public int getDataBytesRemaining()
             return 0;
         }
 
-        public abstract boolean generate(ByteBufferPool.Accumulator accumulator) throws HpackException;
+        public abstract boolean generate(RetainableByteBuffer.Mutable accumulator) throws HpackException;
 
         public abstract long onFlushed(long bytes) throws IOException;
 
@@ -1348,7 +1348,7 @@ public int getFrameBytesGenerated()
         }
 
         @Override
-        public boolean generate(ByteBufferPool.Accumulator accumulator) throws HpackException
+        public boolean generate(RetainableByteBuffer.Mutable accumulator) throws HpackException
         {
             frameBytes = generator.control(accumulator, frame);
             beforeSend();
@@ -1461,7 +1461,7 @@ public int getDataBytesRemaining()
         }
 
         @Override
-        public boolean generate(ByteBufferPool.Accumulator accumulator)
+        public boolean generate(RetainableByteBuffer.Mutable accumulator)
         {
             int dataRemaining = getDataBytesRemaining();
 

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/api/Stream.java

@@ -438,7 +438,7 @@ public default void onClosed(Stream stream)
     /**
      * <p>A {@link Retainable} wrapper of a {@link DataFrame}.</p>
      */
-    public abstract static class Data implements Retainable
+    abstract class Data implements Retainable
     {
         public static Data eof(int streamId)
         {

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/generator/DataGenerator.java

@@ -19,9 +19,7 @@
 import org.eclipse.jetty.http2.frames.DataFrame;
 import org.eclipse.jetty.http2.frames.Frame;
 import org.eclipse.jetty.http2.frames.FrameType;
-import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.io.RetainableByteBuffer;
-import org.eclipse.jetty.util.BufferUtil;
 
 public class DataGenerator
 {
@@ -32,12 +30,12 @@ public DataGenerator(HeaderGenerator headerGenerator)
         this.headerGenerator = headerGenerator;
     }
 
-    public int generate(ByteBufferPool.Accumulator accumulator, DataFrame frame, int maxLength)
+    public int generate(RetainableByteBuffer.Mutable accumulator, DataFrame frame, int maxLength)
     {
         return generateData(accumulator, frame.getStreamId(), frame.getByteBuffer(), frame.isEndStream(), maxLength);
     }
 
-    public int generateData(ByteBufferPool.Accumulator accumulator, int streamId, ByteBuffer data, boolean last, int maxLength)
+    public int generateData(RetainableByteBuffer.Mutable accumulator, int streamId, ByteBuffer data, boolean last, int maxLength)
     {
         if (streamId < 0)
             throw new IllegalArgumentException("Invalid stream id: " + streamId);
@@ -62,19 +60,17 @@ public int generateData(ByteBufferPool.Accumulator accumulator, int streamId, By
         return Frame.HEADER_LENGTH + length;
     }
 
-    private void generateFrame(ByteBufferPool.Accumulator accumulator, int streamId, ByteBuffer data, boolean last)
+    private void generateFrame(RetainableByteBuffer.Mutable accumulator, int streamId, ByteBuffer data, boolean last)
     {
         int length = data.remaining();
 
         int flags = Flags.NONE;
         if (last)
             flags |= Flags.END_STREAM;
 
-        RetainableByteBuffer header = headerGenerator.generate(FrameType.DATA, Frame.HEADER_LENGTH + length, length, flags, streamId);
-        BufferUtil.flipToFlush(header.getByteBuffer(), 0);
-        accumulator.append(header);
+        headerGenerator.generate(accumulator, FrameType.DATA, Frame.HEADER_LENGTH + length, length, flags, streamId);
         // Skip empty data buffers.
         if (data.remaining() > 0)
-            accumulator.append(RetainableByteBuffer.wrap(data));
+            accumulator.add(data);
     }
 }

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/generator/FrameGenerator.java

@@ -20,7 +20,6 @@
 import org.eclipse.jetty.http2.frames.FrameType;
 import org.eclipse.jetty.http2.hpack.HpackEncoder;
 import org.eclipse.jetty.http2.hpack.HpackException;
-import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.util.BufferUtil;
 
@@ -33,11 +32,11 @@ protected FrameGenerator(HeaderGenerator headerGenerator)
         this.headerGenerator = headerGenerator;
     }
 
-    public abstract int generate(ByteBufferPool.Accumulator accumulator, Frame frame) throws HpackException;
+    public abstract int generate(RetainableByteBuffer.Mutable accumulator, Frame frame) throws HpackException;
 
-    protected RetainableByteBuffer generateHeader(FrameType frameType, int length, int flags, int streamId)
+    protected void generateHeader(RetainableByteBuffer.Mutable accumulator, FrameType frameType, int length, int flags, int streamId)
     {
-        return headerGenerator.generate(frameType, Frame.HEADER_LENGTH + length, length, flags, streamId);
+        headerGenerator.generate(accumulator, frameType, Frame.HEADER_LENGTH + length, length, flags, streamId);
     }
 
     public int getMaxFrameSize()

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/generator/Generator.java

@@ -19,6 +19,7 @@
 import org.eclipse.jetty.http2.hpack.HpackEncoder;
 import org.eclipse.jetty.http2.hpack.HpackException;
 import org.eclipse.jetty.io.ByteBufferPool;
+import org.eclipse.jetty.io.RetainableByteBuffer;
 
 public class Generator
 {
@@ -76,12 +77,12 @@ public void setMaxFrameSize(int maxFrameSize)
         headerGenerator.setMaxFrameSize(maxFrameSize);
     }
 
-    public int control(ByteBufferPool.Accumulator accumulator, Frame frame) throws HpackException
+    public int control(RetainableByteBuffer.Mutable accumulator, Frame frame) throws HpackException
     {
         return generators[frame.getType().getType()].generate(accumulator, frame);
     }
 
-    public int data(ByteBufferPool.Accumulator accumulator, DataFrame frame, int maxLength)
+    public int data(RetainableByteBuffer.Mutable accumulator, DataFrame frame, int maxLength)
     {
         return dataGenerator.generate(accumulator, frame, maxLength);
     }