chore: prevent Content-Type header duplication in multipart uploads with MultipartUploadClient (#3454)

Author: louisnow

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

@@ -83,7 +83,7 @@ CreateMultipartUploadResponse sendCreateMultipartUploadRequest(
 
     HttpRequest httpRequest =
         requestFactory.buildPostRequest(
-            new GenericUrl(createUri), new ByteArrayContent(request.contentType(), new byte[0]));
+            new GenericUrl(createUri), new ByteArrayContent(null, new byte[0]));
     httpRequest.getHeaders().putAll(headerProvider.getHeaders());
     addHeadersForCreateMultipartUpload(request, httpRequest.getHeaders());
     httpRequest.setParser(objectParser);

java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITMultipartUploadHttpRequestManagerTest.java

@@ -581,6 +581,71 @@ public void sendCreateMultipartUploadRequest_withUserProject() throws Exception
     }
   }
 
+  @Test
+  public void sendCreateMultipartUploadRequest_withContentType() throws Exception {
+    HttpRequestHandler handler =
+        req -> {
+          assertThat(req.headers().getAll("Content-Type")).containsExactly("audio/mp4");
+
+          CreateMultipartUploadResponse response =
+              CreateMultipartUploadResponse.builder()
+                  .bucket("test-bucket")
+                  .key("test-key")
+                  .uploadId("test-upload-id")
+                  .build();
+          ByteBuf buf = Unpooled.wrappedBuffer(xmlMapper.writeValueAsBytes(response));
+
+          DefaultFullHttpResponse resp =
+              new DefaultFullHttpResponse(req.protocolVersion(), OK, buf);
+          resp.headers().set(CONTENT_TYPE, "application/xml; charset=utf-8");
+          return resp;
+        };
+
+    try (FakeHttpServer fakeHttpServer = FakeHttpServer.of(handler)) {
+      MultipartUploadHttpRequestManager multipartUploadHttpRequestManager =
+          MultipartUploadHttpRequestManager.createFrom(fakeHttpServer.getHttpStorageOptions());
+      CreateMultipartUploadRequest request =
+          CreateMultipartUploadRequest.builder()
+              .bucket("test-bucket")
+              .key("test-key")
+              .contentType("audio/mp4")
+              .build();
+
+      multipartUploadHttpRequestManager.sendCreateMultipartUploadRequest(request);
+    }
+  }
+
+  @Test
+  public void sendCreateMultipartUploadRequest_sendsContentLength() throws Exception {
+    HttpRequestHandler handler =
+        req -> {
+          // See https://docs.cloud.google.com/storage/docs/xml-api/reference-headers#contentlength
+          assertThat(req.headers().get("Content-Length")).isEqualTo("0");
+
+          CreateMultipartUploadResponse response =
+              CreateMultipartUploadResponse.builder()
+                  .bucket("test-bucket")
+                  .key("test-key")
+                  .uploadId("test-upload-id")
+                  .build();
+          ByteBuf buf = Unpooled.wrappedBuffer(xmlMapper.writeValueAsBytes(response));
+
+          DefaultFullHttpResponse resp =
+              new DefaultFullHttpResponse(req.protocolVersion(), OK, buf);
+          resp.headers().set(CONTENT_TYPE, "application/xml; charset=utf-8");
+          return resp;
+        };
+
+    try (FakeHttpServer fakeHttpServer = FakeHttpServer.of(handler)) {
+      MultipartUploadHttpRequestManager multipartUploadHttpRequestManager =
+          MultipartUploadHttpRequestManager.createFrom(fakeHttpServer.getHttpStorageOptions());
+      CreateMultipartUploadRequest request =
+          CreateMultipartUploadRequest.builder().bucket("test-bucket").key("test-key").build();
+
+      multipartUploadHttpRequestManager.sendCreateMultipartUploadRequest(request);
+    }
+  }
+
   @Test
   public void sendListPartsRequest_success() throws Exception {
     HttpRequestHandler handler =