Revert "Revert NON_POOLING change" (#11649)

This reverts commit 2bf7d6c.
jetty · Apr 18, 2024 · 33feac3 · 33feac3
1 parent 940c744
commit 33feac3
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 37 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/GZIPContentDecoder.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/GZIPContentDecoder.java
@@ -67,7 +67,7 @@ public GZIPContentDecoder(InflaterPool inflaterPool, ByteBufferPool byteBufferPo
         _inflaterEntry = inflaterPool.acquire();
         _inflater = _inflaterEntry.get();
         _bufferSize = bufferSize;
-        _pool = byteBufferPool != null ? byteBufferPool : new ByteBufferPool.NonPooling();
+        _pool = byteBufferPool != null ? byteBufferPool : ByteBufferPool.NON_POOLING;
         reset();
     }
 

diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartByteRanges.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartByteRanges.java
@@ -239,7 +239,7 @@ public Part(HttpFields headers, Resource resource, ByteRange byteRange, ByteBuff
             super(null, null, headers);
             this.resource = resource;
             this.byteRange = byteRange;
-            this.bufferPool = bufferPool == null ? new ByteBufferPool.NonPooling() : bufferPool;
+            this.bufferPool = bufferPool == null ? ByteBufferPool.NON_POOLING : bufferPool;
         }
 
         @Override

diff --git a/...re/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java b/...re/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java
@@ -77,7 +77,7 @@ public class CachingHttpContentFactory implements HttpContent.Factory
     public CachingHttpContentFactory(HttpContent.Factory authority, ByteBufferPool bufferPool)
     {
         _authority = authority;
-        _bufferPool = bufferPool != null ? bufferPool : new ByteBufferPool.NonPooling();
+        _bufferPool = bufferPool != null ? bufferPool : ByteBufferPool.NON_POOLING;
     }
 
     protected ConcurrentMap<String, CachingHttpContent> getCache()

diff --git a/...ty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java b/...ty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java
@@ -55,7 +55,7 @@ private void testGenerateParse(ByteBuffer byteBuffer)
         byteBuffer.get(inputBytes);
         DataFrame input = new DataFrame(ByteBuffer.wrap(inputBytes), true);
 
-        ByteBufferPool.NonPooling bufferPool = new ByteBufferPool.NonPooling();
+        ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
         ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator();
         new MessageGenerator(bufferPool, null, true).generate(accumulator, 0, input, null);
 

diff --git a/...-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java b/...-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java
@@ -34,7 +34,7 @@ public void testGenerateParse()
     {
         GoAwayFrame input = GoAwayFrame.CLIENT_GRACEFUL;
 
-        ByteBufferPool.NonPooling bufferPool = new ByteBufferPool.NonPooling();
+        ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
         ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator();
         new ControlGenerator(bufferPool, true).generate(accumulator, 0, input, null);
 

diff --git a/...http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java b/...http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java
@@ -49,7 +49,7 @@ public void testGenerateParse()
 
         QpackEncoder encoder = new QpackEncoder(instructions -> {});
         encoder.setMaxHeadersSize(4 * 1024);
-        ByteBufferPool.NonPooling bufferPool = new ByteBufferPool.NonPooling();
+        ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
         ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator();
         new MessageGenerator(bufferPool, encoder, true).generate(accumulator, 0, input, null);
 

diff --git a/...ttp3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java b/...ttp3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java
@@ -46,7 +46,7 @@ private void testGenerateParse(Map<Long, Long> settings)
     {
         SettingsFrame input = new SettingsFrame(settings);
 
-        ByteBufferPool.NonPooling bufferPool = new ByteBufferPool.NonPooling();
+        ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
         ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator();
         new ControlGenerator(bufferPool, true).generate(accumulator, 0, input, null);
 

diff --git a/...http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderInstructionParserTest.java b/...http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/DecoderInstructionParserTest.java
@@ -32,7 +32,7 @@
 
 public class DecoderInstructionParserTest
 {
-    private final ByteBufferPool bufferPool = new ByteBufferPool.NonPooling();
+    private final ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
     private DecoderInstructionParser _instructionParser;
     private DecoderParserDebugHandler _handler;
 

diff --git a/...tty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/InstructionGeneratorTest.java b/...tty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/InstructionGeneratorTest.java
@@ -25,7 +25,7 @@
 
 public class InstructionGeneratorTest
 {
-    private final ByteBufferPool _bufferPool = new ByteBufferPool.NonPooling();
+    private final ByteBufferPool _bufferPool = ByteBufferPool.NON_POOLING;
 
     private String toHexString(Instruction instruction)
     {

diff --git a/...ty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/QpackTestUtil.java b/...ty-http3/jetty-http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/QpackTestUtil.java
@@ -33,7 +33,7 @@ public class QpackTestUtil
 {
     public static ByteBuffer toBuffer(Instruction... instructions)
     {
-        ByteBufferPool.NonPooling bufferPool = new ByteBufferPool.NonPooling();
+        ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
         ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator();
         for (Instruction instruction : instructions)
         {
@@ -57,7 +57,7 @@ public static Matcher<String> equalsHex(String expectedString)
 
     public static ByteBuffer toBuffer(List<Instruction> instructions)
     {
-        ByteBufferPool bufferPool = new ByteBufferPool.NonPooling();
+        ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
         ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator();
         instructions.forEach(i -> i.encode(bufferPool, accumulator));
         assertThat(accumulator.getSize(), is(instructions.size()));

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferAccumulator.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferAccumulator.java
@@ -44,7 +44,7 @@ public ByteBufferAccumulator()
 
     public ByteBufferAccumulator(ByteBufferPool bufferPool, boolean direct)
     {
-        _bufferPool = (bufferPool == null) ? new ByteBufferPool.NonPooling() : bufferPool;
+        _bufferPool = (bufferPool == null) ? ByteBufferPool.NON_POOLING : bufferPool;
         _direct = direct;
     }
 

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferAggregator.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferAggregator.java
@@ -53,7 +53,7 @@ public ByteBufferAggregator(ByteBufferPool bufferPool, boolean direct, int start
             throw new IllegalArgumentException("startSize must be > 0, was: " + startSize);
         if (startSize > maxSize)
             throw new IllegalArgumentException("maxSize (" + maxSize + ") must be >= startSize (" + startSize + ")");
-        _bufferPool = (bufferPool == null) ? new ByteBufferPool.NonPooling() : bufferPool;
+        _bufferPool = (bufferPool == null) ? ByteBufferPool.NON_POOLING : bufferPool;
         _direct = direct;
         _maxSize = maxSize;
         _currentSize = startSize;

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferOutputStream2.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferOutputStream2.java
@@ -36,7 +36,7 @@ public ByteBufferOutputStream2()
 
     public ByteBufferOutputStream2(ByteBufferPool bufferPool, boolean direct)
     {
-        _accumulator = new ByteBufferAccumulator(bufferPool == null ? new ByteBufferPool.NonPooling() : bufferPool, direct);
+        _accumulator = new ByteBufferAccumulator(bufferPool == null ? ByteBufferPool.NON_POOLING : bufferPool, direct);
     }
 
     /**

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferPool.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferPool.java
@@ -45,6 +45,8 @@
  */
 public interface ByteBufferPool
 {
+    ByteBufferPool NON_POOLING = new NonPooling();
+
     /**
      * <p>Acquires a {@link RetainableByteBuffer} from this pool.</p>
      *

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/IOResources.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/IOResources.java
@@ -62,7 +62,7 @@ public static RetainableByteBuffer toRetainableByteBuffer(Resource resource, Byt
             throw new IllegalArgumentException("Resource length exceeds 2 GiB: " + resource);
         int length = (int)longLength;
 
-        bufferPool = bufferPool == null ? new ByteBufferPool.NonPooling() : bufferPool;
+        bufferPool = bufferPool == null ? ByteBufferPool.NON_POOLING : bufferPool;
 
         // Optimize for PathResource.
         Path path = resource.getPath();
@@ -371,7 +371,7 @@ public PathToSinkCopier(Path path, Content.Sink sink, ByteBufferPool pool, int b
             if (first > -1)
                 channel.position(first);
             this.sink = sink;
-            this.pool = pool == null ? new ByteBufferPool.NonPooling() : pool;
+            this.pool = pool == null ? ByteBufferPool.NON_POOLING : pool;
             this.bufferSize = bufferSize <= 0 ? 4096 : bufferSize;
             this.direct = direct;
             this.remainingLength = length;

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java
@@ -64,7 +64,7 @@ public BufferedContentSink(Content.Sink delegate, ByteBufferPool bufferPool, boo
         if (maxBufferSize < maxAggregationSize)
             throw new IllegalArgumentException("maxBufferSize (" + maxBufferSize + ") must be >= maxAggregationSize (" + maxAggregationSize + ")");
         _delegate = delegate;
-        _bufferPool = (bufferPool == null) ? new ByteBufferPool.NonPooling() : bufferPool;
+        _bufferPool = (bufferPool == null) ? ByteBufferPool.NON_POOLING : bufferPool;
         _direct = direct;
         _maxBufferSize = maxBufferSize;
         _maxAggregationSize = maxAggregationSize;

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/InputStreamContentSource.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/InputStreamContentSource.java
@@ -54,7 +54,7 @@ public InputStreamContentSource(InputStream inputStream)
     public InputStreamContentSource(InputStream inputStream, ByteBufferPool bufferPool)
     {
         this.inputStream = Objects.requireNonNull(inputStream);
-        this.bufferPool = bufferPool != null ? bufferPool : new ByteBufferPool.NonPooling();
+        this.bufferPool = bufferPool != null ? bufferPool : ByteBufferPool.NON_POOLING;
     }
 
     public int getBufferSize()

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/PathContentSource.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/PathContentSource.java
@@ -63,7 +63,7 @@ public PathContentSource(Path path, ByteBufferPool byteBufferPool)
                 throw new AccessDeniedException(path.toString());
             this.path = path;
             this.length = Files.size(path);
-            this.byteBufferPool = byteBufferPool != null ? byteBufferPool : new ByteBufferPool.NonPooling();
+            this.byteBufferPool = byteBufferPool != null ? byteBufferPool : ByteBufferPool.NON_POOLING;
         }
         catch (IOException x)
         {

diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
@@ -112,10 +112,10 @@ else if (_baseResource.isAlias())
     private ByteBufferPool getByteBufferPool(Context context)
     {
         if (context == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         Server server = getServer();
         if (server == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         return server.getByteBufferPool();
     }
 

diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/MockConnector.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/MockConnector.java
@@ -21,7 +21,7 @@ public class MockConnector extends AbstractConnector
 {
     public MockConnector(Server server)
     {
-        super(server, server.getThreadPool(), server.getScheduler(), new ByteBufferPool.NonPooling(), 0);
+        super(server, server.getThreadPool(), server.getScheduler(), ByteBufferPool.NON_POOLING, 0);
     }
 
     @Override

diff --git a/...-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerByteRangesTest.java b/...-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerByteRangesTest.java
@@ -174,7 +174,7 @@ protected HttpContent.Factory newHttpContentFactory()
             {
                 return path -> new ResourceHttpContent(memResource, "text/plain")
                 {
-                    final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), new ByteBufferPool.NonPooling(), false).getByteBuffer();
+                    final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), ByteBufferPool.NON_POOLING, false).getByteBuffer();
 
                     @Override
                     public ByteBuffer getByteBuffer()
@@ -215,7 +215,7 @@ protected HttpContent.Factory newHttpContentFactory()
             {
                 return path -> new ResourceHttpContent(memResource, "text/plain")
                 {
-                    final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), new ByteBufferPool.NonPooling(), false).getByteBuffer();
+                    final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), ByteBufferPool.NON_POOLING, false).getByteBuffer();
 
                     @Override
                     public ByteBuffer getByteBuffer()

diff --git a/...jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java b/...jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java
@@ -249,7 +249,7 @@ public void testLargeFrame()
         expected.put(toBuffer(Integer.MAX_VALUE));
         expected.flip();
 
-        Parser parser = new Parser(new ByteBufferPool.NonPooling());
+        Parser parser = new Parser(ByteBufferPool.NON_POOLING);
         assertNull(parser.parse(expected));
         assertThat(parser.getPayloadLength(), equalTo(Integer.MAX_VALUE));
     }
@@ -265,7 +265,7 @@ public void testFrameTooLarge()
         expected.put(toBuffer(Integer.MAX_VALUE + 1L));
         expected.flip();
 
-        Parser parser = new Parser(new ByteBufferPool.NonPooling());
+        Parser parser = new Parser(ByteBufferPool.NON_POOLING);
         assertThrows(MessageTooLargeException.class, () -> parser.parse(expected));
     }
 
@@ -280,7 +280,7 @@ public void testLargestFrame()
         expected.put(new byte[]{(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF});
         expected.flip();
 
-        Parser parser = new Parser(new ByteBufferPool.NonPooling());
+        Parser parser = new Parser(ByteBufferPool.NON_POOLING);
         assertThrows(MessageTooLargeException.class, () -> parser.parse(expected));
     }
 

diff --git a/...jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java b/...jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java
@@ -42,7 +42,7 @@ public class OutgoingMessageCapture extends CoreSession.Empty implements CoreSes
     public BlockingQueue<ByteBuffer> binaryMessages = new LinkedBlockingDeque<>();
     public BlockingQueue<String> events = new LinkedBlockingDeque<>();
 
-    private final ByteBufferPool bufferPool = new ByteBufferPool.NonPooling();
+    private final ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
     private final MethodHandle wholeTextHandle;
     private final MethodHandle wholeBinaryHandle;
     private MessageSink messageSink;

diff --git a/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java b/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
@@ -320,10 +320,10 @@ public void init() throws ServletException
     private static ByteBufferPool getByteBufferPool(ContextHandler contextHandler)
     {
         if (contextHandler == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         Server server = contextHandler.getServer();
         if (server == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         return server.getByteBufferPool();
     }
 

diff --git a/...0/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/DefaultServletTest.java b/...0/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/DefaultServletTest.java
@@ -3516,7 +3516,7 @@ public void testMemoryResourceRangeUsingBufferedHttpContent() throws Exception
         context.addServlet(new ServletHolder(defaultServlet), "/");
         defaultServlet.getResourceService().setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain")
         {
-            final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), new ByteBufferPool.NonPooling(), false).getByteBuffer();
+            final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), ByteBufferPool.NON_POOLING, false).getByteBuffer();
 
             @Override
             public ByteBuffer getByteBuffer()
@@ -3570,7 +3570,7 @@ public void testMemoryResourceMultipleRangesUsingBufferedHttpContent() throws Ex
         context.addServlet(new ServletHolder(defaultServlet), "/");
         defaultServlet.getResourceService().setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain")
         {
-            final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), new ByteBufferPool.NonPooling(), false).getByteBuffer();
+            final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), ByteBufferPool.NON_POOLING, false).getByteBuffer();
 
             @Override
             public ByteBuffer getByteBuffer()

diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceHandler.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceHandler.java
@@ -114,10 +114,10 @@ public void doStart() throws Exception
     private static ByteBufferPool getByteBufferPool(ContextHandler contextHandler)
     {
         if (contextHandler == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         Server server = contextHandler.getServer();
         if (server == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         return server.getByteBufferPool();
     }
 

diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/DefaultServlet.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/DefaultServlet.java
@@ -318,10 +318,10 @@ protected Resource resolve(String pathInContext)
     private static ByteBufferPool getByteBufferPool(ContextHandler contextHandler)
     {
         if (contextHandler == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         Server server = contextHandler.getServer();
         if (server == null)
-            return new ByteBufferPool.NonPooling();
+            return ByteBufferPool.NON_POOLING;
         return server.getByteBufferPool();
     }
 

diff --git a/...y-common/src/test/java/org/eclipse/jetty/ee9/websocket/common/OutgoingMessageCapture.java b/...y-common/src/test/java/org/eclipse/jetty/ee9/websocket/common/OutgoingMessageCapture.java
@@ -41,7 +41,7 @@ public class OutgoingMessageCapture extends CoreSession.Empty implements CoreSes
     public BlockingQueue<ByteBuffer> binaryMessages = new LinkedBlockingDeque<>();
     public BlockingQueue<String> events = new LinkedBlockingDeque<>();
 
-    private final ByteBufferPool bufferPool = new ByteBufferPool.NonPooling();
+    private final ByteBufferPool bufferPool = ByteBufferPool.NON_POOLING;
     private final MethodHandle wholeTextHandle;
     private final MethodHandle wholeBinaryHandle;
     private MessageSink messageSink;