Experiment/12/improve default servlet

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

@@ -774,7 +774,7 @@ else if (response != null)
         }
 
         if (LOG.isDebugEnabled())
-            LOG.debug(_endOfContent.toString());
+            LOG.debug("endOfContent {} content-Length {}", _endOfContent.toString(), contentLength);
 
         // Add transfer encoding if it is not chunking
         if (transferEncoding != null)

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

@@ -656,7 +656,7 @@ public void close()
         @Override
         public long getLength()
         {
-            // TODO: it is difficult to calculate the length because
+            // TODO: #10307 it is difficult to calculate the length because
             //  we need to allow for customization of the headers from
             //  subclasses, and then serialize all the headers to get
             //  their length (handling UTF-8 values) and we don't want

jetty-core/jetty-security/src/main/java/org/eclipse/jetty/security/internal/DeferredAuthenticationState.java

@@ -181,6 +181,12 @@ public boolean isCommitted()
             return true;
         }
 
+        @Override
+        public boolean hasLastWrite()
+        {
+            return false;
+        }
+
         @Override
         public boolean isCompletedSuccessfully()
         {

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java

@@ -768,13 +768,13 @@ public Request getWrapped()
     }
 
     @SuppressWarnings("unchecked")
-    static <T extends Request.Wrapper> T as(Request request, Class<T> type)
+    static <T extends Request> T as(Request request, Class<T> type)
     {
-        while (request instanceof Request.Wrapper wrapper)
+        while (request != null)
         {
-            if (type.isInstance(wrapper))
-                return (T)wrapper;
-            request = wrapper.getWrapped();
+            if (type.isInstance(request))
+                return (T)request;
+            request = request instanceof Request.Wrapper wrapper ? wrapper.getWrapped() : null;
         }
         return null;
     }

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java

@@ -145,7 +145,7 @@ public List<String> getGzipEquivalentFileExtensions()
         return _gzipEquivalentFileExtensions;
     }
 
-    public void doGet(Request request, Response response, Callback callback, HttpContent content) throws Exception
+    public void doGet(Request request, Response response, Callback callback, HttpContent content)
     {
         String pathInContext = Request.getPathInContext(request);
 
@@ -523,7 +523,7 @@ protected void handleWelcomeAction(Request request, Response response, Callback
                 // TODO : check conditional headers.
                 serveWelcome(request, response, callback, welcomeAction.target);
             case REHANDLE -> rehandleWelcome(request, response, callback, welcomeAction.target);
-        };
+        }
     }
 
     /**
@@ -683,14 +683,15 @@ private void sendData(Request request, Response response, Callback callback, Htt
         }
 
         // There are multiple non-overlapping ranges, send a multipart/byteranges 206 response.
-        putHeaders(response, content, NO_CONTENT_LENGTH);
         response.setStatus(HttpStatus.PARTIAL_CONTENT_206);
         String contentType = "multipart/byteranges; boundary=";
         String boundary = MultiPart.generateBoundary(null, 24);
-        response.getHeaders().put(HttpHeader.CONTENT_TYPE, contentType + boundary);
         MultiPartByteRanges.ContentSource byteRanges = new MultiPartByteRanges.ContentSource(boundary);
         ranges.forEach(range -> byteRanges.addPart(new MultiPartByteRanges.Part(content.getContentTypeValue(), content.getResource().getPath(), range, contentLength)));
         byteRanges.close();
+        long partsContentLength = byteRanges.getLength();
+        putHeaders(response, content, partsContentLength);
+        response.getHeaders().put(HttpHeader.CONTENT_TYPE, contentType + boundary);
         Content.copy(byteRanges, response, callback);
     }
 

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java

@@ -99,6 +99,13 @@ public interface Response extends Content.Sink
      */
     boolean isCommitted();
 
+    /**
+     * <p>Returns whether the last write has been initiated on the response.</p>
+     *
+     * @return {@code true} if {@code last==true} has been passed to {@link #write(boolean, ByteBuffer, Callback)}.
+     */
+    boolean hasLastWrite();
+
     /**
      * <p>Returns whether the response completed successfully.</p>
      * <p>The response HTTP status code, HTTP headers and content
@@ -207,13 +214,13 @@ static Content.Chunk.Processor newTrailersChunkProcessor(Response response)
      * @see Wrapper
      */
     @SuppressWarnings("unchecked")
-    static <T extends Response.Wrapper> T as(Response response, Class<T> type)
+    static <T extends Response> T as(Response response, Class<T> type)
     {
-        while (response instanceof Response.Wrapper wrapper)
+        while (response != null)
         {
-            if (type.isInstance(wrapper))
-                return (T)wrapper;
-            response = wrapper.getWrapped();
+            if (type.isInstance(response))
+                return (T)response;
+            response = response instanceof Response.Wrapper wrapper ? wrapper.getWrapped() : null;
         }
         return null;
     }
@@ -580,6 +587,12 @@ public boolean isCommitted()
             return getWrapped().isCommitted();
         }
 
