#3822: Added contentOffset to MediaHttpUploader

google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java

@@ -260,6 +260,15 @@ public enum UploadState {
    */
   private boolean disableGZipContent;
 
+  /**
+   * Content offset for this uploader.
+   *
+   * <p>
+   * The default value is {@code -1}.
+   * </p>
+   */
+  private long contentOffset = -1;
+
   /** Sleeper. **/
   Sleeper sleeper = Sleeper.DEFAULT;
 
@@ -351,6 +360,7 @@ private HttpResponse directUpload(GenericUrl initiationRequestUrl) throws IOExce
       initiationRequestUrl.put("uploadType", "multipart");
     } else {
       initiationRequestUrl.put("uploadType", "media");
+      initiationRequestUrl.put("contentOffset", String.valueOf(contentOffset));
     }
     HttpRequest request =
         requestFactory.buildRequest(initiationRequestMethod, initiationRequestUrl, content);
@@ -850,6 +860,25 @@ public MediaHttpUploader setDisableGZipContent(boolean disableGZipContent) {
     return this;
   }
 
+  /**
+   * Returns content Offset for the uploader.
+   *
+   * @since 1.27
+   */
+  public long getContentOffset() {
+    return contentOffset;
+  }
+
+  /**
+   * Set content Offset for the uploader.
+   *
+   * @since 1.27
+   */
+  public MediaHttpUploader setContentOffset(long contentOffset) {
+    this.contentOffset = contentOffset;
+    return this;
+  }
+
   /**
    * Returns the sleeper.
    *

google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java

@@ -94,6 +94,9 @@ public abstract class AbstractGoogleClientRequest<T> extends GenericData {
   /** Whether to disable GZip compression of HTTP content. */
   private boolean disableGZipContent;
 
+  /** Content offset long the request for media uploader. */
+  private long contentOffset = -1;
+
   /** Response class to parse into. */
   private Class<T> responseClass;
 
@@ -223,6 +226,17 @@ public AbstractGoogleClientRequest<T> setDisableGZipContent(boolean disableGZipC
     return this;
   }
 
+  /** Gets content offset. */
+  public long getContentOffset() {
+    return contentOffset;
+  }
+
+  /** Sets content offset. */
+  public AbstractGoogleClientRequest<T> setContentOffset(long contentOffset) {
+    this.contentOffset = contentOffset;
+    return this;
+  }
+
   /** Returns the HTTP method. */
   public final String getRequestMethod() {
     return requestMethod;
@@ -505,7 +519,9 @@ private HttpResponse executeUnparsed(boolean usingHead) throws IOException {
       boolean throwExceptionOnExecuteError = httpRequest.getThrowExceptionOnExecuteError();
 
       response = uploader.setInitiationHeaders(requestHeaders)
-          .setDisableGZipContent(disableGZipContent).upload(httpRequestUrl);
+          .setDisableGZipContent(disableGZipContent)
+          .setContentOffset(contentOffset)
+          .upload(httpRequestUrl);
       response.getRequest().setParser(getAbstractGoogleClient().getObjectParser());
       // process any error
       if (throwExceptionOnExecuteError && !response.isSuccessStatusCode()) {

google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java

@@ -57,7 +57,7 @@ public class MediaHttpUploaderTest extends TestCase {
   private static final String TEST_RESUMABLE_REQUEST_URL =
       "http://www.test.com/request/url?uploadType=resumable";
   private static final String TEST_DIRECT_REQUEST_URL =
-      "http://www.test.com/request/url?uploadType=media";
+      "http://www.test.com/request/url?uploadType=media&contentOffset=-1";
   private static final String TEST_MULTIPART_REQUEST_URL =
       "http://www.test.com/request/url?uploadType=multipart";
   private static final String TEST_UPLOAD_URL = "http://www.test.com/media/upload/location";