Fixed interface names

Author: ShreyasSinha

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

@@ -119,7 +119,7 @@ public UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requ
         throw new RuntimeException("Failed to upload part " + request.partNumber() + ": " + connection.getResponseCode() + " " + error);
     }
     String eTag = connection.getHeaderField("ETag");
-    return UploadPartResponse.builder().etag(eTag).build();
+    return UploadPartResponse.builder().eTag(eTag).build();
   }
 
   public CompleteMultipartUploadResponse completeMultipartUpload(CompleteMultipartUploadRequest request)
@@ -129,10 +129,10 @@ public CompleteMultipartUploadResponse completeMultipartUpload(CompleteMultipart
     String uri = GCS_ENDPOINT + resourcePath + queryString;
 
     StringBuilder xmlBodyBuilder = new StringBuilder("<CompleteMultipartUpload>\n");
-    for (CompletedPart part : request.completedMultipartUpload().completedPartList()) {
+    for (CompletedPart part : request.multipartUpload().parts()) {
       xmlBodyBuilder.append("  <Part>\n");
       xmlBodyBuilder.append("    <PartNumber>").append(part.partNumber()).append("</PartNumber>\n");
-      xmlBodyBuilder.append("    <ETag>").append(part.etag()).append("</ETag>\n");
+      xmlBodyBuilder.append("    <ETag>").append(part.eTag()).append("</ETag>\n");
       xmlBodyBuilder.append("  </Part>\n");
     }
     xmlBodyBuilder.append("</CompleteMultipartUpload>");

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

@@ -27,6 +27,7 @@
 public final class RequestBody {
 
   private final RewindableContent content;
+  private static byte[] byteArray;
 
   private RequestBody(RewindableContent content) {
     this.content = content;
@@ -45,7 +46,11 @@ public static RequestBody of(ByteBuffer... buffers) {
   }
 
   public static RequestBody fromByteBuffer(ByteBuffer buffer) {
-    return of(buffer);
+    byteArray = new byte[buffer.remaining()];
+    // The get() method copies the bytes from the buffer into the array.
+    // This operation advances the buffer's position.
+    buffer.get(byteArray);
+    return new RequestBody(RewindableContent.of(buffer));
   }
 
   public static RequestBody of(ByteBuffer[] srcs, int srcsOffset, int srcsLength) {
@@ -57,6 +62,6 @@ public static RequestBody of(Path path) throws IOException {
   }
 
   public byte[] getPartData() {
-    return content.asByteArray();
+    return byteArray;
   }
 }

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

@@ -24,13 +24,13 @@ public final class CompleteMultipartUploadRequest {
   private final String bucket;
   private final String key;
   private final String uploadId;
-  private final CompletedMultipartUpload completedMultipartUpload;
+  private final CompletedMultipartUpload multipartUpload;
 
   private CompleteMultipartUploadRequest(Builder builder) {
     this.bucket = builder.bucket;
     this.key = builder.key;
     this.uploadId = builder.uploadId;
-    this.completedMultipartUpload = builder.completedMultipartUpload;
+    this.multipartUpload = builder.multipartUpload;
   }
 
   public String bucket() {
@@ -45,8 +45,8 @@ public String uploadId() {
     return uploadId;
   }
 
-  public CompletedMultipartUpload completedMultipartUpload() {
-    return completedMultipartUpload;
+  public CompletedMultipartUpload multipartUpload() {
+    return multipartUpload;
   }
 
   @Override
@@ -61,12 +61,12 @@ public boolean equals(Object o) {
     return Objects.equals(bucket, that.bucket)
         && Objects.equals(key, that.key)
         && Objects.equals(uploadId, that.uploadId)
-        && Objects.equals(completedMultipartUpload, that.completedMultipartUpload);
+        && Objects.equals(multipartUpload, that.multipartUpload);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(bucket, key, uploadId, completedMultipartUpload);
+    return Objects.hash(bucket, key, uploadId, multipartUpload);
   }
 
   @Override
@@ -75,7 +75,7 @@ public String toString() {
         .add("bucket", bucket)
         .add("key", key)
         .add("uploadId", uploadId)
-        .add("completedMultipartUpload", completedMultipartUpload)
+        .add("completedMultipartUpload", multipartUpload)
         .toString();
   }
 
@@ -87,7 +87,7 @@ public static class Builder {
     private String bucket;
     private String key;
     private String uploadId;
-    private CompletedMultipartUpload completedMultipartUpload;
+    private CompletedMultipartUpload multipartUpload;
 
     private Builder() {}
 
@@ -106,8 +106,8 @@ public Builder uploadId(String uploadId) {
       return this;
     }
 
-    public Builder completedMultipartUpload(CompletedMultipartUpload completedMultipartUpload) {
-      this.completedMultipartUpload = completedMultipartUpload;
+    public Builder multipartUpload(CompletedMultipartUpload completedMultipartUpload) {
+      this.multipartUpload = completedMultipartUpload;
       return this;
     }
 

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

@@ -24,10 +24,10 @@ public class CompletedMultipartUpload {
   private final List<CompletedPart> completedPartList;
 
   private CompletedMultipartUpload(Builder builder) {
-    this.completedPartList = builder.completedPartList;
+    this.completedPartList = builder.parts;
   }
 
-  public List<CompletedPart> completedPartList() {
+  public List<CompletedPart> parts() {
     return completedPartList;
   }
 
@@ -60,12 +60,12 @@ public static Builder builder() {
   }
 
   public static class Builder {
-    private List<CompletedPart> completedPartList;
+    private List<CompletedPart> parts;
 
     private Builder() {}
 
-    public Builder completedPartList(List<CompletedPart> completedPartList) {
-      this.completedPartList = completedPartList;
+    public Builder parts(List<CompletedPart> completedPartList) {
+      this.parts = completedPartList;
       return this;
     }
 

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

@@ -19,11 +19,11 @@ public final class CompletedPart {
 
   private final int partNumber;
 
-  private final String etag;
+  private final String eTag;
 
-  private CompletedPart(int partNumber, String etag) {
+  private CompletedPart(int partNumber, String eTag) {
     this.partNumber = partNumber;
-    this.etag = etag;
+    this.eTag = eTag;
   }
 
   public static Builder builder() {
@@ -34,8 +34,8 @@ public int partNumber() {
     return partNumber;
   }
 
-  public String etag() {
-    return etag;
+  public String eTag() {
+    return eTag;
   }
 
   public static class Builder {
@@ -47,7 +47,7 @@ public Builder partNumber(int partNumber) {
       return this;
     }
 
-    public Builder etag(String etag) {
+    public Builder eTag(String etag) {
       this.etag = etag;
       return this;
     }

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

@@ -21,14 +21,14 @@
 
 public final class UploadPartResponse {
 
-  private final String etag;
+  private final String eTag;
 
   private UploadPartResponse(Builder builder) {
-    this.etag = builder.etag;
+    this.eTag = builder.etag;
   }
 
-  public String etag() {
-    return etag;
+  public String eTag() {
+    return eTag;
   }
 
   @Override
@@ -40,17 +40,17 @@ public boolean equals(Object o) {
       return false;
     }
     UploadPartResponse that = (UploadPartResponse) o;
-    return Objects.equals(etag, that.etag);
+    return Objects.equals(eTag, that.eTag);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(etag);
+    return Objects.hash(eTag);
   }
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this).add("etag", etag).toString();
+    return MoreObjects.toStringHelper(this).add("etag", eTag).toString();
   }
 
   public static Builder builder() {
@@ -62,7 +62,7 @@ public static class Builder {
 
     private Builder() {}
 
-    public Builder etag(String etag) {
+    public Builder eTag(String etag) {
       this.etag = etag;
       return this;
     }