WIP

Author: gregw

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

@@ -29,12 +29,17 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
+import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+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;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.util.Fields.Field;
@@ -75,7 +80,21 @@ public Map<String, List<String>> getQueryParameters() {
 
   @Override
   public Map<String, HttpPart> getParts() {
-    // TODO
+
+    // 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);
+      try {
+        MultiPartFormData.Parts parts =
+            MultiPartFormData.from(request, boundary, parser -> parser.parse(request)).get();
+        return StreamSupport.stream(parts.spliterator(), false)
+            .map(HttpPartImpl::new)
+            .collect(toMap(HttpPartImpl::getName, p -> p));
+      } catch (InterruptedException | ExecutionException e) {
+        throw new RuntimeException(e);
+      }
+    }
     return Collections.emptyMap();
   }
 
@@ -123,6 +142,10 @@ private HttpPartImpl(Part part) {
       this.part = part;
     }
 
+    public String getName() {
+      return part.getName();
+    }
+
     @Override
     public Optional<String> getFileName() {
       return Optional.ofNullable(part.getFileName());

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

@@ -20,6 +20,7 @@
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,7 +31,6 @@
 import java.util.TreeMap;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
-import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.io.writer.AbstractOutputStreamWriter;
 import org.eclipse.jetty.server.Response;
@@ -96,19 +96,11 @@ public OutputStream getOutputStream() throws IOException {
   @Override
   public synchronized BufferedWriter getWriter() throws IOException {
     if (writer == null) {
-      // TODO request a utility method from the Jetty project to do this
       String contentType = getContentType().orElse(null);
-      String encoding = MimeTypes.getCharsetFromContentType(contentType);
-      if (encoding == null && contentType != null) {
-        encoding = MimeTypes.DEFAULTS.getCharsetAssumedFromContentType(contentType);
-      }
-      if (encoding == null && contentType != null) {
-        encoding = MimeTypes.DEFAULTS.getCharsetInferredFromContentType(contentType);
-      }
-      encoding = Objects.requireNonNullElse(encoding, StandardCharsets.UTF_8.name());
-
-      writer = new BufferedWriter(AbstractOutputStreamWriter
-          .newWriter(getOutputStream(), encoding));
+      Charset charset = Objects.requireNonNullElse(
+          response.getRequest().getContext().getMimeTypes().getCharset(contentType),
+          StandardCharsets.UTF_8);
+      writer = new BufferedWriter(AbstractOutputStreamWriter.newWriter(getOutputStream(), charset));
     }
     return writer;
   }