Remove duplicate code of buildHeaders() in ComposeSource (#1116)

Author: balamurugana

api/src/main/java/io/minio/ComposeSource.java

@@ -18,7 +18,6 @@
 package io.minio;
 
 import com.google.common.base.Objects;
-import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import io.minio.errors.InternalException;
@@ -84,36 +83,10 @@ private void validateSize(long objectSize) {
   public void buildHeaders(long objectSize, String etag) {
     validateSize(objectSize);
     this.objectSize = Long.valueOf(objectSize);
-
-    String copySource = S3Escaper.encodePath(bucketName + "/" + objectName);
-    if (versionId != null) {
-      copySource += "?versionId=" + S3Escaper.encode(versionId);
-    }
-
-    Multimap<String, String> headers = HashMultimap.create();
-    headers.put("x-amz-copy-source", copySource);
-    headers.put("x-amz-copy-source-if-match", (matchETag != null) ? matchETag : etag);
-
-    if (notMatchETag != null) {
-      headers.put("x-amz-copy-source-if-none-match", notMatchETag);
-    }
-
-    if (modifiedSince != null) {
-      headers.put(
-          "x-amz-copy-source-if-modified-since",
-          modifiedSince.format(Time.HTTP_HEADER_DATE_FORMAT));
-    }
-
-    if (unmodifiedSince != null) {
-      headers.put(
-          "x-amz-copy-source-if-unmodified-since",
-          unmodifiedSince.format(Time.HTTP_HEADER_DATE_FORMAT));
+    Multimap<String, String> headers = genCopyHeaders();
+    if (!headers.containsKey("x-amz-copy-source-if-match")) {
+      headers.put("x-amz-copy-source-if-match", etag);
     }
-
-    if (ssec != null) {
-      headers.putAll(Multimaps.forMap(ssec.copySourceHeaders()));
-    }
-
     this.headers = Multimaps.unmodifiableMultimap(headers);
   }
 

api/src/main/java/io/minio/MinioClient.java

@@ -1195,12 +1195,16 @@ public ObjectWriteResponse copyObject(CopyObjectArgs args)
           ServerException, XmlParserException {
     checkArgs(args);
     args.validateSse(this.baseUrl);
-    if (args.source().offset() != null || args.source().length() != null) {
-      return composeObject(new ComposeObjectArgs(args));
+
+    long size = -1;
+    if (args.source().offset() != null && args.source().length() != null) {
+      StatObjectResponse stat = statObject(new StatObjectArgs((ObjectReadArgs) args.source()));
+      size = stat.size();
     }
 
-    StatObjectResponse stat = statObject(new StatObjectArgs((ObjectReadArgs) args.source()));
-    if (stat.size() > ObjectWriteArgs.MAX_PART_SIZE) {
+    if (args.source().offset() != null
+        || args.source().length() != null
+        || size > ObjectWriteArgs.MAX_PART_SIZE) {
       if (args.metadataDirective() != null && args.metadataDirective() == Directive.COPY) {
         throw new IllegalArgumentException(
             "COPY metadata directive is not applicable to source object size greater than 5 GiB");
@@ -1336,11 +1340,14 @@ private int calculatePartCount(List<ComposeSource> sources)
    *
    * // Create my-bucketname/my-objectname with user metadata by combining source object
    * // list.
+   * Map<String, String> userMetadata = new HashMap<>();
+   * userMetadata.put("My-Project", "Project One");
    * minioClient.composeObject(
    *     ComposeObjectArgs.builder()
    *        .bucket("my-bucketname")
    *        .object("my-objectname")
    *        .sources(sourceObjectList)
+   *        .userMetadata(userMetadata)
    *        .build());
    *
    * // Create my-bucketname/my-objectname with user metadata and server-side encryption
@@ -1350,9 +1357,9 @@ private int calculatePartCount(List<ComposeSource> sources)
    *        .bucket("my-bucketname")
    *        .object("my-objectname")
    *        .sources(sourceObjectList)
+   *        .userMetadata(userMetadata)
    *        .ssec(sse)
    *        .build());
-   *
    * }</pre>
    *
    * @param args {@link ComposeObjectArgs} object.

docs/API.md

@@ -1081,12 +1081,14 @@ minioClient.composeObject(
 
 // Create my-bucketname/my-objectname with user metadata by combining source object
 // list.
+Map<String, String> userMetadata = new HashMap<>();
+userMetadata.put("My-Project", "Project One");
 minioClient.composeObject(
     ComposeObjectArgs.builder()
       .bucket("my-bucketname")
       .object("my-objectname")
       .sources(sourceObjectList)
-      .headers(Multimaps.forMap(userMetadata))
+      .userMetadata(userMetadata)
       .build());
 
 // Create my-bucketname/my-objectname with user metadata and server-side encryption
@@ -1096,7 +1098,7 @@ minioClient.composeObject(
       .bucket("my-bucketname")
       .object("my-objectname")
       .sources(sourceObjectList)
-      .headers(Multimaps.forMap(userMetadata))
+      .userMetadata(userMetadata)
       .ssec(sse)
       .build());
 ```