fix the issue that setting acl in the uploadFile method does not take effect.

Author: liyanzhang505

src/main/java/com/aliyun/oss/internal/OSSUploadOperation.java

@@ -50,6 +50,7 @@
 import com.aliyun.oss.event.ProgressEventType;
 import com.aliyun.oss.event.ProgressListener;
 import com.aliyun.oss.event.ProgressPublisher;
+import com.aliyun.oss.model.CannedAccessControlList;
 import com.aliyun.oss.model.CompleteMultipartUploadRequest;
 import com.aliyun.oss.model.CompleteMultipartUploadResult;
 import com.aliyun.oss.model.InitiateMultipartUploadRequest;
@@ -602,6 +603,15 @@ public int compare(PartETag p1, PartETag p2) {
             completeUploadRequest.setRequestPayer(payer);
         }
 
+        ObjectMetadata metadata = uploadFileRequest.getObjectMetadata();
+        if (metadata != null) {
+            String acl = (String) metadata.getRawMetadata().get(OSSHeaders.OSS_OBJECT_ACL);
+            if (acl != null && !acl.equals("")) {
+                CannedAccessControlList accessControlList = CannedAccessControlList.parse(acl);
+                completeUploadRequest.setObjectACL(accessControlList);
+            }
+        }
+
         completeUploadRequest.setCallback(uploadFileRequest.getCallback());
 
         return completeMultipartUploadWrap(uploadCheckPoint, completeUploadRequest);

src/test/java/com/aliyun/oss/integrationtests/UploadFileTest.java

@@ -372,4 +372,63 @@ public void run() {
         }
     }
 
-}
+    @Test
+    public void testAcl() {
+        String key = "test-upload-file-with-acl";
+
+        // Upload file without acl setting, returned acl will be DEFAULT.
+        try {
+            File file = createSampleFile(key, 1024 * 500);
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(bucketName, key, file.getAbsolutePath(), (1024 * 100), 10);
+
+            UploadFileResult uploadRes = ossClient.uploadFile(uploadFileRequest);
+            Assert.assertEquals(uploadRes.getMultipartUploadResult().getBucketName(), bucketName);
+            Assert.assertEquals(uploadRes.getMultipartUploadResult().getKey(), key);
+
+            ObjectAcl acl = ossClient.getObjectAcl(bucketName, key);
+            Assert.assertEquals(acl.getPermission(), ObjectPermission.Default);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            Assert.fail(e.getMessage());
+        }
+
+        // Upload With PRIVATE acl setting, returned acl will be PRIVATE.
+        try {
+            File file = createSampleFile(key, 1024 * 500);
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(bucketName, key, file.getAbsolutePath(), (1024 * 100), 10);
+            ObjectMetadata metadata = new ObjectMetadata();
+            metadata.setObjectAcl(CannedAccessControlList.Private);
+            uploadFileRequest.setObjectMetadata(metadata);
+
+            UploadFileResult uploadRes = ossClient.uploadFile(uploadFileRequest);
+            Assert.assertEquals(uploadRes.getMultipartUploadResult().getBucketName(), bucketName);
+            Assert.assertEquals(uploadRes.getMultipartUploadResult().getKey(), key);
+
+            ObjectAcl acl = ossClient.getObjectAcl(bucketName, key);
+            Assert.assertEquals(acl.getPermission(), ObjectPermission.Private);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            Assert.fail(e.getMessage());
+        }
+
+        // Test set acl null.
+        try {
+            File file = createSampleFile(key, 1024 * 500);
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(bucketName, key, file.getAbsolutePath(), (1024 * 100), 10);
+            ObjectMetadata metadata = new ObjectMetadata();
+            metadata.setObjectAcl(null);
+            uploadFileRequest.setObjectMetadata(metadata);
+
+            UploadFileResult uploadRes = ossClient.uploadFile(uploadFileRequest);
+            Assert.assertEquals(uploadRes.getMultipartUploadResult().getBucketName(), bucketName);
+            Assert.assertEquals(uploadRes.getMultipartUploadResult().getKey(), key);
+
+            ObjectAcl acl = ossClient.getObjectAcl(bucketName, key);
+            Assert.assertEquals(acl.getPermission(), ObjectPermission.Default);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            Assert.fail(e.getMessage());
+        }
+    }
+
+}