Convert CopyOptions into an AutoValue This commit requires an interface change since AutoValue lacks support for Optional and uses Nullable annotations instead.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/165e9afd Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/165e9afd Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/165e9afd Branch: refs/heads/master Commit: 165e9afd9f4830f55018b2fa4fa8f6dcec609e7d Parents: 9c05604 Author: Andrew Gaul <[email protected]> Authored: Fri Feb 12 19:29:38 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Fri Feb 12 19:29:38 2016 -0800 ---------------------------------------------------------------------- .../blobstore/GoogleCloudStorageBlobStore.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/165e9afd/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java ---------------------------------------------------------------------- diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java index a3b22d1..4f2cf3d 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java @@ -308,15 +308,15 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore { @Override public String copyBlob(String fromContainer, String fromName, String toContainer, String toName, CopyOptions options) { - if (!options.getContentMetadata().isPresent() && !options.getUserMetadata().isPresent()) { + if (options.contentMetadata() == null && options.userMetadata() == null) { return api.getObjectApi().copyObject(toContainer, Strings2.urlEncode(toName), fromContainer, Strings2.urlEncode(fromName)).etag(); } ObjectTemplate template = new ObjectTemplate(); - if (options.getContentMetadata().isPresent()) { - ContentMetadata contentMetadata = options.getContentMetadata().get(); + if (options.contentMetadata() != null) { + ContentMetadata contentMetadata = options.contentMetadata(); String contentDisposition = contentMetadata.getContentDisposition(); if (contentDisposition != null) { @@ -343,8 +343,8 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore { } } - if (options.getUserMetadata().isPresent()) { - template.customMetadata(options.getUserMetadata().get()); + if (options.userMetadata() != null) { + template.customMetadata(options.userMetadata()); } return api.getObjectApi().copyObject(toContainer, Strings2.urlEncode(toName), fromContainer,
