feat: adding user-project to MultipartUpload APIs.

Author: ShreyasSinha

google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadHttpRequestManager.java

@@ -113,6 +113,9 @@ ListPartsResponse sendListPartsRequest(ListPartsRequest request) throws IOExcept
             false);
     HttpRequest httpRequest = requestFactory.buildGetRequest(new GenericUrl(listUri));
     httpRequest.getHeaders().putAll(headerProvider.getHeaders());
+    if (request.userProject() != null) {
+      httpRequest.getHeaders().put("x-goog-user-project", request.userProject());
+    }
     httpRequest.setParser(objectParser);
     httpRequest.setThrowExceptionOnExecuteError(true);
     return httpRequest.execute().parseAs(ListPartsResponse.class);
@@ -149,6 +152,9 @@ ListMultipartUploadsResponse sendListMultipartUploadsRequest(ListMultipartUpload
             false);
     HttpRequest httpRequest = requestFactory.buildGetRequest(new GenericUrl(listUri));
     httpRequest.getHeaders().putAll(headerProvider.getHeaders());
+    if (request.userProject() != null) {
+      httpRequest.getHeaders().put("x-goog-user-project", request.userProject());
+    }
     httpRequest.setParser(objectParser);
     httpRequest.setThrowExceptionOnExecuteError(true);
     return httpRequest.execute().parseAs(ListMultipartUploadsResponse.class);
