WIP

Author: gregw

invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java

@@ -36,8 +36,6 @@
 import java.util.stream.StreamSupport;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
-import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.http.MimeTypes.Type;
 import org.eclipse.jetty.http.MultiPart;
 import org.eclipse.jetty.http.MultiPart.Part;
 import org.eclipse.jetty.http.MultiPartFormData;
@@ -83,8 +81,8 @@ public Map<String, List<String>> getQueryParameters() {
   public Map<String, HttpPart> getParts() {
     // TODO initiate reading the parts asynchronously before invocation
     String contentType = request.getHeaders().get(HttpHeader.CONTENT_TYPE);
-    if (Type.MULTIPART_FORM_DATA.is(MimeTypes.getContentTypeWithoutCharset(contentType))) {
-      String boundary = MultiPart.extractBoundary(contentType);
+    String boundary = MultiPart.extractBoundary(contentType);
+    if (boundary != null) {
       try {
         MultiPartFormData.Parts parts =
             MultiPartFormData.from(request, boundary, parser -> parser.parse(request)).get();
@@ -208,5 +206,10 @@ public Map<String, List<String>> getHeaders() {
     private static <T> List<T> list(Collection<T> collection) {
       return (collection instanceof List<?>) ? (List<T>) collection : new ArrayList<>(collection);
     }
+
+    @Override
+    public String toString() {
+      return "%s{%s}".formatted(super.toString(), part);
+    }
   }
 }

invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java

@@ -63,6 +63,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
+import org.eclipse.jetty.client.ByteBufferRequestContent;
 import org.eclipse.jetty.client.ContentResponse;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.MultiPartRequestContent;
@@ -72,7 +73,7 @@
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.MultiPart;
-import org.eclipse.jetty.http.MultiPart.ByteBufferPart;
+import org.eclipse.jetty.http.MultiPart.ContentSourcePart;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
@@ -535,10 +536,11 @@ public void packageless() throws Exception {
   @Test
   public void multipart() throws Exception {
     MultiPartRequestContent multiPartRequestContent = new MultiPartRequestContent();
-
-    multiPartRequestContent.addPart(new ByteBufferPart("bytes", null, HttpFields.EMPTY, ByteBuffer.wrap(new byte[17])));
-    multiPartRequestContent.addPart(new MultiPart.ContentSourcePart("string", null, HttpFields.EMPTY, new StringRequestContent("1234567890")));
-    multiPartRequestContent.addPart(new MultiPart.PathPart("icon", "img.png", HttpFields.EMPTY, Path.of("/tmp/img.png")));
+    byte[] bytes = new byte[17];
+    multiPartRequestContent.addPart(new ContentSourcePart("bytes", null,
+        HttpFields.EMPTY, new ByteBufferRequestContent(ByteBuffer.wrap(bytes))));
+    multiPartRequestContent.addPart(new MultiPart.ContentSourcePart("string", null,
+        HttpFields.EMPTY, new StringRequestContent("1234567890")));
     multiPartRequestContent.close();
 
     String expectedResponse =
@@ -548,7 +550,7 @@ public void multipart() throws Exception {
         fullTarget("Multipart"),
         ImmutableList.of(
             TestCase.builder()
-                .setHttpContentType(Optional.empty())
+                .setHttpContentType(multiPartRequestContent.getContentType())
                 .setRequestContent(multiPartRequestContent)
                 .setExpectedResponseText(expectedResponse)
                 .build()));