Jetty 13.0.x buffers

documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ContentDocs.java

@@ -26,6 +26,7 @@
 import org.eclipse.jetty.util.CompletableTask;
 import org.eclipse.jetty.util.IteratingCallback;
 import org.eclipse.jetty.util.Utf8StringBuilder;
+import org.eclipse.jetty.util.buffer.ReadableBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -268,7 +269,7 @@ public String getResult()
     static class SinkWrong
     {
         // tag::sinkWrong[]
-        public void wrongWrite(Content.Sink sink, ByteBuffer content1, ByteBuffer content2)
+        public void wrongWrite(Content.Sink sink, ReadableBuffer content1, ReadableBuffer content2)
         {
             // Initiate a first write.
             sink.write(false, content1, Callback.NOOP);
@@ -282,7 +283,7 @@ public void wrongWrite(Content.Sink sink, ByteBuffer content1, ByteBuffer conten
     static class SinkMany
     {
         // tag::sinkMany[]
-        public void manyWrites(Content.Sink sink, ByteBuffer content1, ByteBuffer content2)
+        public void manyWrites(Content.Sink sink, ReadableBuffer content1, ReadableBuffer content2)
         {
             // Initiate a first write.
             // Callback.Completable is-a CompletableFuture.
@@ -343,7 +344,7 @@ protected Action process() throws Throwable
             boolean last = length == 0;
 
             // Start the non-blocking write, passing "this" as the callback.
-            sink.write(last, byteBuffer, this);
+            sink.write(last, ReadableBuffer.wrap(byteBuffer), this);
             return Action.SCHEDULED;
         }
 
@@ -410,7 +411,7 @@ protected Action process() throws Throwable
                 throw chunk.getFailure();
 
             // Copy the chunk by scheduling an asynchronous write.
-            sink.write(chunk.isLast(), chunk.getByteBuffer(), this);
+            sink.write(chunk.isLast(), ReadableBuffer.wrap(chunk.getByteBuffer()), this);
             return Action.SCHEDULED;
         }
 

documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/HTTP2Docs.java

@@ -29,6 +29,7 @@
 import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.http2.client.HTTP2Client;
 import org.eclipse.jetty.http2.frames.HeadersFrame;
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.util.Callback;
 
 @SuppressWarnings("unused")
@@ -48,12 +49,12 @@ public void dataDemanded() throws Exception
         HeadersFrame headersFrame = new HeadersFrame(request, null, true);
 
         // tag::dataUnwrap[]
-        record Chunk(ByteBuffer byteBuffer, Callback callback)
+        record Data(ByteBuffer buffer, Callback callback)
         {
         }
 
         // A queue that consumers poll to consume content asynchronously.
-        Queue<Chunk> dataQueue = new ConcurrentLinkedQueue<>();
+        Queue<Data> dataQueue = new ConcurrentLinkedQueue<>();
 
         // Implementation of Stream.Listener.onDataAvailable(Stream stream)
         // in case of unwrapping of the Data object for asynchronous content
@@ -63,26 +64,26 @@ record Chunk(ByteBuffer byteBuffer, Callback callback)
             @Override
             public void onDataAvailable(Stream stream)
             {
-                Stream.Data data = stream.readData();
+                Content.Chunk chunk = stream.read();
 
-                if (data == null)
+                if (chunk == null)
                 {
                     stream.demand();
                     return;
                 }
 
                 // Get the content buffer.
-                ByteBuffer byteBuffer = data.frame().getByteBuffer();
+                ByteBuffer byteBuffer = chunk.getByteBuffer();
 
                 // Unwrap the Data object, converting it to a Chunk.
                 // The Data.release() semantic is maintained in the completion of the Callback.
-                dataQueue.offer(new Chunk(byteBuffer, Callback.from(() ->
+                dataQueue.offer(new Data(byteBuffer, Callback.from(() ->
                 {
                     // When the buffer has been consumed, then:
                     // A) release the Data object.
-                    data.release();
+                    chunk.release();
                     // B) possibly demand more DATA frames.
-                    if (!data.frame().isEndStream())
+                    if (!chunk.isLast())
                         stream.demand();
                 })));
 

documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/client/http2/HTTP2ClientDocs.java

@@ -34,15 +34,16 @@
 import org.eclipse.jetty.http2.api.Session;
 import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.http2.client.HTTP2Client;
-import org.eclipse.jetty.http2.frames.DataFrame;
 import org.eclipse.jetty.http2.frames.Frame;
 import org.eclipse.jetty.http2.frames.HeadersFrame;
 import org.eclipse.jetty.http2.frames.PushPromiseFrame;
 import org.eclipse.jetty.http2.frames.ResetFrame;
 import org.eclipse.jetty.http2.frames.SettingsFrame;
 import org.eclipse.jetty.io.ClientConnector;
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.NanoTime;
+import org.eclipse.jetty.util.buffer.ReadableBuffer;
 
 import static java.lang.System.Logger.Level.INFO;
 
@@ -192,17 +193,17 @@ public void newStreamWithData() throws Exception
 
         // The request content, in two chunks.
         String content1 = "{\"greet\": \"hello world\"}";
-        ByteBuffer buffer1 = StandardCharsets.UTF_8.encode(content1);
+        ReadableBuffer buffer1 = ReadableBuffer.wrap(StandardCharsets.UTF_8.encode(content1));
         String content2 = "{\"user\": \"jetty\"}";
-        ByteBuffer buffer2 = StandardCharsets.UTF_8.encode(content2);
+        ReadableBuffer buffer2 = ReadableBuffer.wrap(StandardCharsets.UTF_8.encode(content2));
 
         // Send the first DATA frame on the stream, with endStream=false
         // to signal that there are more frames in this stream.
-        CompletableFuture<Stream> dataCF1 = stream.data(new DataFrame(stream.getId(), buffer1, false));
+        CompletableFuture<Stream> dataCF1 = stream.data(buffer1, false);
 
         // Only when the first chunk has been sent we can send the second,
         // with endStream=true to signal that there are no more frames.
-        dataCF1.thenCompose(s -> s.data(new DataFrame(s.getId(), buffer2, true)));
+        dataCF1.thenCompose(s -> s.data(buffer2, true));
         // end::newStreamWithData[]
     }
 
@@ -249,26 +250,26 @@ public void onHeaders(Stream stream, HeadersFrame frame)
             @Override
             public void onDataAvailable(Stream stream)
             {
-                // Read a Data object.
-                Stream.Data data = stream.readData();
+                // Read a Chunk object.
+                Content.Chunk chunk = stream.read();
 
-                if (data == null)
+                if (chunk == null)
                 {
                     // Demand more DATA frames.
                     stream.demand();
                     return;
                 }
 
                 // Get the content buffer.
-                ByteBuffer buffer = data.frame().getByteBuffer();
+                ByteBuffer buffer = chunk.getByteBuffer();
 
                 // Consume the buffer, here - as an example - just log it.
                 System.getLogger("http2").log(INFO, "Consuming buffer {0}", buffer);
 
                 // Tell the implementation that the buffer has been consumed.
-                data.release();
+                chunk.release();
 
-                if (!data.frame().isEndStream())
+                if (!chunk.isLast())
                 {
                     // Demand more DATA frames when they are available.
                     stream.demand();
@@ -365,20 +366,20 @@ public void onDataAvailable(Stream stream)
                     {
                         // Handle the pushed stream "response" content.
 
-                        Stream.Data data = stream.readData();
+                        Content.Chunk chunk = stream.read();
 
-                        if (data == null)
+                        if (chunk == null)
                         {
                             stream.demand();
                             return;
                         }
 
                         // The pushed stream "response" content bytes.
-                        ByteBuffer buffer = data.frame().getByteBuffer();
+                        ByteBuffer buffer = chunk.getByteBuffer();
                         // Consume the buffer and release the Data object.
-                        data.release();
+                        chunk.release();
 
-                        if (!data.frame().isEndStream())
+                        if (!chunk.isLast())
                         {
                             // Demand more DATA frames when they are available.
                             stream.demand();

documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/client/http3/HTTP3ClientDocs.java

@@ -40,6 +40,7 @@
 import org.eclipse.jetty.quic.quiche.client.QuicheTransport;
 import org.eclipse.jetty.util.Blocker;
 import org.eclipse.jetty.util.Promise;
+import org.eclipse.jetty.util.buffer.ReadableBuffer;
 
 import static java.lang.System.Logger.Level.INFO;
 
@@ -181,14 +182,14 @@ public void newStreamWithData() throws Exception
 
         // Send the first DATA frame on the stream, with last=false
         // to signal that there are more frames in this stream.
-        stream.data(new DataFrame(buffer1, false), new Promise.Invocable.NonBlocking<>()
+        stream.data(new DataFrame(ReadableBuffer.wrap(buffer1), false), new Promise.Invocable.NonBlocking<>()
         {
             @Override
             public void succeeded(Stream result)
             {
                 // Only when the first chunk has been sent we can send the second,
                 // with last=true to signal that there will be no more frames.
-                result.data(new DataFrame(buffer2, true), Promise.Invocable.noop());
+                result.data(new DataFrame(ReadableBuffer.wrap(buffer2), true), Promise.Invocable.noop());
             }
         });
         // end::newStreamWithData[]

documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/migration/ServletToHandlerDocs.java

@@ -44,6 +44,7 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.Fields;
 import org.eclipse.jetty.util.Promise;
+import org.eclipse.jetty.util.buffer.ReadableBuffer;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -608,7 +609,7 @@ public boolean handle(Request request, Response response, Callback callback) thr
 
             // Explicit first write that writes the response status code, headers and content.
             // When this write completes, the Handler callback is completed.
-            response.write(true, content, callback);
+            response.write(true, ReadableBuffer.wrap(content), callback);
 
             return true;
         }
@@ -639,7 +640,7 @@ public boolean handle(Request request, Response response, Callback callback) thr
                 {
                     // Now explicitly write the content as the last write.
                     // When this write completes, the Handler callback is completed.
-                    response.write(true, content, callback);
+                    response.write(true, ReadableBuffer.wrap(content), callback);
                 }
                 else
                 {
@@ -706,7 +707,7 @@ public boolean handle(Request request, Response response, Callback callback) thr
             // The trailers have not been written yet; they will be written with the last write.
             ByteBuffer content = UTF_8.encode("Hello World");
             Callback.Completable completable = new Callback.Completable();
-            response.write(false, content, completable);
+            response.write(false, ReadableBuffer.wrap(content), completable);
 
             completable.whenComplete((ignored, failure) ->
             {

documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java

@@ -116,6 +116,7 @@
 import org.eclipse.jetty.util.Fields;
 import org.eclipse.jetty.util.NanoTime;
 import org.eclipse.jetty.util.Promise;
+import org.eclipse.jetty.util.buffer.ReadableBuffer;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.ssl.KeyStoreScanner;
@@ -987,7 +988,7 @@ public boolean handle(Request request, Response response, Callback callback)
                     .whenComplete((ignored, failure) ->
                     {
                         if (failure == null)
-                            response.write(true, UTF_8.encode("HELLO"), callback);
+                            response.write(true, ReadableBuffer.wrap(UTF_8.encode("HELLO")), callback);
                         else
                             callback.failed(failure);
                     });
@@ -1030,7 +1031,7 @@ public boolean handle(Request request, Response response, Callback callback)
                 responseHeaders.put(HttpHeader.CONTENT_LENGTH, contentLength);
 
                 // Commit the response.
-                response.write(true, ByteBuffer.wrap(bytes), callback);
+                response.write(true, ReadableBuffer.wrap(bytes), callback);
 
                 // Return true because the callback will eventually be completed.
                 return true;