Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1389: When composing, set destination.storageClass from object 

This aligns that the destination's storageClass with that of the sub-object(s) being composed
This commit is contained in:
Jim Sermersheim 2018-04-20 12:04:16 -06:00
parent 316bce0587
commit def6db4864
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
View File

@ -379,15 +379,17 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore {
@Override
public String completeMultipartUpload(MultipartUpload mpu, List<MultipartPart> parts) {
ImmutableList.Builder<GoogleCloudStorageObject> objects = ImmutableList.builder();
ImmutableList.Builder<GoogleCloudStorageObject> objectsBuilder = ImmutableList.builder();
for (MultipartPart part : parts) {
objects.add(api.getObjectApi().getObject(mpu.containerName(),
objectsBuilder.add(api.getObjectApi().getObject(mpu.containerName(),
Strings2.urlEncode(getMPUPartName(mpu, part.partNumber()))));
}
ObjectTemplate destination = blobMetadataToObjectTemplate.apply(mpu.blobMetadata());
// unset storage class because the subobjects store this state
destination.storageClass(DomainResourceReferences.StorageClass.STANDARD);
final ImmutableList<GoogleCloudStorageObject> objects = objectsBuilder.build();
if (!objects.isEmpty()) {
destination.storageClass(objects.get(0).storageClass());
}
if (mpu.putOptions().getBlobAccess() == BlobAccess.PUBLIC_READ) {
ObjectAccessControls controls = ObjectAccessControls.builder()
.entity("allUsers")
@ -398,7 +400,7 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore {
}
ComposeObjectTemplate template = ComposeObjectTemplate.builder()
.fromGoogleCloudStorageObject(objects.build())
.fromGoogleCloudStorageObject(objects)
.destination(destination).build();
String eTag = api.getObjectApi().composeObjects(mpu.containerName(), Strings2.urlEncode(mpu.blobName()), template)
.etag();