Merge pull request #197 from scribe/collisonInArgs

Collison in args

Author: rpmoore

ds3_java_cli/src/main/java/com/spectralogic/ds3cli/ArgumentFactory.java

@@ -57,9 +57,9 @@ public final class ArgumentFactory {
     public static final Option PREFIX = Option.builder("p").hasArg(true).argName("prefix")
             .desc("Used with get operations to restore only objects whose names start with prefix  "
                     + "and with put operations, to prepend a prefix to object name(s)").build();
-    public static final Option VERSION = Option.builder("v").argName("version")
+    public static final Option SHOW_VERSIONS = Option.builder("sv").argName("show-versions").longOpt("show-versions")
             .desc("Show version information").build();
-    public static final Option VERSIONID = Option.builder().longOpt("versionId").desc("Version ID value").hasArg(true)
+    public static final Option VERSION_ID = Option.builder().longOpt("version-id").desc("Version ID value").hasArg(true)
             .build();
     public static final Option OBJECT_NAME = Option.builder("o").hasArg(true).argName("objectFileName")
             .desc("The name of the object to be retrieved or stored").build();

ds3_java_cli/src/main/java/com/spectralogic/ds3cli/Arguments.java

@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.spectralogic.ds3cli.exceptions.BadArgumentException;
-import com.spectralogic.ds3cli.util.MetadataUtils;
 import com.spectralogic.ds3client.models.Priority;
 import com.spectralogic.ds3client.models.WriteOptimization;
 import org.apache.commons.cli.*;
@@ -306,8 +305,8 @@ public int getBufferSize()  throws BadArgumentException {
 
     // convenience getters for public options
     public String getBucket() { return this.getOptionValue(BUCKET.getOpt()); }
-    public boolean getVersion() { return this.optionExists(VERSION.getOpt());}
-    public String getVersionId() { return this.getOptionValue(VERSIONID.getLongOpt());}
+    public boolean isShowVersions() { return this.optionExists(SHOW_VERSIONS.getOpt());}
+    public String getVersionId() { return this.getOptionValue(VERSION_ID.getLongOpt());}
     public String getDirectory() { return this.getOptionValue(DIRECTORY.getOpt()); }
     public String getObjectName()  { return this.getOptionValue(OBJECT_NAME.getOpt()); }
     public boolean isForce() { return this.optionExists(FORCE.getLongOpt()); }

ds3_java_cli/src/main/java/com/spectralogic/ds3cli/command/GetBucket.java

@@ -19,45 +19,40 @@
 import com.google.common.collect.ImmutableList;
 import com.spectralogic.ds3cli.Arguments;
 import com.spectralogic.ds3cli.View;
-import com.spectralogic.ds3cli.ViewType;
-import com.spectralogic.ds3cli.exceptions.BadArgumentException;
 import com.spectralogic.ds3cli.exceptions.CommandException;
 import com.spectralogic.ds3cli.models.GetBucketResult;
-import com.spectralogic.ds3cli.views.cli.GetBucketView;
 import com.spectralogic.ds3cli.views.json.DataView;
 import com.spectralogic.ds3client.commands.GetBucketRequest;
 import com.spectralogic.ds3client.commands.GetBucketResponse;
 import com.spectralogic.ds3client.commands.spectrads3.GetBucketSpectraS3Request;
 import com.spectralogic.ds3client.commands.spectrads3.GetBucketSpectraS3Response;
-import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
 import com.spectralogic.ds3client.models.Bucket;
 import com.spectralogic.ds3client.models.Contents;
 import com.spectralogic.ds3client.networking.FailedRequestException;
-import com.spectralogic.ds3client.utils.Guard;
 import org.apache.commons.cli.Option;
 
 import java.util.List;
 
 import static com.spectralogic.ds3cli.ArgumentFactory.BUCKET;
 import static com.spectralogic.ds3cli.ArgumentFactory.PREFIX;
-import static com.spectralogic.ds3cli.ArgumentFactory.VERSION;
+import static com.spectralogic.ds3cli.ArgumentFactory.SHOW_VERSIONS;
 
 public class GetBucket extends CliCommand<GetBucketResult> {
 
     private final static ImmutableList<Option> requiredArgs = ImmutableList.of(BUCKET);
-    private final static ImmutableList<Option> optionalArgs = ImmutableList.of(PREFIX, VERSION);
+    private final static ImmutableList<Option> optionalArgs = ImmutableList.of(PREFIX, SHOW_VERSIONS);
 
     private String bucket;
     private String prefix;
-    private boolean version;
+    private boolean showVersion;
 
     @Override
     public CliCommand init(final Arguments args) throws Exception {
         processCommandOptions(requiredArgs, optionalArgs, args);
 
         this.bucket = args.getBucket();
         this.prefix = args.getPrefix();
-        this.version = args.getVersion();
+        this.showVersion = args.isShowVersions();
         return this;
     }
 
@@ -67,23 +62,23 @@ public GetBucketResult call() throws Exception {
         try {
             // GetBucketDetail to get both name and id
             GetBucketRequest getBucketRequest = new GetBucketRequest(bucket);
-            getBucketRequest.withVersions(version);
+            getBucketRequest.withVersions(showVersion);
             getBucketRequest.withPrefix(prefix);
             final GetBucketSpectraS3Request getBucketSpectraS3Request = new GetBucketSpectraS3Request(bucket);
             final GetBucketSpectraS3Response response = getClient().getBucketSpectraS3(getBucketSpectraS3Request);
             final Bucket bucketDetails = response.getBucketResult();
             final GetBucketResponse bucket = getClient().getBucket(getBucketRequest);
 
             final List<Contents> contents;
-            if (version) {
+            if (showVersion) {
                 contents = bucket.getListBucketResult().getVersionedObjects();
             } else {
                 contents = bucket.getListBucketResult().getObjects();
             }
 
             return new GetBucketResult(bucketDetails, contents);
-        } catch(final FailedRequestException e) {
-            if(e.getStatusCode() == 404) {
+        } catch (final FailedRequestException e) {
+            if (e.getStatusCode() == 404) {
                 throw new CommandException("Error: Unknown bucket.", e);
             }
             throw e;
@@ -96,7 +91,7 @@ public View<GetBucketResult> getView() {
             case JSON:
                 return new DataView();
             default:
-                if(version) {
+                if (showVersion) {
                     return new com.spectralogic.ds3cli.views.cli.GetVersionedBucketView();
                 } else {
                     return new com.spectralogic.ds3cli.views.cli.GetBucketView();

ds3_java_cli/src/main/java/com/spectralogic/ds3cli/command/GetObject.java

@@ -51,7 +51,7 @@ public class GetObject extends CliCommand<DefaultResult> {
 
     private final static ImmutableList<Option> requiredArgs = ImmutableList.of(BUCKET, OBJECT_NAME);
     private final static ImmutableList<Option> optionalArgs = ImmutableList.of(DIRECTORY, SYNC,
-            FORCE, NUMBER_OF_THREADS, PRIORITY, RANGE_OFFSET, RANGE_LENGTH, DISCARD, FILE_METADATA, VERSIONID);
+            FORCE, NUMBER_OF_THREADS, PRIORITY, RANGE_OFFSET, RANGE_LENGTH, DISCARD, FILE_METADATA, VERSION_ID);
 
     private String bucketName;
     private String objectName;