WIP

Signed-off-by: gregw <gregw@webtide.com>

Author: gregw

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

@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -110,7 +111,8 @@ public long getContentLength() {
 
   @Override
   public Optional<String> getCharacterEncoding() {
-    return Optional.ofNullable(MimeTypes.nameOf(Request.getCharset(request)));
+    Charset charset = Request.getCharset(request);
+    return Optional.ofNullable(charset == null ? null : charset.name());
   }
 
   @Override

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

@@ -32,7 +32,7 @@
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.io.Content;
-import org.eclipse.jetty.io.writer.AbstractOutputStreamWriter;
+import org.eclipse.jetty.io.AbstractOutputStreamWriter;
 import org.eclipse.jetty.server.Response;
 
 public class HttpResponseImpl implements HttpResponse {