Content.Source from methods

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

@@ -36,7 +36,6 @@
 
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.io.content.ByteBufferContentSource;
-import org.eclipse.jetty.io.content.ByteChannelContentSource;
 import org.eclipse.jetty.io.content.ChunksContentSource;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.IO;
@@ -476,7 +475,7 @@ public Path getPath()
         public Content.Source newContentSource()
         {
             // TODO: use a ByteBuffer pool and direct ByteBuffers?
-            return new ByteChannelContentSource.PathContentSource(getPath());
+            return Content.Source.from(getPath());
         }
 
         @Override

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

@@ -24,7 +24,6 @@
 import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.io.IOResources;
-import org.eclipse.jetty.io.content.ByteChannelContentSource;
 import org.eclipse.jetty.io.content.ContentSourceCompletableFuture;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.thread.AutoLock;
@@ -164,14 +163,55 @@ protected int fillBufferFromInputStream(InputStream inputStream, byte[] buffer)
     }
 
     /**
-     * <p>A specialized {@link org.eclipse.jetty.io.content.ByteChannelContentSource.PathContentSource}
-     * whose content is sliced by a byte range.</p>
+     * <p>A specialized {@link Content.Source}
+     * whose {@link Path} content is sliced by a byte range.</p>
+     *
+     * @deprecated use {@link Content.Source#from(ByteBufferPool.Sized, Path, long, long)}
      */
-    public static class PathContentSource extends ByteChannelContentSource.PathContentSource
+    @Deprecated(forRemoval = true, since = "12.0.11")
+    public static class PathContentSource implements Content.Source
     {
+        private final Content.Source contentSource;
+
         public PathContentSource(Path path, ByteRange byteRange)
         {
-            super(new ByteBufferPool.Sized(null), path, byteRange.first(), byteRange.getLength());
+            contentSource = Content.Source.from(null, path, byteRange.first(), byteRange.getLength());
+        }
+
+        @Override
+        public void demand(Runnable demandCallback)
+        {
+            contentSource.demand(demandCallback);
+        }
+
+        @Override
+        public void fail(Throwable failure)
+        {
+            contentSource.fail(failure);
+        }
+
+        @Override
+        public void fail(Throwable failure, boolean last)
+        {
+            contentSource.fail(failure, last);
+        }
+
+        @Override
+        public long getLength()
+        {
+            return contentSource.getLength();
+        }
+
+        @Override
+        public Content.Chunk read()
+        {
+            return contentSource.read();
+        }
+
+        @Override
+        public boolean rewind()
+        {
+            return contentSource.rewind();
         }
     }
 

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

