Merge pull request #182 from RachelTucker/3_0_autogen_update

Query param + changed to space and nullable Integer support

Author: rpmoore

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetBucketRequest.java

@@ -47,7 +47,7 @@ public GetBucketRequest withDelimiter(final String delimiter) {
 
     public GetBucketRequest withMarker(final String marker) {
         this.marker = marker;
-        this.updateQueryParam("marker", UrlEscapers.urlFragmentEscaper().escape(marker));
+        this.updateQueryParam("marker", UrlEscapers.urlFragmentEscaper().escape(marker).replace("+", "%2B"));
         return this;
     }
 
@@ -59,7 +59,7 @@ public GetBucketRequest withMaxKeys(final int maxKeys) {
 
     public GetBucketRequest withPrefix(final String prefix) {
         this.prefix = prefix;
-        this.updateQueryParam("prefix", UrlEscapers.urlFragmentEscaper().escape(prefix));
+        this.updateQueryParam("prefix", UrlEscapers.urlFragmentEscaper().escape(prefix).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/ListMultiPartUploadPartsRequest.java

@@ -32,7 +32,7 @@ public class ListMultiPartUploadPartsRequest extends AbstractRequest {
 
     private int maxParts;
 
-    private int partNumberMarker;
+    private Integer partNumberMarker;
 
     // Constructor
 
@@ -49,9 +49,9 @@ public ListMultiPartUploadPartsRequest withMaxParts(final int maxParts) {
         return this;
     }
 
-    public ListMultiPartUploadPartsRequest withPartNumberMarker(final int partNumberMarker) {
+    public ListMultiPartUploadPartsRequest withPartNumberMarker(final Integer partNumberMarker) {
         this.partNumberMarker = partNumberMarker;
-        this.updateQueryParam("part_number_marker", Integer.toString(partNumberMarker));
+        this.updateQueryParam("part_number_marker", String.valueOf(partNumberMarker));
         return this;
     }
 
@@ -86,7 +86,7 @@ public int getMaxParts() {
     }
 
 
-    public int getPartNumberMarker() {
+    public Integer getPartNumberMarker() {
         return this.partNumberMarker;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/ListMultiPartUploadsRequest.java

@@ -50,7 +50,7 @@ public ListMultiPartUploadsRequest withDelimiter(final String delimiter) {
 
     public ListMultiPartUploadsRequest withKeyMarker(final String keyMarker) {
         this.keyMarker = keyMarker;
-        this.updateQueryParam("key_marker", UrlEscapers.urlFragmentEscaper().escape(keyMarker));
+        this.updateQueryParam("key_marker", UrlEscapers.urlFragmentEscaper().escape(keyMarker).replace("+", "%2B"));
         return this;
     }
 
@@ -62,13 +62,13 @@ public ListMultiPartUploadsRequest withMaxUploads(final int maxUploads) {
 
     public ListMultiPartUploadsRequest withPrefix(final String prefix) {
         this.prefix = prefix;
-        this.updateQueryParam("prefix", UrlEscapers.urlFragmentEscaper().escape(prefix));
+        this.updateQueryParam("prefix", UrlEscapers.urlFragmentEscaper().escape(prefix).replace("+", "%2B"));
         return this;
     }
 
     public ListMultiPartUploadsRequest withUploadIdMarker(final String uploadIdMarker) {
         this.uploadIdMarker = uploadIdMarker;
-        this.updateQueryParam("upload_id_marker", UrlEscapers.urlFragmentEscaper().escape(uploadIdMarker));
+        this.updateQueryParam("upload_id_marker", UrlEscapers.urlFragmentEscaper().escape(uploadIdMarker).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/EjectAllTapesSpectraS3Request.java

@@ -37,13 +37,13 @@ public EjectAllTapesSpectraS3Request() {
 
     public EjectAllTapesSpectraS3Request withEjectLabel(final String ejectLabel) {
         this.ejectLabel = ejectLabel;
-        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel));
+        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel).replace("+", "%2B"));
         return this;
     }
 
     public EjectAllTapesSpectraS3Request withEjectLocation(final String ejectLocation) {
         this.ejectLocation = ejectLocation;
-        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation));
+        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/EjectStorageDomainBlobsSpectraS3Request.java

@@ -47,13 +47,13 @@ public EjectStorageDomainBlobsSpectraS3Request(final String bucketId, final UUID
 
     public EjectStorageDomainBlobsSpectraS3Request withEjectLabel(final String ejectLabel) {
         this.ejectLabel = ejectLabel;
-        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel));
+        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel).replace("+", "%2B"));
         return this;
     }
 
     public EjectStorageDomainBlobsSpectraS3Request withEjectLocation(final String ejectLocation) {
         this.ejectLocation = ejectLocation;
-        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation));
+        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/EjectStorageDomainSpectraS3Request.java

@@ -50,13 +50,13 @@ public EjectStorageDomainSpectraS3Request withBucketId(final String bucketId) {
 
     public EjectStorageDomainSpectraS3Request withEjectLabel(final String ejectLabel) {
         this.ejectLabel = ejectLabel;
-        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel));
+        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel).replace("+", "%2B"));
         return this;
     }
 
     public EjectStorageDomainSpectraS3Request withEjectLocation(final String ejectLocation) {
         this.ejectLocation = ejectLocation;
-        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation));
+        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/EjectTapeSpectraS3Request.java

@@ -41,13 +41,13 @@ public EjectTapeSpectraS3Request(final UUID tapeId) {
 
     public EjectTapeSpectraS3Request withEjectLabel(final String ejectLabel) {
         this.ejectLabel = ejectLabel;
-        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel));
+        this.updateQueryParam("eject_label", UrlEscapers.urlFragmentEscaper().escape(ejectLabel).replace("+", "%2B"));
         return this;
     }
 
     public EjectTapeSpectraS3Request withEjectLocation(final String ejectLocation) {
         this.ejectLocation = ejectLocation;
-        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation));
+        this.updateQueryParam("eject_location", UrlEscapers.urlFragmentEscaper().escape(ejectLocation).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/GetActiveJobsSpectraS3Request.java

@@ -90,7 +90,7 @@ public GetActiveJobsSpectraS3Request withLastPage(final boolean lastPage) {
 
     public GetActiveJobsSpectraS3Request withName(final String name) {
         this.name = name;
-        this.updateQueryParam("name", UrlEscapers.urlFragmentEscaper().escape(name));
+        this.updateQueryParam("name", UrlEscapers.urlFragmentEscaper().escape(name).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/GetBucketsSpectraS3Request.java

@@ -62,7 +62,7 @@ public GetBucketsSpectraS3Request withLastPage(final boolean lastPage) {
 
     public GetBucketsSpectraS3Request withName(final String name) {
         this.name = name;
-        this.updateQueryParam("name", UrlEscapers.urlFragmentEscaper().escape(name));
+        this.updateQueryParam("name", UrlEscapers.urlFragmentEscaper().escape(name).replace("+", "%2B"));
         return this;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/GetBulkJobSpectraS3Request.java

@@ -56,7 +56,7 @@ public GetBulkJobSpectraS3Request withChunkClientProcessingOrderGuarantee(final
 
     public GetBulkJobSpectraS3Request withName(final String name) {
         this.name = name;
-        this.updateQueryParam("name", UrlEscapers.urlFragmentEscaper().escape(name));
+        this.updateQueryParam("name", UrlEscapers.urlFragmentEscaper().escape(name).replace("+", "%2B"));
         return this;
     }