make multipart/mixed requests in compiliance with RFC7230

DPakJ · neozwu · commit 3a5602f8ca99 · 2017-09-13T14:55:21.000-07:00
The current implementation of multipart/mixed requests in batch does not comply with RFC 7230. https://tools.ietf.org/html/rfc7230#section-3.1.1 The version is missing from the request line. As a result, ESF servers throw parse exceptions when using batch requests using these clients. We need this change in order to migrate our server from GSE to ESF. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164786022
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java
@@ -18,7 +18,6 @@
 import com.google.api.client.http.HttpContent;
 import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.http.HttpRequest;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -35,19 +34,24 @@ class HttpRequestContent extends AbstractHttpContent {
 
   /** HTTP request. */
   private final HttpRequest request;
+  private static final String HTTP_VERSION = "HTTP/1.1";
 
   HttpRequestContent(HttpRequest request) {
     super("application/http");
     this.request = request;
   }
 
+  @Override
   public void writeTo(OutputStream out) throws IOException {
     Writer writer = new OutputStreamWriter(out, getCharset());
     // write method and URL
     writer.write(request.getRequestMethod());
     writer.write(" ");
     writer.write(request.getUrl().build());
+    writer.write(" ");
+    writer.write(HTTP_VERSION);
     writer.write(NEWLINE);
+
     // write headers
     HttpHeaders headers = new HttpHeaders();
     headers.fromHttpHeaders(request.getHeaders());
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java
@@ -2,6 +2,8 @@
 
 package com.google.api.client.googleapis.batch;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.google.api.client.googleapis.batch.BatchRequest.RequestInfo;
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonError.ErrorInfo;
@@ -701,30 +703,34 @@ public void testExecute_checkWriteTo() throws Exception {
 
     final StringBuilder expectedOutput = new StringBuilder();
     expectedOutput.append("--__END_OF_PART__\r\n");
-    expectedOutput.append("Content-Length: 109\r\n");
+    expectedOutput.append("Content-Length: 118\r\n");
     expectedOutput.append("Content-Type: application/http\r\n");
     expectedOutput.append("content-id: 1\r\n");
     expectedOutput.append("content-transfer-encoding: binary\r\n");
     expectedOutput.append("\r\n");
-    expectedOutput.append("POST http://test/dummy/url1\r\n");
+    expectedOutput.append("POST http://test/dummy/url1 HTTP/1.1\r\n");
     expectedOutput.append("Content-Length: 26\r\n");
     expectedOutput.append("Content-Type: " + request1ContentType + "\r\n");
     expectedOutput.append("\r\n");
     expectedOutput.append(request1Content + "\r\n");
     expectedOutput.append("--__END_OF_PART__\r\n");
-    expectedOutput.append("Content-Length: 30\r\n");
+    expectedOutput.append("Content-Length: 39\r\n");
     expectedOutput.append("Content-Type: application/http\r\n");
     expectedOutput.append("content-id: 2\r\n");
     expectedOutput.append("content-transfer-encoding: binary\r\n");
     expectedOutput.append("\r\n");
-    expectedOutput.append("GET http://test/dummy/url2\r\n");
+    expectedOutput.append("GET http://test/dummy/url2 HTTP/1.1\r\n");
     expectedOutput.append("\r\n");
     expectedOutput.append("\r\n");
     expectedOutput.append("--__END_OF_PART__--\r\n");
     MockHttpTransport transport = new MockHttpTransport();
-    HttpRequest request1 = transport.createRequestFactory().buildRequest(
-        request1Method, new GenericUrl(request1Url),
-        new ByteArrayContent(request1ContentType, request1Content.getBytes()));
+    HttpRequest request1 =
+        transport
+            .createRequestFactory()
+            .buildRequest(
+                request1Method,
+                new GenericUrl(request1Url),
+                new ByteArrayContent(request1ContentType, request1Content.getBytes(UTF_8)));
     HttpRequest request2 = transport.createRequestFactory()
         .buildRequest(request2Method, new GenericUrl(request2Url), null);
     subtestExecute_checkWriteTo(expectedOutput.toString(), request1, request2);
@@ -806,9 +812,9 @@ public boolean retrySupported() {
           }
         });
     subtestExecute_checkWriteTo(new StringBuilder().append("--__END_OF_PART__\r\n")
-        .append("Content-Length: 27\r\n").append("Content-Type: application/http\r\n")
+        .append("Content-Length: 36\r\n").append("Content-Type: application/http\r\n")
         .append("content-id: 1\r\n").append("content-transfer-encoding: binary\r\n").append("\r\n")
-        .append("POST http://google.com/\r\n").append("\r\n").append("\r\n")
+        .append("POST http://google.com/ HTTP/1.1\r\n").append("\r\n").append("\r\n")
         .append("--__END_OF_PART__--\r\n").toString(), request1);
   }
 
