Updated Branches: refs/heads/1.6.x d344e52bf -> be36b7cf4
Revert "Introduce listing blobs with detailed metadata" This reverts commit 3000d85dfcd104fba24d7b058aa0c3cf5db4c849. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/commit/be36b7cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/be36b7cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/be36b7cf Branch: refs/heads/1.6.x Commit: be36b7cf4d11138894f1a7b7c331d88b0aeff897 Parents: d344e52 Author: Andrew Gaul <[email protected]> Authored: Fri Oct 18 15:34:18 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Oct 18 15:34:18 2013 -0700 ---------------------------------------------------------------------- .../commands/blobstore/BlobListCommand.java | 34 ++------------------ .../commands/blobstore/BlobMetadataCommand.java | 21 +++++++++++- .../blobstore/BlobStoreCommandWithOptions.java | 25 -------------- 3 files changed, 23 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/be36b7cf/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java index 4b24fb5..60b91b8 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobListCommand.java @@ -21,19 +21,14 @@ import java.io.PrintStream; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.concurrent.Callable; import com.google.common.collect.Lists; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.CommandException; import org.apache.felix.gogo.commands.Option; import org.jclouds.blobstore.BlobStore; -import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.options.ListContainerOptions; @@ -52,14 +47,11 @@ public class BlobListCommand extends BlobStoreCommandWithOptions { @Argument(index = 1, name = "directoryPath", description = "List blobs only in this directory path", required = false) String directoryPath; - @Option(name = "-d", aliases = "--details", description = "Display blob details", required = false, multiValued = false) - boolean details; - private static final PrintStream out = System.out; @Override protected Object doExecute() throws Exception { - final BlobStore blobStore = getBlobStore(); + BlobStore blobStore = getBlobStore(); ListContainerOptions options = ListContainerOptions.Builder.recursive(); if (directoryPath != null) { @@ -77,28 +69,8 @@ public class BlobListCommand extends BlobStoreCommandWithOptions { } Collections.sort(blobNames); - if (details) { - ListeningExecutorService executor = blobStore.getContext().utils().userExecutor(); - Collection<ListenableFuture<BlobMetadata>> futures = Lists.newArrayList(); - for (final String blobName : blobNames) { - futures.add(executor.submit(new Callable<BlobMetadata>() { - @Override - public BlobMetadata call() { - return blobStore.blobMetadata(containerName, blobName); - } - })); - } - Collection<BlobMetadata> metadatas = Futures.allAsList(futures).get(); - - for (BlobMetadata metadata : metadatas) { - out.println(metadata.getName() + ":"); - BlobStoreCommandWithOptions.printMetadata(out, metadata.getContentMetadata()); - out.println(); - } - } else { - for (String blobName : blobNames) { - out.println(blobName); - } + for (String blobName : blobNames) { + out.println(blobName); } String marker = blobStoreMetadatas.getNextMarker(); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/be36b7cf/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java index 915b531..0549e6b 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobMetadataCommand.java @@ -22,6 +22,7 @@ import java.util.Date; import java.util.List; import com.google.common.collect.Lists; +import com.google.common.io.BaseEncoding; import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; @@ -56,11 +57,29 @@ public class BlobMetadataCommand extends BlobStoreCommandWithOptions { throw new KeyNotFoundException(containerName, blobName, "while getting metadata"); } + ContentMetadata contentMetdata = blobMetadata.getContentMetadata(); out.println(blobName + ":"); - BlobStoreCommandWithOptions.printMetadata(out, blobMetadata.getContentMetadata()); + + printMetadata("Content-Disposition", contentMetdata.getContentDisposition()); + printMetadata("Content-Encoding", contentMetdata.getContentEncoding()); + printMetadata("Content-Language", contentMetdata.getContentLanguage()); + byte[] contentMD5 = contentMetdata.getContentMD5(); + if (contentMD5 != null) { + printMetadata("Content-MD5", + BaseEncoding.base16().lowerCase().encode(contentMD5)); + } + printMetadata("Content-Type", contentMetdata.getContentType()); + printMetadata("Expires", contentMetdata.getExpires()); + printMetadata("Length", contentMetdata.getContentLength()); out.println(""); } return null; } + + private static void printMetadata(String key, Object value) { + if (value != null) { + out.println(String.format(" %s: %s", key, value)); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/be36b7cf/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java index 3bd5026..28d104e 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java @@ -19,7 +19,6 @@ package org.jclouds.karaf.commands.blobstore; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; -import com.google.common.io.BaseEncoding; import com.google.inject.Module; import org.apache.felix.gogo.commands.Option; import org.apache.felix.service.command.CommandSession; @@ -27,14 +26,12 @@ import org.jclouds.Constants; import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; -import org.jclouds.io.ContentMetadata; import org.jclouds.karaf.utils.EnvHelper; import org.jclouds.karaf.utils.ServiceHelper; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import java.io.IOException; import java.io.File; -import java.io.PrintStream; import java.util.Collections; import java.util.List; @@ -153,26 +150,4 @@ public abstract class BlobStoreCommandWithOptions extends BlobStoreCommandBase { } return blobStore; } - - - static void printMetadata(PrintStream out, ContentMetadata metadata) { - printMetadata(out, "Content-Disposition", metadata.getContentDisposition()); - printMetadata(out, "Content-Encoding", metadata.getContentEncoding()); - printMetadata(out, "Content-Language", metadata.getContentLanguage()); - byte[] contentMD5 = metadata.getContentMD5(); - if (contentMD5 != null) { - printMetadata(out, "Content-MD5", - BaseEncoding.base16().lowerCase().encode(contentMD5)); - } - printMetadata(out, "Content-Type", metadata.getContentType()); - printMetadata(out, "Expires", metadata.getExpires()); - printMetadata(out, "Length", metadata.getContentLength()); - } - - static void printMetadata(PrintStream out, String key, Object value) { - if (value != null) { - out.println(String.format(" %s: %s", key, value)); - } - } - }
