Added distribution test cases for EagerContentHandler modules.

Signed-off-by: Simone Bordet <[email protected]>

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/FormRequestContent.java

@@ -32,7 +32,7 @@ public FormRequestContent(Fields fields)
 
     public FormRequestContent(Fields fields, Charset charset)
     {
-        super("application/x-www-form-urlencoded", convert(fields, charset), charset);
+        super("application/x-www-form-urlencoded;charset=" + charset.name(), convert(fields, charset), charset);
     }
 
     public static String convert(Fields fields)

jetty-core/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java

@@ -24,7 +24,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -305,10 +304,7 @@ else if (Supplier.class.isAssignableFrom(context.getClass()))
         initializeContextPath(contextHandler, path);
 
         if (Files.isDirectory(path))
-        {
             contextHandler.setBaseResource(ResourceFactory.of(this).newResource(path));
-            System.err.println("SET BASE RESOURCE to " + path);
-        }
 
         //TODO think of better way of doing this
         //pass through properties as attributes directly

jetty-core/jetty-server/src/main/config/modules/eager-content.mod

@@ -2,8 +2,8 @@
 Applies the EagerContentHandler to the entire server
 #tag::description[]
 The EagerContentHandler can eagerly load content asynchronously before calling the next handler.
-Typically this handler is deployed before an application that uses blocking IO to read the request body and if deployed
-after this handler, the application will never (or seldom) block for request content.
+Typically, this handler is deployed before an application that uses blocking IO to read the request body
+and if deployed after this handler, the application will never (or rarely) block for request content.
 This gives many of the benefits of asynchronous IO without the need to write an asynchronous application.
 #end::description[]
 

jetty-core/jetty-server/src/main/config/modules/eager-multipart-content.mod

@@ -1,4 +1,3 @@
-
 [description]
 Applies MultiPart configuration to the EagerContentHandler
 
@@ -17,23 +16,23 @@ etc/jetty-eager-multipart-content.xml
 # jetty.eager.multipart.location=/tmp
 
 ## The maximum number of parts that can be parsed from the multipart content, or -1 for unlimited.
-# jetty.eager.multipart.maxParts=
+# jetty.eager.multipart.maxParts=100
 
 ## The maximum size in bytes of the whole multipart content, or -1 for unlimited.
-# jetty.eager.multipart.maxSize=
+# jetty.eager.multipart.maxSize=52428800
 
 ## The maximum part size in bytes, or -1 for unlimited.
-# jetty.eager.multipart.maxPartSize=
+# jetty.eager.multipart.maxPartSize=10485760
 
 ## The maximum size of a part in memory, after which it will be written as a file.
-# jetty.eager.multipart.maxMemoryPartSize=
+# jetty.eager.multipart.maxMemoryPartSize=1024
 
 ## The max length of a Part header, in bytes, or -1 for unlimited length.
-# jetty.eager.multipart.maxHeadersSize=
+# jetty.eager.multipart.maxHeadersSize=8192
 
 ## Whether parts without a fileName are stored as files.
-# jetty.eager.multipart.useFilesForPartsWithoutFileName=
+# jetty.eager.multipart.useFilesForPartsWithoutFileName=true
 
 ## The MultiPart compliance mode.
 # jetty.eager.multipart.complianceMode=RFC7578
-#end::documentation[]
+#end::documentation[]

jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-simple-webapp/src/main/java/org/eclipse/jetty/demo/simple/EchoServlet.java

@@ -0,0 +1,64 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.demo.simple;
+
+import java.io.IOException;
+import java.util.stream.Collectors;
+
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+@MultipartConfig
+public class EchoServlet extends HttpServlet
+{
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+    {
+        response.setContentType(request.getContentType());
+        ServletOutputStream output = response.getOutputStream();
+        String pathInfo = request.getPathInfo();
+        switch (pathInfo)
+        {
+            case "/form" ->
+            {
+                String content = request.getParameterMap().entrySet().stream()
+                    .map(e -> "%s=%s".formatted(e.getKey(), String.join(", ", e.getValue())))
+                    .collect(Collectors.joining("&"));
+                output.print(content);
+            }
+            case "/multipart" ->
+            {
+                MultipartConfigElement config = new MultipartConfigElement("");
+                request.setAttribute(MultipartConfigElement.class.getName(), config);
+
+                String content = request.getParts().stream()
+                    .map(part -> "name=%s&length=%d".formatted(part.getName(), part.getSize()))
+                    .collect(Collectors.joining(","));
+                output.print(content);
+            }
+            default ->
+            {
+                ServletInputStream input = request.getInputStream();
+                response.setContentLengthLong(request.getContentLengthLong());
+                input.transferTo(output);
+            }
+        }
+    }
+}

jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-simple-webapp/src/main/webapp/WEB-INF/web.xml

@@ -21,4 +21,13 @@
     <url-pattern>/hello/*</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>echo</servlet-name>
+    <servlet-class>org.eclipse.jetty.demo.simple.EchoServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>echo</servlet-name>
+    <url-pattern>/echo/*</url-pattern>
+  </servlet-mapping>
+
 </web-app>

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

@@ -1283,7 +1283,6 @@ private void extractContentParameters() throws BadMessageException
                         }
                         catch (IllegalStateException | IllegalArgumentException | CompletionException e)
                         {
-                            LOG.warn(e.toString());
                             throw new BadMessageException("Unable to parse form content", e);
                         }
                     }
@@ -1321,7 +1320,6 @@ else if (MimeTypes.Type.MULTIPART_FORM_DATA.is(baseType) &&
                         }
                         catch (IllegalStateException | IllegalArgumentException | CompletionException e)
                         {
-                            LOG.warn(e.toString());
                             throw new BadMessageException("Unable to parse form content", e);
                         }
                     }
@@ -1332,7 +1330,6 @@ else if (MimeTypes.Type.MULTIPART_FORM_DATA.is(baseType) &&
             }
             catch (IllegalStateException | IllegalArgumentException e)
             {
-                LOG.warn(e.toString());
                 throw new BadMessageException("Unable to parse form content", e);
             }
         }

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java

@@ -1292,7 +1292,6 @@ private void extractContentParameters() throws BadMessageException
                         }
                         catch (IllegalStateException | IllegalArgumentException | CompletionException e)
                         {
-                            LOG.warn(e.toString());
                             throw new BadMessageException("Unable to parse form content", e);
                         }
                     }
@@ -1330,7 +1329,6 @@ else if (MimeTypes.Type.MULTIPART_FORM_DATA.is(baseType) &&
                         }
                         catch (IllegalStateException | IllegalArgumentException | CompletionException e)
                         {
-                            LOG.warn(e.toString());
                             throw new BadMessageException("Unable to parse form content", e);
                         }
                     }
@@ -1341,7 +1339,6 @@ else if (MimeTypes.Type.MULTIPART_FORM_DATA.is(baseType) &&
             }
             catch (IllegalStateException | IllegalArgumentException e)
             {
-                LOG.warn(e.toString());
                 throw new BadMessageException("Unable to parse form content", e);
             }
         }