+        @Override
+        public boolean hasLastWrite()
+        {
+            return getWrapped().hasLastWrite();
+        }
+
         @Override
         public boolean isCompletedSuccessfully()
         {

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

@@ -69,8 +69,7 @@ protected void generateResponse(Request request, Response response, int code, St
                 {
                     if (LOG.isDebugEnabled())
                         LOG.debug("Unable to process error {}", reRequest, e);
-                    if (ExceptionUtil.areNotAssociated(cause, e))
-                        cause.addSuppressed(e);
+                    ExceptionUtil.addSuppressedIfNotAssociated(cause, e);
                     response.setStatus(code);
                 }
             }

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

@@ -136,7 +136,13 @@ public void write(boolean last, ByteBuffer content, Callback callback)
             case NOT_COMPRESSING -> super.write(last, content, callback);
             case COMMITTING -> callback.failed(new WritePendingException());
             case COMPRESSING -> gzip(last, callback, content);
-            default -> callback.failed(new IllegalStateException("state=" + _state.get()));
+            default ->
+            {
+                if (BufferUtil.isEmpty(content))
+                    callback.succeeded();
+                else
+                    callback.failed(new IllegalStateException("state=" + _state.get()));
+            }
         }
     }
 

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java

@@ -473,8 +473,7 @@ else if (ExceptionUtil.areNotAssociated(_failure.getFailure(), x) && _failure.ge
                     }
                     catch (Throwable throwable)
                     {
-                        if (ExceptionUtil.areNotAssociated(x, throwable))
-                            x.addSuppressed(throwable);
+                        ExceptionUtil.addSuppressedIfNotAssociated(x, throwable);
                     }
 
                     // If the application has not been otherwise informed of the failure
@@ -1080,8 +1079,7 @@ public void addFailureListener(Consumer<Throwable> onFailure)
                         }
                         catch (Throwable t)
                         {
-                            if (ExceptionUtil.areNotAssociated(throwable, t))
-                                throwable.addSuppressed(t);
+                            ExceptionUtil.addSuppressedIfNotAssociated(throwable, t);
                         }
                         finally
                         {
@@ -1354,6 +1352,18 @@ public boolean isCommitted()
             return _httpFields.isCommitted();
         }
 
+        @Override
+        public boolean hasLastWrite()
+        {
+            try (AutoLock ignored = _request._lock.lock())
+            {
+                if (_request._httpChannelState == null)
+                    return true;
+
+                return _request._httpChannelState._streamSendState != StreamSendState.SENDING;
+            }
+        }
+
         @Override
         public boolean isCompletedSuccessfully()
         {
@@ -1540,8 +1550,7 @@ public void failed(Throwable failure)
 
                 // Consume any input.
                 Throwable unconsumed = stream.consumeAvailable();
-                if (ExceptionUtil.areNotAssociated(unconsumed, failure))
-                    failure.addSuppressed(unconsumed);
+                ExceptionUtil.addSuppressedIfNotAssociated(failure, unconsumed);
 
                 if (LOG.isDebugEnabled())
                     LOG.debug("failed stream.isCommitted={}, response.isCommitted={} {}", httpChannelState._stream.isCommitted(), httpChannelState._response.isCommitted(), this);
@@ -1689,8 +1698,7 @@ public void succeeded()
                     Callback.from(() -> httpChannelState._handlerInvoker.failed(failure),
                         x ->
                         {
-                            if (ExceptionUtil.areNotAssociated(failure, x))
-                                failure.addSuppressed(x);
+                            ExceptionUtil.addSuppressedIfNotAssociated(failure, x);
                             httpChannelState._handlerInvoker.failed(failure);
                         }));
             }
@@ -1758,8 +1766,7 @@ else if (error == null)
                 }
                 catch (Throwable t)
                 {
-                    if (ExceptionUtil.areNotAssociated(failure, t))
-                        failure.addSuppressed(t);
+                    ExceptionUtil.addSuppressedIfNotAssociated(failure, t);
                     super.onError(task, failure);
                 }
             }

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

@@ -478,8 +478,7 @@ public void failed(Throwable x)
                 }
                 catch (Throwable t)
                 {
-                    if (ExceptionUtil.areNotAssociated(x, t))
-                        x.addSuppressed(t);
+                    ExceptionUtil.addSuppressedIfNotAssociated(x, t);
                 }
                 finally
                 {

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

@@ -26,6 +26,7 @@
  */
 public class ExceptionUtil
 {
+
     /**
      * <p>Convert a {@link Throwable} to a specific type by casting or construction on a new instance.</p>
      *
@@ -178,6 +179,18 @@ public static boolean areNotAssociated(Throwable t1, Throwable t2)
         return true;
     }
 
+    /**
+     * Add a suppressed exception if it is not associated.
+     * @see #areNotAssociated(Throwable, Throwable)
+     * @param throwable The main Throwable
+     * @param suppressed The Throwable to suppress if it is not associated.
+     */
+    public static void addSuppressedIfNotAssociated(Throwable throwable, Throwable suppressed)
+    {
+        if (areNotAssociated(throwable, suppressed))
+            throwable.addSuppressed(suppressed);
+    }
+
     /**
      * Decorate a Throwable with the suppressed errors and return it.
      * @param t the throwable

jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/AsyncContextState.java

@@ -149,11 +149,6 @@ public void reset()
         _state = null;
     }
 
-    public ServletChannelState getServletChannelState()
-    {
-        return state();
-    }
-
     public static class WrappedAsyncListener implements AsyncListener
     {
         private final AsyncListener _listener;