Added fix for reuquest body

Author: ShreyasSinha

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

@@ -19,6 +19,7 @@
 
 import com.google.api.client.http.ByteArrayContent;
 import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpContent;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.HttpResponse;
@@ -55,7 +56,7 @@ public HttpResponse sendCreateMultipartUploadRequest(
 
   public HttpResponse sendUploadPartRequest(
       String uri,
-      byte[] partData,
+      HttpContent content,
       String authHeader,
       String contentType,
       String contentMd5,
@@ -64,7 +65,7 @@ public HttpResponse sendUploadPartRequest(
       throws IOException {
     HttpRequest httpRequest =
         requestFactory.buildPutRequest(
-            new GenericUrl(uri), new ByteArrayContent(contentType, partData));
+            new GenericUrl(uri), content);
     httpRequest.getHeaders().setAuthorization(authHeader);
     httpRequest.getHeaders().setContentType(contentType);
     httpRequest.getHeaders().setContentMD5(contentMd5);

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

@@ -169,15 +169,8 @@ public UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requ
         "?partNumber=" + request.partNumber() + "&uploadId=" + encode(request.uploadId());
     String uri = GCS_ENDPOINT + resourcePath + queryString;
     String contentType = "application/octet-stream";
-    MessageDigest md = MessageDigest.getInstance("MD5");
-    byte[] partData = requestBody.getPartData();
-    String contentMd5 = Base64.getEncoder().encodeToString(md.digest(partData));
-    String crc32cString =
-        Base64.getEncoder()
-            .encodeToString(
-                ByteBuffer.allocate(4)
-                    .putInt(Hashing.crc32c().hashBytes(partData).asInt())
-                    .array());
+    String contentMd5 = requestBody.getContent().getMd5();
+    String crc32cString = requestBody.getContent().getCrc32c();
     Map<String, String> extensionHeaders = getGenericExtensionHeader();
     extensionHeaders.put("x-goog-hash", "crc32c=" + crc32cString + ",md5=" + contentMd5);
 
@@ -187,7 +180,7 @@ public UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requ
           credentials.refreshIfExpired();
           AccessToken accessToken = credentials.getAccessToken();
           String authHeader = "Bearer " + accessToken.getTokenValue();
-          return httpRequestManager.sendUploadPartRequest(uri, partData, authHeader, contentType,
+          return httpRequestManager.sendUploadPartRequest(uri, requestBody.getContent(), authHeader, contentType,
               contentMd5, crc32cString, extensionHeaders);
         },
         Decoder.identity());

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

@@ -27,7 +27,6 @@
 public final class RequestBody {
 
   private final RewindableContent content;
-  private byte[] byteArray;
 
   private RequestBody(RewindableContent content) {
     this.content = content;
@@ -38,9 +37,7 @@ RewindableContent getContent() {
   }
 
   public static RequestBody empty() {
-    RequestBody requestBody = new RequestBody(RewindableContent.empty());
-    requestBody.byteArray = new byte[0];
-    return requestBody;
+    return new RequestBody(RewindableContent.empty());
   }
 
   public static RequestBody of(ByteBuffer... buffers) {
@@ -51,9 +48,7 @@ public static RequestBody fromByteBuffer(ByteBuffer buffer) {
     ByteBuffer duplicate = buffer.duplicate();
     byte[] arr = new byte[duplicate.remaining()];
     duplicate.get(arr);
-    RequestBody requestBody = new RequestBody(RewindableContent.of(buffer));
-    requestBody.byteArray = arr;
-    return requestBody;
+    return new RequestBody(RewindableContent.of(buffer));
   }
 
   public static RequestBody of(ByteBuffer[] srcs, int srcsOffset, int srcsLength) {
@@ -63,8 +58,4 @@ public static RequestBody of(ByteBuffer[] srcs, int srcsOffset, int srcsLength)
   public static RequestBody of(Path path) throws IOException {
     return new RequestBody(RewindableContent.of(path));
   }
-
-  public byte[] getPartData() {
-    return byteArray;
-  }
 }

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

@@ -18,7 +18,10 @@
 
 import com.google.api.client.http.AbstractHttpContent;
 import com.google.api.client.http.HttpMediaType;
+import com.google.api.client.util.Base64;
 import com.google.common.base.Preconditions;
+import com.google.common.hash.Hashing;
+import com.google.common.hash.HashingOutputStream;
 import com.google.common.io.ByteStreams;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -31,11 +34,17 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.security.DigestOutputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Locale;
 
 abstract class RewindableContent extends AbstractHttpContent {
 
+  private String md5;
+  private String crc32c;
+
   private RewindableContent() {
     super((HttpMediaType) null);
   }
@@ -58,7 +67,6 @@ private RewindableContent() {
    * this may cause an OutOfMemoryError.
    *
    * @return The byte array representation of the content.
-   * @throws IOException if an I/O error occurs.
    */
   public byte[] asByteArray() {
     if (getLength() == 0) {
@@ -80,6 +88,31 @@ public final boolean retrySupported() {
     return false;
   }
 
+  public String getMd5() throws IOException {
+    if (md5 == null) {
+      try {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        writeTo(new DigestOutputStream(ByteStreams.nullOutputStream(), md));
+        md5 = Base64.encodeBase64String(md.digest());
+      } catch (NoSuchAlgorithmException e) {
+        throw new IOException(e);
+      }
+    }
+    return md5;
+  }
+
+  public String getCrc32c() throws IOException {
+    if (crc32c == null) {
+      HashingOutputStream hashingOutputStream =
+          new HashingOutputStream(Hashing.crc32c(), ByteStreams.nullOutputStream());
+      writeTo(hashingOutputStream);
+      byte[] bytes =
+          ByteBuffer.allocate(4).putInt(hashingOutputStream.hash().asInt()).array();
+      crc32c = Base64.encodeBase64String(bytes);
+    }
+    return crc32c;
+  }
+
   static RewindableContent empty() {
     return EmptyRewindableContent.INSTANCE;
   }
@@ -121,6 +154,8 @@ public void writeTo(OutputStream out) throws IOException {
       out.flush();
     }
 
+
+
     @Override
     long writeTo(WritableByteChannel gbc) {
       return 0;