[api] changed to support http issue 115

Yaniv Inbar · Yaniv Inbar · commit 5c32469f1903 · 2012-08-22T16:21:00.000-04:00
http://codereview.appspot.com/6458156/
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java b/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java
@@ -14,6 +14,7 @@
 
 package com.google.api.client.googleapis;
 
+import com.google.api.client.http.EmptyContent;
 import com.google.api.client.http.HttpExecuteInterceptor;
 import com.google.api.client.http.HttpMethod;
 import com.google.api.client.http.HttpRequest;
@@ -79,8 +80,10 @@ public void intercept(HttpRequest request) {
       HttpMethod method = request.getMethod();
       request.setMethod(HttpMethod.POST);
       request.getHeaders().set("X-HTTP-Method-Override", method.name());
-      // Google servers will fail to process a POST unless the Content-Length header >= 1
-      request.setAllowEmptyContent(false);
+      // Google servers will fail to process a POST unless the Content-Length header is specified
+      if (request.getContent() == null) {
+        request.setContent(new EmptyContent());
+      }
     }
   }
 
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
@@ -17,7 +17,7 @@
 import com.google.api.client.googleapis.GoogleHeaders;
 import com.google.api.client.googleapis.MethodOverride;
 import com.google.api.client.http.AbstractInputStreamContent;
-import com.google.api.client.http.ByteArrayContent;
+import com.google.api.client.http.EmptyContent;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpContent;
 import com.google.api.client.http.HttpMethod;
@@ -268,7 +268,6 @@ public HttpResponse upload(GenericUrl initiationRequestUrl) throws IOException {
     while (true) {
       currentRequest = requestFactory.buildPutRequest(uploadUrl, null);
       new MethodOverride().intercept(currentRequest); // needed for PUT
-      currentRequest.setAllowEmptyContent(false);
       setContentAndHeadersOnCurrentRequest(bytesUploaded);
       if (backOffPolicyEnabled) {
         // Set MediaExponentialBackOffPolicy as the BackOffPolicy of the HTTP Request which will
@@ -326,13 +325,13 @@ private HttpResponse executeUploadInitiation(GenericUrl initiationRequestUrl) th
     updateStateAndNotifyListener(UploadState.INITIATION_STARTED);
 
     initiationRequestUrl.put("uploadType", "resumable");
+    HttpContent content = metadata == null ? new EmptyContent() : metadata;
     HttpRequest request =
-        requestFactory.buildRequest(initiationMethod, initiationRequestUrl, metadata);
+        requestFactory.buildRequest(initiationMethod, initiationRequestUrl, content);
     addMethodOverride(request);
     initiationHeaders.setUploadContentType(mediaContent.getType());
     initiationHeaders.setUploadContentLength(getMediaContentLength());
     request.setHeaders(initiationHeaders);
-    request.setAllowEmptyContent(false);
     request.setRetryOnExecuteIOException(true);
     request.setEnableGZipContent(true);
     HttpResponse response = request.execute();
@@ -400,9 +399,6 @@ public void serverErrorCallback() throws IOException {
     // Query the current status of the upload by issuing an empty POST request on the upload URI.
     HttpRequest request = requestFactory.buildPutRequest(currentRequest.getUrl(), null);
     new MethodOverride().intercept(request); // needed for PUT
-    // The resumable media upload protocol requires Content-Length to be 0.
-    request.setAllowEmptyContent(true);
-    request.setContent(new ByteArrayContent(null, new byte[0]));
 
     request.getHeaders().setContentRange("bytes */" + getMediaContentLength());
     request.setThrowExceptionOnExecuteError(false);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/GoogleClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/GoogleClient.java
@@ -18,6 +18,7 @@
 import com.google.api.client.googleapis.batch.BatchRequest;
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.googleapis.subscriptions.SubscriptionManager;
+import com.google.api.client.http.EmptyContent;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpMethod;
 import com.google.api.client.http.HttpRequest;
@@ -215,8 +216,10 @@ protected HttpRequest buildHttpRequest(HttpMethod method, GenericUrl url, Object
       throws IOException {
     HttpRequest httpRequest = super.buildHttpRequest(method, url, body);
     new MethodOverride().intercept(httpRequest);
-    // Google servers will fail to process a POST/PUT/PATCH unless the Content-Length header >= 1
-    httpRequest.setAllowEmptyContent(false);
+    // custom methods may use POST with no content but require a Content-Length header
+    if (body == null && method.equals(HttpMethod.POST)) {
+      httpRequest.setContent(new EmptyContent());
+    }
     return httpRequest;
   }
 