@@ -167,6 +173,9 @@ AbortMultipartUploadResponse sendAbortMultipartUploadRequest(AbortMultipartUploa
 
     HttpRequest httpRequest = requestFactory.buildDeleteRequest(new GenericUrl(abortUri));
     httpRequest.getHeaders().putAll(headerProvider.getHeaders());
+    if (request.userProject() != null) {
+      httpRequest.getHeaders().put("x-goog-user-project", request.userProject());
+    }
     httpRequest.setParser(objectParser);
     httpRequest.setThrowExceptionOnExecuteError(true);
     return httpRequest.execute().parseAs(AbortMultipartUploadResponse.class);
@@ -213,6 +222,9 @@ UploadPartResponse sendUploadPartRequest(
     HttpRequest httpRequest =
         requestFactory.buildPutRequest(new GenericUrl(uploadUri), rewindableContent);
     httpRequest.getHeaders().putAll(headerProvider.getHeaders());
+    if (request.userProject() != null) {
+      httpRequest.getHeaders().put("x-goog-user-project", request.userProject());
+    }
     if (request.getCrc32c() != null) {
       addChecksumHeader(request.getCrc32c(), httpRequest.getHeaders());
     } else {

google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadRequest.java

@@ -28,11 +28,13 @@ public final class AbortMultipartUploadRequest {
   private final String bucket;
   private final String key;
   private final String uploadId;
+  private final String userProject;
 
   private AbortMultipartUploadRequest(Builder builder) {
     this.bucket = builder.bucket;
     this.key = builder.key;
     this.uploadId = builder.uploadId;
+    this.userProject = builder.userProject;
   }
 
   /**
@@ -68,6 +70,19 @@ public String uploadId() {
     return uploadId;
   }
 
+  /**
+   * Returns the user-project.
+   *
+   * @return the user-project.
+   * @see <a
+   *     href="https://docs.cloud.google.com/storage/docs/xml-api/reference-headers#xgooguserproject">x-goog-user-project</a>
+   * @since 2.61 This new api is in preview and is subject to breaking changes.
+   */
+  @BetaApi
+  public String userProject() {
+    return userProject;
+  }
+
   /**
    * Returns a new builder for creating {@link AbortMultipartUploadRequest} instances.
    *
@@ -89,6 +104,7 @@ public static class Builder {
     private String bucket;
     private String key;
     private String uploadId;
+    private String userProject;
 
     private Builder() {}
 
@@ -131,6 +147,21 @@ public Builder uploadId(String uploadId) {
       return this;
     }
 
+    /**
+     * Sets the user-project.
+     *
+     * @param userProject The user-project.
+     * @return This builder.
+     * @see <a
+     *     href="https://docs.cloud.google.com/storage/docs/xml-api/reference-headers#xgooguserproject">x-goog-user-project</a>
+     * @since 2.61 This new api is in preview and is subject to breaking changes.
+     */
+    @BetaApi
+    public Builder userProject(String userProject) {
+      this.userProject = userProject;
+      return this;
+    }
+
     /**
      * Builds a new {@link AbortMultipartUploadRequest} instance.
      *

google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsRequest.java

@@ -37,6 +37,7 @@ public final class ListMultipartUploadsRequest {
   private final Integer maxUploads;
   private final String prefix;
   private final String uploadIdMarker;
+  private final String userProject;
 
   private ListMultipartUploadsRequest(
       String bucket,
@@ -45,14 +46,16 @@ private ListMultipartUploadsRequest(
       String keyMarker,
       Integer maxUploads,
       String prefix,
-      String uploadIdMarker) {
+      String uploadIdMarker,
+      String userProject) {
     this.bucket = bucket;
     this.delimiter = delimiter;
     this.encodingType = encodingType;
     this.keyMarker = keyMarker;
     this.maxUploads = maxUploads;
     this.prefix = prefix;
     this.uploadIdMarker = uploadIdMarker;
+    this.userProject = userProject;
   }
 
   /**
@@ -134,6 +137,19 @@ public String uploadIdMarker() {
     return uploadIdMarker;
   }
 
+  /**
+   * Returns the user-project.
+   *
+   * @return the user-project.
+   * @see <a
+   *     href="https://docs.cloud.google.com/storage/docs/xml-api/reference-headers#xgooguserproject">x-goog-user-project</a>
+   * @since 2.61 This new api is in preview and is subject to breaking changes.
+   */
+  @BetaApi
+  public String userProject() {
+    return userProject;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -149,13 +165,21 @@ public boolean equals(Object o) {
         && Objects.equals(keyMarker, that.keyMarker)
         && Objects.equals(maxUploads, that.maxUploads)
         && Objects.equals(prefix, that.prefix)
-        && Objects.equals(uploadIdMarker, that.uploadIdMarker);
+        && Objects.equals(uploadIdMarker, that.uploadIdMarker)
+        && Objects.equals(userProject, that.userProject);
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(
-        bucket, delimiter, encodingType, keyMarker, maxUploads, prefix, uploadIdMarker);
+        bucket,
+        delimiter,
+        encodingType,
+        keyMarker,
+        maxUploads,
+        prefix,
+        uploadIdMarker,
+        userProject);
   }
 
   @Override
@@ -168,6 +192,7 @@ public String toString() {
         .add("maxUploads", maxUploads)
         .add("prefix", prefix)
         .add("uploadIdMarker", uploadIdMarker)
+        .add("userProject", userProject)
         .toString();
   }
 
@@ -196,6 +221,7 @@ public static final class Builder {
     private Integer maxUploads;
     private String prefix;
     private String uploadIdMarker;
+    private String userProject;
 
     private Builder() {}
 
@@ -290,6 +316,21 @@ public Builder uploadIdMarker(String uploadIdMarker) {
       return this;
     }
 
+    /**
+     * Sets the user-project.
+     *
+     * @param userProject The user-project.
+     * @return This builder.
+     * @see <a
+     *     href="https://docs.cloud.google.com/storage/docs/xml-api/reference-headers#xgooguserproject">x-goog-user-project</a>
+     * @since 2.61 This new api is in preview and is subject to breaking changes.
+     */
+    @BetaApi
+    public Builder userProject(String userProject) {
+      this.userProject = userProject;
+      return this;
+    }
+
     /**
      * Builds the request.
      *
@@ -299,7 +340,14 @@ public Builder uploadIdMarker(String uploadIdMarker) {
     @BetaApi
     public ListMultipartUploadsRequest build() {
       return new ListMultipartUploadsRequest(
-          bucket, delimiter, encodingType, keyMarker, maxUploads, prefix, uploadIdMarker);
+          bucket,
+          delimiter,
+          encodingType,
+          keyMarker,
+          maxUploads,
+          prefix,
+          uploadIdMarker,
+          userProject);
     }
   }
 }

google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsRequest.java

@@ -37,12 +37,15 @@ public final class ListPartsRequest {
 
   private final Integer partNumberMarker;
 
+  private final String userProject;
+
   private ListPartsRequest(Builder builder) {
     this.bucket = builder.bucket;
     this.key = builder.key;
     this.uploadId = builder.uploadId;
     this.maxParts = builder.maxParts;
     this.partNumberMarker = builder.partNumberMarker;
+    this.userProject = builder.userProject;
   }
 
   /**
@@ -100,6 +103,19 @@ public Integer partNumberMarker() {
     return partNumberMarker;
   }
 
+  /**
+   * Returns the user-project.
+   *
+   * @return the user-project.
+   * @see <a
+   *     href="https://docs.cloud.google.com/storage/docs/xml-api/reference-headers#xgooguserproject">x-goog-user-project</a>
+   * @since 2.61 This new api is in preview and is subject to breaking changes.
+   */
+  @BetaApi
+  public String userProject() {
+    return userProject;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -113,12 +129,13 @@ public boolean equals(Object o) {
         && Objects.equals(key, that.key)
         && Objects.equals(uploadId, that.uploadId)
         && Objects.equals(maxParts, that.maxParts)
-        && Objects.equals(partNumberMarker, that.partNumberMarker);
+        && Objects.equals(partNumberMarker, that.partNumberMarker)
+        && Objects.equals(userProject, that.userProject);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(bucket, key, uploadId, maxParts, partNumberMarker);
+    return Objects.hash(bucket, key, uploadId, maxParts, partNumberMarker, userProject);
   }
 
   @Override
@@ -129,6 +146,7 @@ public String toString() {
         .add("uploadId", uploadId)
         .add("maxParts", maxParts)
         .add("partNumberMarker", partNumberMarker)
+        .add("userProject", userProject)
         .toString();
   }
 
@@ -155,6 +173,7 @@ public static class Builder {
     private String uploadId;
     private Integer maxParts;
     private Integer partNumberMarker;
+    private String userProject;
 
     private Builder() {}
 
@@ -223,6 +242,21 @@ public Builder partNumberMarker(Integer partNumberMarker) {
       return this;
     }
 
+    /**
+     * Sets the user-project.
+     *
+     * @param userProject The user-project.
+     * @return This builder.
+     * @see <a
+     *     href="https://docs.cloud.google.com/storage/docs/xml-api/reference-headers#xgooguserproject">x-goog-user-project</a>
+     * @since 2.61 This new api is in preview and is subject to breaking changes.
+     */
+    @BetaApi
+    public Builder userProject(String userProject) {
+      this.userProject = userProject;
+      return this;
+    }
+
     /**
      * Builds a new {@link ListPartsRequest} object.
      *