@@ -47,6 +47,7 @@
 public interface ByteBufferPool
 {
     ByteBufferPool NON_POOLING = new NonPooling();
+    ByteBufferPool.Sized SIZED_NON_POOLING = new Sized(ByteBufferPool.NON_POOLING);
 
     /**
      * <p>Acquires a {@link RetainableByteBuffer} from this pool.</p>

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

@@ -17,19 +17,25 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.SeekableByteChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
 
 import org.eclipse.jetty.io.content.BufferedContentSink;
+import org.eclipse.jetty.io.content.ByteBufferContentSource;
 import org.eclipse.jetty.io.content.ContentSinkOutputStream;
 import org.eclipse.jetty.io.content.ContentSinkSubscriber;
 import org.eclipse.jetty.io.content.ContentSourceInputStream;
 import org.eclipse.jetty.io.content.ContentSourcePublisher;
+import org.eclipse.jetty.io.content.InputStreamContentSource;
 import org.eclipse.jetty.io.internal.ByteBufferChunk;
+import org.eclipse.jetty.io.internal.ByteChannelContentSource;
 import org.eclipse.jetty.io.internal.ContentCopier;
 import org.eclipse.jetty.io.internal.ContentSourceByteBuffer;
 import org.eclipse.jetty.io.internal.ContentSourceConsumer;
@@ -151,6 +157,102 @@ public static void copy(Source source, Sink sink, Chunk.Processor chunkProcessor
      */
     public interface Source
     {
+        /**
+         * Create a {@code Content.Source} from zero or more {@link ByteBuffer}s
+         * @param byteBuffers The {@link ByteBuffer}s to use as the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(ByteBuffer... byteBuffers)
+        {
+            return new ByteBufferContentSource(byteBuffers);
+        }
+
+        /**
+         * Create a {@code Content.Source} from a {@link Path}.
+         * @param path The {@link Path}s to use as the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(Path path)
+        {
+            return from(null, path, 0, -1);
+        }
+
+        /**
+         * Create a {@code Content.Source} from a {@link Path}.
+         * @param path The {@link Path}s to use as the source.
+         * @param offset The offset in bytes from which to start the source
+         * @param length The length in bytes of the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(Path path, long offset, long length)
+        {
+            return from(null, path, offset, length);
+        }
+
+        /**
+         * Create a {@code Content.Source} from a {@link Path}.
+         * @param byteBufferPool The {@link org.eclipse.jetty.io.ByteBufferPool.Sized} to use for any internal buffers.
+         * @param path The {@link Path}s to use as the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(ByteBufferPool.Sized byteBufferPool, Path path)
+        {
+            return from(byteBufferPool, path, 0, -1);
+        }
+
+        /**
+         * Create a {@code Content.Source} from a {@link Path}.
+         * @param byteBufferPool The {@link org.eclipse.jetty.io.ByteBufferPool.Sized} to use for any internal buffers.
+         * @param path The {@link Path}s to use as the source.
+         * @param offset The offset in bytes from which to start the source
+         * @param length The length in bytes of the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(ByteBufferPool.Sized byteBufferPool, Path path, long offset, long length)
+        {
+            return new ByteChannelContentSource.PathContentSource(byteBufferPool, path, offset, length);
+        }
+
+        /**
+         * Create a {@code Content.Source} from a {@link ByteChannel}.
+         * @param byteBufferPool The {@link org.eclipse.jetty.io.ByteBufferPool.Sized} to use for any internal buffers.
+         * @param byteChannel The {@link ByteChannel}s to use as the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(ByteBufferPool.Sized byteBufferPool, ByteChannel byteChannel)
+        {
+            return new ByteChannelContentSource(byteBufferPool, byteChannel);
+        }
+
+        /**
+         * Create a {@code Content.Source} from a {@link ByteChannel}.
+         * @param byteBufferPool The {@link org.eclipse.jetty.io.ByteBufferPool.Sized} to use for any internal buffers.
+         * @param seekableByteChannel The {@link ByteChannel}s to use as the source.
+         * @param offset The offset in bytes from which to start the source
+         * @param length The length in bytes of the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(ByteBufferPool.Sized byteBufferPool, SeekableByteChannel seekableByteChannel, long offset, long length)
+        {
+            return new ByteChannelContentSource(byteBufferPool, seekableByteChannel, offset, length);
+        }
+
+        static Content.Source from(InputStream inputStream)
+        {
+            return from(null, inputStream);
+        }
+
+        /**
+         * Create a {@code Content.Source} from a {@link Path}.
+         * @param byteBufferPool The {@link org.eclipse.jetty.io.ByteBufferPool.Sized} to use for any internal buffers.
+         * @param inputStream The {@link InputStream}s to use as the source.
+         * @return A {@code Content.Source}
+         */
+        static Content.Source from(ByteBufferPool.Sized byteBufferPool, InputStream inputStream)
+        {
+            return new InputStreamContentSource(inputStream, byteBufferPool);
+        }
+
         /**
          * <p>Reads, non-blocking, the whole content source into a {@link ByteBuffer}.</p>
          *

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

@@ -21,7 +21,6 @@
 import java.nio.file.Path;
 
 import org.eclipse.jetty.io.content.ByteBufferContentSource;
-import org.eclipse.jetty.io.content.ByteChannelContentSource;
 import org.eclipse.jetty.io.content.InputStreamContentSource;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
@@ -137,7 +136,7 @@ public static Content.Source asContentSource(Resource resource, ByteBufferPool b
         Path path = resource.getPath();
         if (path != null)
         {
-            return new ByteChannelContentSource.PathContentSource(new ByteBufferPool.Sized(bufferPool, direct, bufferSize), path);
+            return Content.Source.from(new ByteBufferPool.Sized(bufferPool, direct, bufferSize), path, 0, -1);
         }
         if (resource instanceof MemoryResource memoryResource)
         {
@@ -181,7 +180,7 @@ public static Content.Source asContentSource(Resource resource, ByteBufferPool b
         Path path = resource.getPath();
         if (path != null)
         {
-            return new ByteChannelContentSource.PathContentSource(new ByteBufferPool.Sized(bufferPool, direct, bufferSize), path, first, length);
+            return Content.Source.from(new ByteBufferPool.Sized(bufferPool, direct, bufferSize), path, first, length);
         }
 
         // Try an optimization for MemoryResource.

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/InputStreamContentSource.java

@@ -58,7 +58,7 @@ public InputStreamContentSource(InputStream inputStream, ByteBufferPool bufferPo
     public InputStreamContentSource(InputStream inputStream, ByteBufferPool.Sized bufferPool)
     {
         this.inputStream = Objects.requireNonNull(inputStream);
-        this.bufferPool = Objects.requireNonNull(bufferPool);
+        this.bufferPool = Objects.requireNonNullElse(bufferPool, ByteBufferPool.SIZED_NON_POOLING);
     }
 
     public int getBufferSize()

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/ByteChannelContentSource.java → jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/internal/ByteChannelContentSource.java

@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.io.content;
+package org.eclipse.jetty.io.internal;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -83,7 +83,7 @@ public ByteChannelContentSource(ByteBufferPool.Sized byteBufferPool, ByteChannel
 
     private ByteChannelContentSource(ByteBufferPool.Sized byteBufferPool, ByteChannel byteChannel, long offset, long length)
     {
-        _byteBufferPool = Objects.requireNonNull(byteBufferPool);
+        _byteBufferPool = Objects.requireNonNullElse(byteBufferPool, ByteBufferPool.SIZED_NON_POOLING);
         _byteChannel = byteChannel;
         _offset = offset < 0 ? 0 : offset;
         _length = length;
@@ -246,28 +246,24 @@ public boolean rewind()
 
     /**
      * A {@link ByteChannelContentSource} for a {@link Path}
-     * @deprecated To be replaced by an updated {@link org.eclipse.jetty.io.content.PathContentSource} in 12.1.0
      */
-    @Deprecated(forRemoval = true, since = "12.0.11")
     public static class PathContentSource extends ByteChannelContentSource
     {
         private final Path _path;
 
         public PathContentSource(Path path)
         {
-            super(new ByteBufferPool.Sized(null), null, 0, size(path));
-            _path = path;
+            this(ByteBufferPool.SIZED_NON_POOLING, path, 0, -1);
         }
 
         public PathContentSource(ByteBufferPool.Sized byteBufferPool, Path path)
         {
-            super(byteBufferPool, null, 0, size(path));
-            _path = path;
+            this(byteBufferPool, path, 0, -1);
         }
 
         public PathContentSource(ByteBufferPool.Sized byteBufferPool, Path path, long offset, long length)
         {
-            super(byteBufferPool, null, offset, length);
+            super(byteBufferPool, null, offset, length < 0 ? size(path) : length);
             _path = path;
         }
 

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

@@ -37,11 +37,11 @@
 
 import org.eclipse.jetty.io.content.AsyncContent;
 import org.eclipse.jetty.io.content.ByteBufferContentSource;
-import org.eclipse.jetty.io.content.ByteChannelContentSource;
 import org.eclipse.jetty.io.content.ContentSourceInputStream;
 import org.eclipse.jetty.io.content.ContentSourceTransformer;
 import org.eclipse.jetty.io.content.InputStreamContentSource;
 import org.eclipse.jetty.io.content.PathContentSource;
+import org.eclipse.jetty.io.internal.ByteChannelContentSource;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;