Simplify list handling.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/72473dc0 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/72473dc0 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/72473dc0 Branch: refs/heads/master Commit: 72473dc038592036e9cb30372fb93c9cd9a17fcc Parents: 6e00fb4 Author: Timur Alperovich <[email protected]> Authored: Thu Aug 20 17:14:00 2015 -0700 Committer: Timur Alperovich <[email protected]> Committed: Thu Aug 20 17:55:55 2015 -0700 ---------------------------------------------------------------------- .../blobstore/GoogleCloudStorageBlobStore.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/72473dc0/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java index 7fd3643..924fad3 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java @@ -187,21 +187,15 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore { /** Returns list of of all the objects */ @Override public PageSet<? extends StorageMetadata> list(String container) { - ListPageWithPrefixes<GoogleCloudStorageObject> gcsList = api.getObjectApi().listObjects(container); - PageSet<? extends StorageMetadata> list = objectListToStorageMetadata.apply(gcsList); - return list; + return list(container, ListContainerOptions.NONE); } @Override public PageSet<? extends StorageMetadata> list(String container, ListContainerOptions options) { - if (options != null && options != ListContainerOptions.NONE) { - ListObjectOptions listOptions = listContainerOptionsToListObjectOptions.apply(options); - ListPageWithPrefixes<GoogleCloudStorageObject> gcsList = api.getObjectApi().listObjects(container, listOptions); - PageSet<? extends StorageMetadata> list = objectListToStorageMetadata.apply(gcsList); - return options.isDetailed() ? fetchBlobMetadataProvider.get().setContainerName(container).apply(list) : list; - } else { - return list(container); - } + ListObjectOptions listOptions = listContainerOptionsToListObjectOptions.apply(options); + ListPageWithPrefixes<GoogleCloudStorageObject> gcsList = api.getObjectApi().listObjects(container, listOptions); + PageSet<? extends StorageMetadata> list = objectListToStorageMetadata.apply(gcsList); + return options.isDetailed() ? fetchBlobMetadataProvider.get().setContainerName(container).apply(list) : list; } /**
